summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-11-09 16:35:44 +0100
committerwm4 <wm4@nowhere>2016-11-09 16:44:06 +0100
commit67467103e8c7a143c8eafda86d312dfa0c949266 (patch)
tree5adee2ce7c9bd653ec9afab40457d7d37c50631a /video/decode
parenta55e8ff31cc974843e28282ccbdc46dd3e70a5af (diff)
downloadmpv-67467103e8c7a143c8eafda86d312dfa0c949266.tar.bz2
mpv-67467103e8c7a143c8eafda86d312dfa0c949266.tar.xz
dec_video, dec_audio: avoid full reinit on switches to the same segment
Same deal as with the previous commit. (Unfortunately, this code is still duplicated.)
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/dec_video.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 0dc51943bc..ed7cd875ea 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -459,12 +459,15 @@ void video_work(struct dec_video *d_video)
struct demux_packet *new_segment = d_video->new_segment;
d_video->new_segment = NULL;
- // Could avoid decoder reinit; would still need flush.
- d_video->codec = new_segment->codec;
- if (d_video->vd_driver)
- d_video->vd_driver->uninit(d_video);
- d_video->vd_driver = NULL;
- video_init_best_codec(d_video);
+ if (d_video->codec == new_segment->codec) {
+ video_reset(d_video);
+ } else {
+ d_video->codec = new_segment->codec;
+ if (d_video->vd_driver)
+ d_video->vd_driver->uninit(d_video);
+ d_video->vd_driver = NULL;
+ video_init_best_codec(d_video);
+ }
d_video->start = new_segment->start;
d_video->end = new_segment->end;