added support for fetching the default video/audio codec of an output format

Author: Raveler

source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.cpp

@@ -1,6 +1,7 @@
 #include "Muxer.h"
 #include "FFmpegException.h"
 #include "OutputStream.h"
+#include "CodecDeducer.h"
 
 #include <string>
 
@@ -70,6 +71,16 @@ namespace ffmpegcpp
 		packetQueue.clear();
 	}
 
+	AVCodec* Muxer::GetDefaultVideoFormat()
+	{
+		return CodecDeducer::DeduceEncoder(containerFormat->video_codec);
+	}
+
+	AVCodec* Muxer::GetDefaultAudioFormat()
+	{
+		return CodecDeducer::DeduceEncoder(containerFormat->audio_codec);
+	}
+
 	void Muxer::AddOutputStream(OutputStream* outputStream)
 	{
 		if (opened) throw FFmpegException("You cannot open a new stream after something was written to the muxer");

source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.h

@@ -23,6 +23,9 @@ namespace ffmpegcpp {
 
 		bool IsPrimed();
 
+		AVCodec* GetDefaultVideoFormat();
+		AVCodec* GetDefaultAudioFormat();
+
 
 	private:
 

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

@@ -82,47 +82,6 @@ namespace ffmpegcpp
 		}
 	}
 
-	/*vector<StreamInfo> Demuxer::GetAudioStreamInfo()
-	{
-		return GetStreamInfo(AVMEDIA_TYPE_AUDIO);
-	}
-
-	vector<StreamInfo> Demuxer::GetVideoStreamInfo()
-	{
-		return GetStreamInfo(AVMEDIA_TYPE_VIDEO);
-	}
-
-	vector<StreamInfo> Demuxer::GetStreamInfo(AVMediaType mediaType)
-	{
-		vector<StreamInfo> streamInfo;
-		for (int i = 0; i < containerContext->nb_streams; ++i)
-		{
-			AVStream* stream = containerContext->streams[i];
-
-			// find decoder for the stream
-			AVCodec* codec = CodecDeducer::DeduceDecoder(stream->codecpar->codec_id);
-			if (!codec)
-			{
-				throw FFmpegException(string("Failed to deduce codec for stream ") + std::to_string(i) + " in container");
-			}
-
-			if (codec->type == mediaType)
-			{
-				streamInfo.push_back(CreateInfo(i, stream, codec));
-			}
-		}
-		return streamInfo;
-	}
-
-	StreamInfo Demuxer::CreateInfo(int streamIndex, AVStream* stream, AVCodec* codec)
-	{
-		StreamInfo info;
-		info.streamId = streamIndex;
-		info.stream = stream;
-		info.codec = codec;
-		return info;
-	}*/
-
 	void Demuxer::DecodeBestAudioStream(FrameSink* frameSink)
 	{
 		int ret = av_find_best_stream(containerContext, AVMEDIA_TYPE_AUDIO, -1, -1, NULL, 0);
@@ -338,4 +297,9 @@ namespace ffmpegcpp
 		// Return the right stream's frame count.
 		return GetInputStreamById(streamId)->GetFramesProcessed();
 	}
+
+	const char* Demuxer::GetFileName()
+	{
+		return fileName;
+	}
 }

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

@@ -32,6 +32,8 @@ namespace ffmpegcpp
 		ContainerInfo GetInfo();
 		int GetFrameCount(int streamId);
 
+		const char* GetFileName();
+
 	private:
 
 		bool done = false;