merge

Author: Raveler

source/ffmpeg-cpp/difference/difference.vcxproj.user

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>

source/ffmpeg-cpp/difference/obj/x64/Release/difference.log

@@ -1,5 +1,8 @@
-  Generating code
-  All 492 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
+  difference.cpp
+  Generating code
+  13 of 498 functions ( 2.6%) were compiled, the rest were copied from previous compilation.
+    0 functions were new in current compilation
+    4 functions had inline decision re-evaluated but remain unchanged
   Finished generating code
   difference.vcxproj -> D:\WonderMedia\ffmpeg\ffmpeg-cpp\source\ffmpeg-cpp\difference\..\..\..\bin\x64\Release\difference.exe
   D:\WonderMedia\ffmpeg\ffmpeg-cpp\source\ffmpeg-cpp\difference\..\..\..\samples\big_buck_bunny.mp4

source/ffmpeg-cpp/difference/obj/x64/Release/difference.obj

@@ -2,8 +2,8 @@
 
 namespace ffmpegcpp
 {
-	AudioInputStream::AudioInputStream(AudioFrameSink* frameSink, AVStream* stream)
-		: InputStream(stream)
+	AudioInputStream::AudioInputStream(AudioFrameSink* frameSink, AVFormatContext* format, AVStream* stream)
+		: InputStream(format, stream)
 	{
 		SetFrameSink(frameSink);
 	}

source/ffmpeg-cpp/difference/obj/x64/Release/difference.tlog/CL.read.1.tlog

@@ -11,7 +11,7 @@ namespace ffmpegcpp
 
 	public:
 
-		AudioInputStream(AudioFrameSink* frameSink, AVStream* stream);
+		AudioInputStream(AudioFrameSink* frameSink, AVFormatContext* format, AVStream* stream);
 		~AudioInputStream();
 
 	protected:

source/ffmpeg-cpp/difference/obj/x64/Release/difference.tlog/difference.write.1u.tlog

@@ -6,9 +6,10 @@ using namespace std;
 
 namespace ffmpegcpp
 {
-	InputStream::InputStream(AVStream* stream)
+	InputStream::InputStream(AVFormatContext* format, AVStream* stream)
 	{
 		this->stream = stream;
+		this->format = format;
 
 		// find decoder for the stream
 		AVCodec* codec = CodecDeducer::DeduceDecoder(stream->codecpar->codec_id);
@@ -85,14 +86,43 @@ namespace ffmpegcpp
 			av_frame_free(&frame);
 			frame = nullptr;
 		}
+		if (metaData != nullptr)
+		{
+			delete metaData;
+			metaData = nullptr;
+		}
 	}
 
 	void InputStream::SetFrameSink(FrameSink* frameSink)
 	{
 		output = frameSink->CreateStream();
 	}
 
-	int inputSampleCount = 0;
+	StreamData* InputStream::DiscoverMetaData()
+	{
+		/*metaData = new StreamData();
+
+		AVRational* time_base = &timeBaseCorrectedByTicksPerFrame;
+		if (!timeBaseCorrectedByTicksPerFrame.num)
+		{
+			time_base = &stream->time_base;
+		}
+
+		metaData->timeBase.num = time_base->num;
+		metaData->timeBase.den = time_base->den;*/
+
+		AVRational overrideFrameRate;
+		overrideFrameRate.num = 0;
+
+		AVRational tb = overrideFrameRate.num ? av_inv_q(overrideFrameRate) : stream->time_base;
+		AVRational fr = overrideFrameRate;
+		if (!fr.num) fr = av_guess_frame_rate(format, stream, NULL);
+
+		StreamData* metaData = new StreamData();
+		metaData->timeBase = tb;
+		metaData->frameRate = fr;
+		return metaData;
+	}
 
 	void InputStream::DecodePacket(AVPacket *pkt)
 	{
@@ -122,16 +152,16 @@ namespace ffmpegcpp
 				frame->sample_aspect_ratio = stream->sample_aspect_ratio;
 			}
 
-			AVRational* time_base = &timeBaseCorrectedByTicksPerFrame;
-			if (!timeBaseCorrectedByTicksPerFrame.num)
+			// the meta data does not exist yet - we figure it out!
+			if (metaData == nullptr)
 			{
-				time_base = &stream->time_base;
+				metaData = DiscoverMetaData();
 			}
 
 			// push the frame to the next stage.
 			// The time_base is filled in in the codecContext after the first frame is decoded
 			// so we can fetch it from there.
-			output->WriteFrame(frame, time_base);
+			output->WriteFrame(frame, metaData);
 		}
 	}