Transcoder: transcode stream if user wants to demultiplexing and copy a stream

Clement Champetier · Clement Champetier · commit d7c7cadeef47 · 2014-11-06T18:06:23.000+01:00
* Same behavior as ffmpeg: transcode with the same "profile" as input.
* Need to update 'sampleFormat' of AudioStreamProperty: use
av_get_sample_fmt_name (ffmpeg function insted of creating our specific
strings).
diff --git a/src/AvTranscoder/mediaProperty/AudioStreamProperty.hpp b/src/AvTranscoder/mediaProperty/AudioStreamProperty.hpp
@@ -43,23 +43,9 @@ avtranscoder::AudioProperties audioStreamInfo( const AVFormatContext* formatCont
 	if( channelDescription )
 		ap.channelDescription = std::string( channelDescription );
 #endif
-	
-	std::string sampleFormat = "";
-	switch( codec_context->sample_fmt )
-	{
-		case AV_SAMPLE_FMT_NONE : ap.sampleFormat = "none"; break;
-		case AV_SAMPLE_FMT_U8   : ap.sampleFormat = "unsigned 8 bits"; break;
-		case AV_SAMPLE_FMT_S16  : ap.sampleFormat = "signed 16 bits"; break;
-		case AV_SAMPLE_FMT_S32  : ap.sampleFormat = "signed 32 bits"; break;
-		case AV_SAMPLE_FMT_FLT  : ap.sampleFormat = "float"; break;
-		case AV_SAMPLE_FMT_DBL  : ap.sampleFormat = "double"; break;
-		case AV_SAMPLE_FMT_U8P  : ap.sampleFormat = "unsigned 8 bits, planar"; break;
-		case AV_SAMPLE_FMT_S16P : ap.sampleFormat = "signed 16 bits, planar"; break;
-		case AV_SAMPLE_FMT_S32P : ap.sampleFormat = "signed 32 bits, planar"; break;
-		case AV_SAMPLE_FMT_FLTP : ap.sampleFormat = "float, planar"; break;
-		case AV_SAMPLE_FMT_DBLP : ap.sampleFormat = "double, planar"; break;
-		case AV_SAMPLE_FMT_NB   : ap.sampleFormat = "Number of sample formats."; break;
-	}
+        const char* fmtName = av_get_sample_fmt_name( codec_context->sample_fmt );
+        if( fmtName )
+            ap.sampleFormat = std::string( fmtName );
 
 	return ap;
 }
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -1,8 +1,11 @@
 #include "Transcoder.hpp"
 
+#include <AvTranscoder/progress/NoDisplayProgress.hpp>
+
 #include <limits>
 #include <iostream>
 #include <algorithm>
+#include <sstream>
 
 namespace avtranscoder
 {
@@ -83,9 +86,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 
 	// Check filename
 	if( ! filename.length() )
-	{
 		throw std::runtime_error( "Can't transcode a stream without filename indicated" );
-	}
 
 	if( _verbose )
 		std::cout << "Add transcoded stream" << std::endl;
@@ -132,8 +133,33 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 			addRewrapStream( filename, streamIndex );
 			return;
 		}
+		// Transcode (transparent for the user)
 		else
-			throw std::runtime_error( "Can't demultiplexing and re-wrap a stream" );
+		{
+			if( _verbose )
+				std::cout << "Add transcoded stream (because of demultiplexing)" << std::endl;
+			// Create profile as input configuration
+			InputFile inputFile( filename );
+			NoDisplayProgress progress;
+			inputFile.analyse( progress, InputFile::eAnalyseLevelFast );
+			AudioProperties audioProperties = inputFile.getProperties().audioStreams.at( streamIndex );  // Warning: only manage audio case
+
+			ProfileLoader::Profile profile;
+			profile[ constants::avProfileIdentificator ] = "presetRewrap";
+			profile[ constants::avProfileIdentificatorHuman ] = "Preset rewrap";
+			profile[ constants::avProfileType ] = avtranscoder::constants::avProfileTypeAudio;
+			profile[ constants::avProfileCodec ] = audioProperties.codecName;
+			profile[ constants::avProfileSampleFormat ] = audioProperties.sampleFormat;
+			std::stringstream ss;
+			ss << audioProperties.sampleRate;
+			profile[ constants::avProfileSampleRate ] = ss.str();
+			profile[ constants::avProfileChannel ] = "1";
+
+			// Add profile
+			_profileLoader.update( profile );
+
+			add( filename, streamIndex, subStreamIndex, profile, offset );
+		}
 	}
 	// Transcode
 	else
@@ -163,8 +189,33 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 			addRewrapStream( filename, streamIndex );
 			return;
 		}
+		// Transcode (transparent for the user)
 		else
-			throw std::runtime_error( "Can't demultiplexing and re-wrap a stream" );
+		{
+			if( _verbose )
+				std::cout << "Add transcoded stream (because of demultiplexing)" << std::endl;
+			// Create profile as input configuration
+			InputFile inputFile( filename );
+			NoDisplayProgress progress;
+			inputFile.analyse( progress, InputFile::eAnalyseLevelFast );
+			AudioProperties audioProperties = inputFile.getProperties().audioStreams.at( streamIndex );  // Warning: only manage audio case
+
+			ProfileLoader::Profile profile;
+			profile[ constants::avProfileIdentificator ] = "presetRewrap";
+			profile[ constants::avProfileIdentificatorHuman ] = "Preset rewrap";
+			profile[ constants::avProfileType ] = avtranscoder::constants::avProfileTypeAudio;
+			profile[ constants::avProfileCodec ] = audioProperties.codecName;
+			profile[ constants::avProfileSampleFormat ] = audioProperties.sampleFormat;
+			std::stringstream ss;
+			ss << audioProperties.sampleRate;
+			profile[ constants::avProfileSampleRate ] = ss.str();
+			profile[ constants::avProfileChannel ] = "1";
+
+			// Add profile
+			_profileLoader.update( profile );
+
+			add( filename, streamIndex, subStreamIndex, profile, offset );
+		}
 	}
 	// Transcode
 	else
@@ -188,9 +239,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 
 	// Check filename
 	if( ! filename.length() )
-	{
 		throw std::runtime_error( "Can't transcode a stream without filename indicated" );
-	}
 
 	if( _verbose )
 		std::cout << "Add transcoded for substream " << subStreamIndex << std::endl;
