get ImageDesc from VideoDesc

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit ce46e1a14378 · 2014-05-21T15:48:47.000+02:00
diff --git a/src/AvTranscoder/DatasStructures/Pixel.cpp b/src/AvTranscoder/DatasStructures/Pixel.cpp
@@ -14,6 +14,44 @@ extern "C" {
 namespace avtranscoder
 {
 
+Pixel::Pixel( const AVPixelFormat avpixelFormat )
+	: m_pixelSize  ( 24 )
+	, m_components ( 3 )
+	, m_componentType ( eComponentYuv )
+	, m_subsamplingType ( eSubsamplingNone )
+	, m_endianess  ( false )
+	, m_withAlpha  ( false )
+	, m_planar     ( true )
+{
+	const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get( avpixelFormat );
+	setBitsPerPixel   ( av_get_bits_per_pixel( pix_desc ) );
+	setBigEndian      ( pix_desc->flags & PIX_FMT_BE );
+	setComponents     ( pix_desc->nb_components );
+	setAlpha          ( pix_desc->flags & PIX_FMT_ALPHA );
+	setPlanar         ( ( pix_desc->flags & PIX_FMT_PLANAR ) != 0 );
+
+	if( pix_desc->nb_components == 1 )
+		setColorComponents( eComponentGray );
+
+	if( pix_desc->flags & PIX_FMT_RGB )
+		setColorComponents( eComponentRgb );
+	else
+		setColorComponents( eComponentYuv );
+
+	setSubsampling( eSubsamplingNone );
+
+	if( ( pix_desc->log2_chroma_w == true ) &&
+		( pix_desc->log2_chroma_h == false ) )
+	{
+		setSubsampling( eSubsampling422 );
+	}
+	if( ( pix_desc->log2_chroma_w == true ) &&
+		( pix_desc->log2_chroma_h == true ) )
+	{
+		setSubsampling( eSubsampling420 );
+	}
+}
+
 AVPixelFormat Pixel::findPixel() const
 {
 	//av_register_all();
diff --git a/src/AvTranscoder/DatasStructures/Pixel.hpp b/src/AvTranscoder/DatasStructures/Pixel.hpp
@@ -44,6 +44,8 @@ class Pixel
 	, m_planar     ( true )
 	{ }
 
+	Pixel( const AVPixelFormat avpixelFormat );
+
 	void setBitsPerPixel   ( const size_t pixelSize ) { m_pixelSize = pixelSize; }
 	void setBigEndian      ( const bool endianess ) { m_endianess = endianess; }
 	void setComponents     ( const size_t components ) { m_components = components; }
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/DatasStructures/VideoDesc.cpp
@@ -218,4 +218,16 @@ void VideoDesc::set( const std::string& key, const std::string& value )
 	}
 }
 
+ImageDesc VideoDesc::getImageDesc() const
+{
+	ImageDesc imageDesc;
+	Pixel pixel( m_codecContext->pix_fmt );
+
+	imageDesc.setWidth ( m_codecContext->width  );
+	imageDesc.setHeight( m_codecContext->height );
+	imageDesc.setPixel ( pixel );
+	imageDesc.setDar   ( m_codecContext->height, m_codecContext->width );
+	return imageDesc;
+}
+
 }
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.hpp b/src/AvTranscoder/DatasStructures/VideoDesc.hpp
@@ -16,6 +16,8 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 
+#include <AvTranscoder/DatasStructures/Image.hpp>
+
 namespace avtranscoder
 {
 
@@ -50,6 +52,8 @@ class AvExport VideoDesc
 	AVCodecContext* getCodecContext() const { return m_codecContext; }
 #endif
 
+	ImageDesc getImageDesc() const;
+
 private:
 	void initCodecContext( );
 

Original file line number	Diff line number	Diff line change
`@@ -218,4 +218,16 @@ void VideoDesc::set( const std::string& key, const std::string& value )`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
	`221`	`+ImageDesc VideoDesc::getImageDesc() const`
	`222`	`+{`
	`223`	`+ ImageDesc imageDesc;`
	`224`	`+ Pixel pixel( m_codecContext->pix_fmt );`
	`225`	`+`
	`226`	`+ imageDesc.setWidth ( m_codecContext->width );`
	`227`	`+ imageDesc.setHeight( m_codecContext->height );`
	`228`	`+ imageDesc.setPixel ( pixel );`
	`229`	`+ imageDesc.setDar ( m_codecContext->height, m_codecContext->width );`
	`230`	`+ return imageDesc;`
	`231`	`+}`
	`232`	`+`
`221`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ extern "C" {`
`16`	`16`	`#include <libavcodec/avcodec.h>`
`17`	`17`	`}`
`18`	`18`
	`19`	`+#include <AvTranscoder/DatasStructures/Image.hpp>`
	`20`	`+`
`19`	`21`	`namespace avtranscoder`
`20`	`22`	`{`
`21`	`23`
`@@ -50,6 +52,8 @@ class AvExport VideoDesc`
`50`	`52`	`AVCodecContext* getCodecContext() const { return m_codecContext; }`
`51`	`53`	`#endif`
`52`	`54`
	`55`	`+ ImageDesc getImageDesc() const;`
	`56`	`+`
`53`	`57`	`private:`
`54`	`58`	`void initCodecContext( );`
`55`	`59`