Merge pull request #5 from valnoel/fix_some_audio_process

cchampet · cchampet · commit 0e5eb7c280df · 2014-12-03T14:33:49.000+01:00
Fix block_align and audio demux without specified an output profile
diff --git a/src/AvTranscoder/codedStream/AvInputStream.cpp b/src/AvTranscoder/codedStream/AvInputStream.cpp
@@ -35,13 +35,6 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
 		}
 		case AVMEDIA_TYPE_AUDIO:
 		{
-			double outputFps = 25;
-			size_t bytePerSample = av_get_bytes_per_sample( context->sample_fmt );
-
-			context->block_align = 1.0 * context->sample_rate * context->channels * bytePerSample / outputFps;
-			// std::cout << "channels " << context->channel_layout << std::endl;
-			// std::cout << "audio buffer read size " << context->block_align << std::endl;
-
 			AudioCodec* audioCodec = new AudioCodec( eCodecTypeDecoder, context->codec_id );
 			audioCodec->setAudioParameters( context->sample_rate, context->channels, context->sample_fmt );
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -393,16 +393,26 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	// Create profile as input configuration
 	NoDisplayProgress progress;
 	referenceFile->analyse( progress, eAnalyseLevelHeader );
-	AudioProperties audioProperties = referenceFile->getProperties().getAudioProperties().at( streamIndex );
+
+	const AudioProperties* audioProperties = NULL;
+ 	for( size_t i = 0; i < referenceFile->getProperties().getAudioProperties().size(); i++ )
+ 	{
+		if( referenceFile->getProperties().getAudioProperties().at( i ).getStreamId() == streamIndex )
+ 		{
+			audioProperties = &referenceFile->getProperties().getAudioProperties().at( i );
+ 		}
+ 	}
+	if( audioProperties == NULL )
+ 		throw std::runtime_error( "cannot set audio stream properties" );
 
 	ProfileLoader::Profile profile;
 	profile[ constants::avProfileIdentificator ] = "presetRewrap";
 	profile[ constants::avProfileIdentificatorHuman ] = "Preset rewrap";
 	profile[ constants::avProfileType ] = avtranscoder::constants::avProfileTypeAudio;
-	profile[ constants::avProfileCodec ] = audioProperties.getCodecName();
-	profile[ constants::avProfileSampleFormat ] = audioProperties.getSampleFormatName();
+	profile[ constants::avProfileCodec ] = audioProperties->getCodecName();
+	profile[ constants::avProfileSampleFormat ] = audioProperties->getSampleFormatName();
 	std::stringstream ss;
-	ss << audioProperties.getSampleRate();
+	ss << audioProperties->getSampleRate();
 	profile[ constants::avProfileSampleRate ] = ss.str();
 	profile[ constants::avProfileChannel ] = "1";
 

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,6 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )`
`35`	`35`	`}`
`36`	`36`	`case AVMEDIA_TYPE_AUDIO:`
`37`	`37`	`{`
`38`		`- double outputFps = 25;`
`39`		`- size_t bytePerSample = av_get_bytes_per_sample( context->sample_fmt );`
`40`		`-`
`41`		`- context->block_align = 1.0 * context->sample_rate * context->channels * bytePerSample / outputFps;`
`42`		`- // std::cout << "channels " << context->channel_layout << std::endl;`
`43`		`- // std::cout << "audio buffer read size " << context->block_align << std::endl;`
`44`		`-`
`45`	`38`	`AudioCodec* audioCodec = new AudioCodec( eCodecTypeDecoder, context->codec_id );`
`46`	`39`	`audioCodec->setAudioParameters( context->sample_rate, context->channels, context->sample_fmt );`
`47`	`40`