added audio info, fixed bug related to stream id's in the demuxer

Author: Raveler

source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/AudioInputStream.cpp

@@ -1,4 +1,6 @@
 #include "AudioInputStream.h"
+#include "FFmpegException.h"
+#include "CodecDeducer.h"
 
 namespace ffmpegcpp
 {
@@ -23,7 +25,44 @@ namespace ffmpegcpp
 
 	void AudioInputStream::AddStreamInfo(ContainerInfo* containerInfo)
 	{
-		// TODO
+		AudioStreamInfo info;
+
+		info.id = stream->id; // the layout of the id's depends on the container format - it doesn't always start from 0 or 1!
+
+		AVRational tb = stream->time_base;
+
+		StreamData* metaData = new StreamData();
+		info.timeBase = tb;
+
+		AVCodecContext* codecContext = avcodec_alloc_context3(NULL);
+		if (!codecContext) throw new FFmpegException("Failed to allocate temporary codec context.");
+		int ret = avcodec_parameters_to_context(codecContext, stream->codecpar);
+		if (ret < 0)
+		{
+			avcodec_free_context(&codecContext);
+			throw new FFmpegException("Failed to read parameters from stream");
+		}
+
+		codecContext->properties = stream->codec->properties;
+		codecContext->codec = stream->codec->codec;
+		codecContext->qmin = stream->codec->qmin;
+		codecContext->qmax = stream->codec->qmax;
+		codecContext->coded_width = stream->codec->coded_width;
+		codecContext->coded_height = stream->codec->coded_height;
+
+		info.bitRate = CalculateBitRate(codecContext);
+
+		AVCodec* codec = CodecDeducer::DeduceDecoder(codecContext->codec_id);
+		info.codec = codec;
+
+		info.sampleRate = codecContext->sample_rate;
+		info.channels = codecContext->channels;
+		info.channelLayout = codecContext->channel_layout;
+		av_get_channel_layout_string(info.channelLayoutName, 255, codecContext->channels, codecContext->channel_layout);
+
+		avcodec_free_context(&codecContext);
+
+		containerInfo->audioStreams.push_back(info);
 	}
 }
 

source/ffmpeg-cpp/ffmpeg-cpp/Demuxing/VideoInputStream.cpp

@@ -22,7 +22,7 @@ namespace ffmpegcpp
 	{
 		VideoStreamInfo info;
 
-		info.id = stream->id - 1; // starts counting from 1!
+		info.id = stream->id; // the layout of the id's depends on the container format - it doesn't always start from 0 or 1!
 
 		AVRational overrideFrameRate;
 		overrideFrameRate.num = 0;

source/ffmpeg-cpp/ffmpeg-cpp/Info/AudioStreamInfo.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "ffmpeg.h"
+
+namespace ffmpegcpp
+{
+	struct AudioStreamInfo
+	{
+		int id;
+		AVRational timeBase;
+		const AVCodec* codec;
+		float bitRate;
+
+		int sampleRate;
+		int channels;
+
+		uint64_t channelLayout;
+		char channelLayoutName[255];
+
+	};
+}

source/ffmpeg-cpp/ffmpeg-cpp/Info/ContainerInfo.h

@@ -2,6 +2,7 @@
 
 #include "ffmpeg.h"
 #include "VideoStreamInfo.h"
+#include "AudioStreamInfo.h"
 #include "std.h"
 
 namespace ffmpegcpp
@@ -15,7 +16,7 @@ namespace ffmpegcpp
 		const AVInputFormat* format;
 
 		std::vector<VideoStreamInfo> videoStreams;
-		// TODO: audio streams!
+		std::vector<AudioStreamInfo> audioStreams;
 	};
 
 

source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.cpp

@@ -184,7 +184,7 @@ namespace ffmpegcpp
 
 		// The stream doesn't exist but we already processed all our frames, so it makes no sense
 		// to add it anymore.
-		if (IsDone()) throw new FFmpegException("Demuxer already fully processed... you cannot use it anymore.");
+		if (IsDone()) return nullptr;
 
 		AVStream* stream = containerContext->streams[streamIndex];
 		AVCodec* codec = CodecDeducer::DeduceDecoder(stream->codecpar->codec_id);
@@ -203,6 +203,19 @@ namespace ffmpegcpp
 		return inputStreams[streamIndex];
 	}
 
+	InputStream* Demuxer::GetInputStreamById(int streamId)
+	{
+		// map the stream id to an index by going over all the streams and comparing the id
+		for (int i = 0; i < containerContext->nb_streams; ++i)
+		{
+			AVStream* stream = containerContext->streams[i];
+			if (stream->id == streamId) return GetInputStream(i);
+		}
+
+		// no match found
+		return nullptr;
+	}
+
 	void Demuxer::PreparePipeline()
 	{
 		bool allPrimed = false;
@@ -323,6 +336,6 @@ namespace ffmpegcpp
 		}
 
 		// Return the right stream's frame count.
-		return GetInputStream(streamId)->GetFramesProcessed();
+		return GetInputStreamById(streamId)->GetFramesProcessed();
 	}
 }

source/ffmpeg-cpp/ffmpeg-cpp/Sources/Demuxer.h

@@ -38,7 +38,8 @@ namespace ffmpegcpp
 
 		const char* fileName;
 
-		InputStream* GetInputStream(int streamId);
+		InputStream* GetInputStream(int index);
+		InputStream* GetInputStreamById(int streamId);
 
 		//std::vector<StreamInfo> GetStreamInfo(AVMediaType mediaType);
 		//StreamInfo CreateInfo(int streamIndex, AVStream* stream, AVCodec* codec);

source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj

@@ -198,6 +198,7 @@
     <ClInclude Include="Frame Sinks\FrameWriter.h" />
     <ClInclude Include="Frame Sinks\OneInputFrameSink.h" />
     <ClInclude Include="FrameContainer.h" />
+    <ClInclude Include="Info\AudioStreamInfo.h" />
     <ClInclude Include="Info\ContainerInfo.h" />
     <ClInclude Include="Info\VideoStreamInfo.h" />
     <ClInclude Include="Sources\EncodedFileSource.h" />

source/ffmpeg-cpp/ffmpeg-cpp/ffmpeg-cpp.vcxproj.filters

@@ -153,6 +153,9 @@
     <ClInclude Include="Frame Sinks\AudioFilter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Info\AudioStreamInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FFmpegException.cpp">

source/ffmpeg-cpp/print_info/print_info.cpp

@@ -9,8 +9,8 @@ using namespace ffmpegcpp;
 int main()
 {
 	// This example will print info about a video.
-	/*try
-	{*/
+	try
+	{
 
 		// Load a video from a container and read its info.
 		const char* fileName = "samples/big_buck_bunny.mp4";
@@ -19,6 +19,7 @@ int main()
 
 		// Print the data similar to ffmpeg.exe.
 		cout << "Input " << info.format->name << " from '" << fileName << "'" << endl;
+
 		cout << "Video streams:" << endl;
 		for (int i = 0; i < info.videoStreams.size(); ++i)
 		{
@@ -34,15 +35,30 @@ int main()
 				<< endl;
 		}
 
+		cout << "Audio streams:" << endl;
+		for (int i = 0; i < info.audioStreams.size(); ++i)
+		{
+			AudioStreamInfo stream = info.audioStreams[i];
+			cout << "Stream #" << (i + 1)
+				<< ": codec " << stream.codec->name
+				<< ", channel layout " << stream.channelLayoutName
+				<< ", channels " << stream.channels
+				<< ", bit rate " << stream.bitRate << "kb/s"
+				<< ", sample rate " << stream.sampleRate
+				<< ", time base " << stream.timeBase.num << "/" << stream.timeBase.den
+				<< ", " << demuxer->GetFrameCount(stream.id) << " frames"
+				<< endl;
+		}
+
 
 
-	/*}
+	}
 	catch (FFmpegException e)
 	{
 		cerr << "Exception caught!" << endl;
 		cerr << e.what() << endl;
 		throw e;
-	}*/
+	}
 
 	cout << "Encoding complete!" << endl;
 	cout << "Press any key to continue..." << endl;