diff options
author | wm4 <wm4@nowhere> | 2016-01-21 22:10:15 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-01-22 00:25:44 +0100 |
commit | fef8b7984be5a6244612d346bd60d2badd4a2e63 (patch) | |
tree | 9a9c4ef4b3cbe9d8ee0854a77913df8ce00dab8f /player/command.c | |
parent | 27ecc417fedf25b2408e49fafdae4421d5115532 (diff) | |
download | mpv-fef8b7984be5a6244612d346bd60d2badd4a2e63.tar.bz2 mpv-fef8b7984be5a6244612d346bd60d2badd4a2e63.tar.xz |
audio: refactor: work towards unentangling audio decoding and filtering
Similar to the video path. dec_audio.c now handles decoding only. It
also looks very similar to dec_video.c, and actually contains some of
the rewritten code from it. (A further goal might be unifying the
decoders, I guess.)
High potential for regressions.
Diffstat (limited to 'player/command.c')
-rw-r--r-- | player/command.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/player/command.c b/player/command.c index 413349dce3..52f0b1830f 100644 --- a/player/command.c +++ b/player/command.c @@ -1242,9 +1242,9 @@ static int mp_property_filter_metadata(void *ctx, struct m_property *prop, struct vf_chain *vf = mpctx->vo_chain->vf; res = vf_control_by_label(vf, VFCTRL_GET_METADATA, &metadata, key); } else if (strcmp(type, "af") == 0) { - if (!(mpctx->d_audio && mpctx->d_audio->afilter)) + if (!(mpctx->ao_chain && mpctx->ao_chain->af)) return M_PROPERTY_UNAVAILABLE; - struct af_stream *af = mpctx->d_audio->afilter; + struct af_stream *af = mpctx->ao_chain->af; res = af_control_by_label(af, AF_CONTROL_GET_METADATA, &metadata, key); } switch (res) { @@ -1751,8 +1751,8 @@ static int mp_property_audio_params(void *ctx, struct m_property *prop, { MPContext *mpctx = ctx; struct mp_audio fmt = {0}; - if (mpctx->d_audio) - fmt = mpctx->d_audio->decode_format; + if (mpctx->ao_chain) + fmt = mpctx->ao_chain->input_format; return property_audiofmt(fmt, action, arg); } |