adding MaxRate as a metadata for detecting Mpeg2 bitRate with FFMpeg

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 842e0965f067 · 2014-03-06T08:31:50.000+01:00
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -80,6 +80,7 @@ void displayMetadatas( const char* filename )
 		std::cout << std::setw( keyWidth ) << "endianess"        << ": " << input.getProperties().videoStreams.at(videoStreamIndex).endianess << std::endl;
 		
 		std::cout << std::setw( keyWidth ) << "bit rate"         << ": " << input.getProperties().videoStreams.at(videoStreamIndex).bitRate << std::endl;
+		std::cout << std::setw( keyWidth ) << "max bit rate"     << ": " << input.getProperties().videoStreams.at(videoStreamIndex).maxBitRate << std::endl;
 
 		std::cout << std::setw( keyWidth ) << "color transfert"  << ": " << input.getProperties().videoStreams.at(videoStreamIndex).colorTransfert << std::endl;
 		std::cout << std::setw( keyWidth ) << "colorspace"       << ": " << input.getProperties().videoStreams.at(videoStreamIndex).colorspace << std::endl;
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
@@ -38,6 +38,7 @@ struct VideoProperties {
 	size_t      streamId;
 	size_t      codecId;
 	size_t      bitRate;
+	size_t      maxBitRate;
 	size_t      ticksPerFrame;
 	size_t      width;
 	size_t      height;
diff --git a/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp b/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp
@@ -84,7 +84,9 @@ VideoProperties videoStreamInfo( AVFormatContext* formatContext, const size_t in
 
 	vp.codecName        = codec_context->codec_name;
 	vp.codecLongName    = codec_context->codec_name;
+	vp.codecId          = codec_context->codec_id;
 	vp.bitRate          = codec_context->bit_rate;
+	vp.maxBitRate       = codec_context->rc_max_rate;
 	vp.isInterlaced     = false;
 
 	vp.ticksPerFrame    = codec_context->ticks_per_frame,
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -8,6 +8,7 @@ extern "C" {
 #include <libavutil/version.h>
 #include <libavformat/version.h>
 #include <libavcodec/version.h>
+#include <libavcodec/avcodec.h>
 }
 
 #include <string>

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ extern "C" {`
`8`	`8`	`#include <libavutil/version.h>`
`9`	`9`	`#include <libavformat/version.h>`
`10`	`10`	`#include <libavcodec/version.h>`
	`11`	`+#include <libavcodec/avcodec.h>`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`#include <string>`