diff options
| author | wm4 <wm4@nowhere> | 2013-11-27 20:54:07 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-27 21:14:39 +0100 |
| commit | f09b2ff661040828e2b17fad89613f7706b10e7d (patch) | |
| tree | 5c5b54a30cf6bf0e1ffda152be3e2b91b1f2a0e1 /mpvcore | |
| parent | f2b5267e88ca68dd6933c97aa4f12e5c073b5a48 (diff) | |
| download | mpv-f09b2ff661040828e2b17fad89613f7706b10e7d.tar.bz2 mpv-f09b2ff661040828e2b17fad89613f7706b10e7d.tar.xz | |
cosmetics: rename video/audio reset functions
These used the suffix _resync_stream, which is a bit misleading. Nothing
gets "resynchronized", they really just reset state.
(Some audio decoders actually used to "resync" by reading packets for
resuming playback, but that's not the case anymore.)
Also move the function in dec_video.c to the top of the file.
Diffstat (limited to 'mpvcore')
| -rw-r--r-- | mpvcore/player/command.c | 4 | ||||
| -rw-r--r-- | mpvcore/player/playloop.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c index 884a9244b0..bb72ec4d9a 100644 --- a/mpvcore/player/command.c +++ b/mpvcore/player/command.c @@ -624,10 +624,10 @@ static int mp_property_angle(m_option_t *prop, int action, void *arg, angle = demuxer_set_angle(demuxer, *(int *)arg); if (angle >= 0) { if (mpctx->d_video) - video_resync_stream(mpctx->d_video); + video_reset_decoding(mpctx->d_video); if (mpctx->d_audio) - audio_resync_stream(mpctx->d_audio); + audio_reset_decoding(mpctx->d_audio); } return M_PROPERTY_OK; case M_PROPERTY_GET_TYPE: { diff --git a/mpvcore/player/playloop.c b/mpvcore/player/playloop.c index 73c751652c..d2c3904c77 100644 --- a/mpvcore/player/playloop.c +++ b/mpvcore/player/playloop.c @@ -170,7 +170,7 @@ void add_step_frame(struct MPContext *mpctx, int dir) static void seek_reset(struct MPContext *mpctx, bool reset_ao) { if (mpctx->d_video) { - video_resync_stream(mpctx->d_video); + video_reset_decoding(mpctx->d_video); vo_seek_reset(mpctx->video_out); if (mpctx->d_video->vf_initialized == 1) vf_chain_seek_reset(mpctx->d_video->vfilter); @@ -184,7 +184,7 @@ static void seek_reset(struct MPContext *mpctx, bool reset_ao) } if (mpctx->d_audio) { - audio_resync_stream(mpctx->d_audio); + audio_reset_decoding(mpctx->d_audio); if (mpctx->d_audio->afilter) af_control_all(mpctx->d_audio->afilter, AF_CONTROL_RESET, NULL); if (reset_ao) |