diff options
Diffstat (limited to 'audio/decode')
-rw-r--r-- | audio/decode/ad.h | 6 | ||||
-rw-r--r-- | audio/decode/dec_audio.c | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 3bc3e39267..de1bc33aba 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -48,10 +48,4 @@ extern const ad_functions_t * const mpcodecs_ad_drivers[]; // fallback if ADCTRL_SKIP not implemented: ds_fill_buffer(sh_audio->ds); #define ADCTRL_SKIP_FRAME 2 // skip block/frame, called while seeking -// fallback if ADCTRL_QUERY_FORMAT not implemented: sh_audio->sample_format -#define ADCTRL_QUERY_FORMAT 3 // test for availabilty of a format - -// fallback: use hw mixer in libao -#define ADCTRL_SET_VOLUME 4 // not used at the moment - #endif /* MPLAYER_AD_H */ diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index cac33a9a31..69ca3f110c 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -47,16 +47,8 @@ static int init_audio_codec(sh_audio_t *sh_audio, const char *decoder) { assert(!sh_audio->initialized); resync_audio_stream(sh_audio); - sh_audio->samplesize = 2; - sh_audio->sample_format = AF_FORMAT_S16_NE; - if ((af_cfg.force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT) { - int fmt = AF_FORMAT_FLOAT_NE; - if (sh_audio->ad_driver->control(sh_audio, ADCTRL_QUERY_FORMAT, - &fmt) == CONTROL_TRUE) { - sh_audio->sample_format = fmt; - sh_audio->samplesize = 4; - } - } + sh_audio->samplesize = 4; + sh_audio->sample_format = AF_FORMAT_FLOAT_NE; sh_audio->audio_out_minsize = 8192; // default, preinit() may change it if (!sh_audio->ad_driver->preinit(sh_audio)) { mp_tmsg(MSGT_DECAUDIO, MSGL_ERR, "Audio decoder preinit failed.\n"); |