s->frame_size = len;
/* update codec info */
avctx->sample_rate = sample_rate;
- /* allow downmixing to mono or stereo for AC3 */
+ /* allow downmixing to stereo (or mono for AC3) */
if(avctx->request_channels > 0 &&
avctx->request_channels < channels &&
- avctx->request_channels <= 2 &&
- avctx->codec_id == CODEC_ID_AC3) {
+ (avctx->request_channels <= 2 ||
+ (avctx->request_channels == 1 &&
+ avctx->codec_id == CODEC_ID_AC3))) {
avctx->channels = avctx->request_channels;
} else {
avctx->channels = channels;
24000, 22050, 16000, 12000, 11025, 8000
};
+static void channel_setup(AVCodecContext *avctx)
+{
+#ifdef FAAD2_VERSION
+ FAACContext *s = avctx->priv_data;
+ if (avctx->request_channels > 0 && avctx->request_channels == 2 &&
+ avctx->request_channels < avctx->channels) {
+ faacDecConfigurationPtr faac_cfg;
+ avctx->channels = 2;
+ faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle);
+ faac_cfg->downMatrix = 1;
+ s->faacDecSetConfiguration(s->faac_handle, faac_cfg);
+ }
+#endif
+}
+
static int faac_init_mp4(AVCodecContext *avctx)
{
FAACContext *s = avctx->priv_data;
} else {
avctx->sample_rate = samplerate;
avctx->channels = channels;
+ channel_setup(avctx);
s->init = 1;
}
}
}
avctx->sample_rate = srate;
avctx->channels = channels;
+ channel_setup(avctx);
s->init = 1;
}
faac_init_mp4(avctx);
+ if(!s->init && avctx->channels > 0)
+ channel_setup(avctx);
+
return 0;
}