AudioTransform: set options in a simpler way

Clement Champetier · Clement Champetier · commit 6f68e2f79878 · 2014-06-05T12:19:05.000+02:00
Use swr_alloc_set_opts() instead of setting options one by one, with a
risk of runtime error if an option we want to set doesn't exist.
diff --git a/src/AvTranscoder/AudioTransform.cpp b/src/AvTranscoder/AudioTransform.cpp
@@ -34,14 +34,10 @@ bool AudioTransform::init( const AudioFrame& src, const AudioFrame& dst )
 		throw std::runtime_error( "unable to create audio convert context" );
 	}
 	
-	av_opt_set_int(m_audioConvertContext, "in_channel_layout", av_get_default_channel_layout( src.desc().getChannels() ), 0);
-	av_opt_set_int(m_audioConvertContext, "out_channel_layout", av_get_default_channel_layout( dst.desc().getChannels() ), 0);
-	
-	av_opt_set_int(m_audioConvertContext, "in_sample_rate", src.desc().getSampleRate(), 0);
-	av_opt_set_int(m_audioConvertContext, "out_sample_rate", dst.desc().getSampleRate(), 0);
-	
-	av_opt_set_int(m_audioConvertContext, "in_sample_fmt", src.desc().getSampleFormat(), 0);
-	av_opt_set_int(m_audioConvertContext, "out_sample_fmt", dst.desc().getSampleFormat(), 0);
+	swr_alloc_set_opts( m_audioConvertContext,
+	                    av_get_default_channel_layout( dst.desc().getChannels() ), dst.desc().getSampleFormat(), av_get_default_channel_layout( dst.desc().getSampleRate() ),
+	                    av_get_default_channel_layout( src.desc().getChannels() ), src.desc().getSampleFormat(), av_get_default_channel_layout( src.desc().getSampleRate() ),
+	                    0, NULL);
 	
 	if( swr_init( m_audioConvertContext ) < 0 )
 	{
