adding missing Datas Structures

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 91851c267211 · 2014-02-05T13:54:03.000+01:00
diff --git a/src/AvTranscoder/DatasStructures/Pixel.cpp b/src/AvTranscoder/DatasStructures/Pixel.cpp
@@ -0,0 +1,63 @@
+#include "Pixel.hpp"
+
+extern "C" {
+#ifndef __STDC_CONSTANT_MACROS
+	#define __STDC_CONSTANT_MACROS
+#endif
+#include <libavutil/pixfmt.h>
+#include <libswscale/swscale.h>
+#include <libavutil/imgutils.h>
+#include <libavutil/pixdesc.h>
+}
+
+namespace avtranscoder
+{
+
+bool Pixel::asCorrectColorComponents( const AVPixFmtDescriptor* pix_desc, const EComponentType componentType )
+{
+	if( componentType == eComponentRgb && pix_desc->flags & PIX_FMT_RGB )
+		return true;
+	if( ( componentType != eComponentRgb ) && ! ( pix_desc->flags & PIX_FMT_RGB ) )
+		return true;
+	return false;
+}
+
+bool Pixel::asCorrectSubsampling( const AVPixFmtDescriptor* pix_desc, const ESubsamplingType subsamplingType )
+{
+	switch( subsamplingType )
+	{
+		case eSubsamplingNone :
+			return  ( pix_desc->log2_chroma_w == false ) &&
+					( pix_desc->log2_chroma_h == false );
+		case eSubsampling422 :
+			return  ( pix_desc->log2_chroma_w == true  ) &&
+					( pix_desc->log2_chroma_h == false );
+		case eSubsampling420 :
+			return  ( pix_desc->log2_chroma_w == true  ) &&
+					( pix_desc->log2_chroma_h == true  );
+	}
+	return false;
+}
+
+void Pixel::findMatchingPixel()
+{
+	const AVPixFmtDescriptor *pix_desc = NULL;
+	while( ( pix_desc = av_pix_fmt_desc_next( pix_desc ) ) )
+	{
+		//std::cout << pix_desc->name << std::endl;
+		// enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id( pix_desc );
+		if( m_components   == (int) pix_desc->nb_components &&
+			m_bitDepth     == (size_t) av_get_bits_per_pixel( pix_desc ) &&
+			m_endianess    == ( pix_desc->flags & PIX_FMT_BE ) &&
+			m_outWithAlpha == ( pix_desc->flags & PIX_FMT_ALPHA ) &&
+			asCorrectColorComponents( pix_desc, m_componentType ) &&
+			asCorrectSubsampling( pix_desc, m_subsamplingType ) )
+		{
+			//std::cout << "select : " << pix_desc->name << std::endl;
+			m_pixel = av_pix_fmt_desc_get_id( pix_desc );
+			return;
+		}
+	}
+}
+
+}
diff --git a/src/AvTranscoder/DatasStructures/VideoStream.cpp b/src/AvTranscoder/DatasStructures/VideoStream.cpp
@@ -0,0 +1,12 @@
+#include "VideoStream.hpp"
+
+namespace avtranscoder
+{
+
+void VideoStream::setCodecFromName( const std::string& codecName )
+{
+	AVCodec* codec = avcodec_find_encoder_by_name( codecName.c_str() );
+	m_codecId = codec->id;
+}
+
+}
diff --git a/src/AvTranscoder/DatasStructures/VideoStream.hpp b/src/AvTranscoder/DatasStructures/VideoStream.hpp
@@ -0,0 +1,43 @@
+#ifndef _AV_TRANSCODER_DATA_VIDEO_STREAM_HPP_
+#define _AV_TRANSCODER_DATA_VIDEO_STREAM_HPP_
+
+#include "Image.hpp"
+#include <string>
+
+extern "C" {
+#ifndef __STDC_CONSTANT_MACROS
+	#define __STDC_CONSTANT_MACROS
+#endif
+#ifndef INT64_C
+	#define INT64_C(c) (c ## LL)
+	#define UINT64_C(c) (c ## ULL)
+#endif
+#include <libavcodec/avcodec.h>
+}
+
+namespace avtranscoder
+{
+
+class VideoStream
+{
+public:
+	VideoStream(){};
+
+	void setCodecFromName( const std::string& codecName );
+
+	void setCodecFromID( const AVCodecID codecId ) { m_codecId = codecId; }
+
+	void setParametersFromImage( const Image& image );
+
+	void setBitrate( const size_t bitRate ) { m_bitRate = bitRate; }
+
+	AVCodecID getCodecId() const { return m_codecId; }
+
+private:
+	AVCodecID m_codecId;
+	size_t    m_bitRate;
+};
+
+}
+
+#endif
