AudioFrame: add getSampleFormat to get it as string

Clement Champetier · Clement Champetier · commit 7de4cbdc8fb2 · 2014-10-16T18:43:47.000+02:00
Also rename getSampleFormat to getAVSampleFormat in this class.
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -53,7 +53,7 @@ const AVSampleFormat AudioCodec::getAVSampleFormat() const
 
 void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 {
-	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getSampleFormat() );
+	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getAVSampleFormat() );
 }
 
 void AudioCodec::setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat )
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
@@ -46,8 +46,8 @@ bool GeneratorAudio::readNextFrame( Frame& frameBuffer )
 
 		//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );
 		int fill_char = (
-			_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8 ||
-			_frameDesc.getSampleFormat() == AV_SAMPLE_FMT_U8P
+			_frameDesc.getAVSampleFormat() == AV_SAMPLE_FMT_U8 ||
+			_frameDesc.getAVSampleFormat() == AV_SAMPLE_FMT_U8P
 			) ? 0x80 : 0x00;
 
 		memset( frameBuffer.getPtr(), fill_char, frameBuffer.getSize() );
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -37,7 +37,12 @@ class AvExport AudioFrameDesc
 	size_t getSampleRate() const { return _sampleRate; }
 	size_t getChannels  () const { return _channels; }
 	size_t getFps       () const { return _fps; }
-	AVSampleFormat getSampleFormat() const { return _sampleFormat; }
+	AVSampleFormat getAVSampleFormat() const { return _sampleFormat; }
+	std::string getSampleFormat() const
+	{
+		const char* formatName = av_get_sample_fmt_name( _sampleFormat );
+		return formatName ? std::string( formatName ) : "unknown audio sample format";
+	}
 
 private:
 	size_t _sampleRate;
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -52,8 +52,8 @@ bool AudioTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 	av_opt_set_int(  _audioConvertContext, "out_channel_layout", av_get_default_channel_layout( dst.desc().getChannels() ), 0 );
 	av_opt_set_int(  _audioConvertContext, "in_sample_rate",     src.desc().getSampleRate(), 0 );
 	av_opt_set_int(  _audioConvertContext, "out_sample_rate",    dst.desc().getSampleRate(), 0 );
-	SetSampleFormat( _audioConvertContext, "in_sample_fmt",      src.desc().getSampleFormat(), 0 );
-	SetSampleFormat( _audioConvertContext, "out_sample_fmt",     dst.desc().getSampleFormat(), 0 );
+	SetSampleFormat( _audioConvertContext, "in_sample_fmt",      src.desc().getAVSampleFormat(), 0 );
+	SetSampleFormat( _audioConvertContext, "out_sample_fmt",     dst.desc().getAVSampleFormat(), 0 );
 	
 	if( InitResampleContext( _audioConvertContext ) < 0 )
 	{

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ const AVSampleFormat AudioCodec::getAVSampleFormat() const`
`53`	`53`
`54`	`54`	`void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )`
`55`	`55`	`{`
`56`		`- setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getSampleFormat() );`
	`56`	`+ setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getAVSampleFormat() );`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`void AudioCodec::setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat )`