summaryrefslogtreecommitdiffstats
path: root/demux/demux_mpg.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-01 13:20:33 +0100
committerwm4 <wm4@nowhere>2013-03-01 14:44:53 +0100
commit8ddfabc5354c82e931334658b60f22ecdb3ebb1b (patch)
tree251eb0c5d0a1a13c7763e834b47d1aeaca0547b2 /demux/demux_mpg.c
parentc82a83d8afd98582e778cbf02a4ecc44e2d6399d (diff)
downloadmpv-8ddfabc5354c82e931334658b60f22ecdb3ebb1b.tar.bz2
mpv-8ddfabc5354c82e931334658b60f22ecdb3ebb1b.tar.xz
core: fix SEEK_FACTOR
Emulate percentage-seeks (SEEK_FACTOR) as normal time-seeks if possible. This fixes some issues with (let's call it) low quality implementations of SEEK_FACTOR (e.g. demux_mkv basically interprets this as byte-seek, and also seeking to 99.9% makes it seek back to the start). For weird MPEG formats the demuxer level SEEK_FACTOR is still used. These formats, which can have timestamp resets, are identified by setting demuxer->ts_resets_possible to true. Also, have get_current_pos_ratio() follow the same rules, and calculate the percentage position with the file position if timestamp resets are possible. This actually fixes percentage-seeks in .ts files with demux_lavf.c. This kind of seek is not really used now, but it will be more important when we add a progress bar. Note: seeking in chained ogg files is still completely broken. The main issue is that ffmpeg doesn't provide a sane API for dealing with timestamp resets, and trying to do byte seeks with ogg confuses demuxer and decoder (or something like this) and just does random things. (Tested with two concatenated flac-in-ogg files).
Diffstat (limited to 'demux/demux_mpg.c')
-rw-r--r--demux/demux_mpg.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/demux/demux_mpg.c b/demux/demux_mpg.c
index ab157be748..52153b9a6a 100644
--- a/demux/demux_mpg.c
+++ b/demux/demux_mpg.c
@@ -1134,6 +1134,8 @@ static demuxer_t* demux_mpg_es_open(demuxer_t* demuxer)
demuxer->video->sh = new_sh_video(demuxer,0); // create dummy video stream header, id=0
sh_video=demuxer->video->sh;sh_video->ds=demuxer->video;
+ demuxer->ts_resets_possible = true;
+
return demuxer;
}
@@ -1142,6 +1144,9 @@ static demuxer_t *demux_mpg_gxf_open(demuxer_t *demuxer) {
demuxer->video->sh = new_sh_video(demuxer,0);
((sh_video_t *)demuxer->video->sh)->ds = demuxer->video;
demuxer->priv = (void *) 0xffffffff;
+
+ demuxer->ts_resets_possible = true;
+
return demuxer;
}
@@ -1152,6 +1157,8 @@ static demuxer_t* demux_mpg_ps_open(demuxer_t* demuxer)
sh_video=demuxer->video->sh;sh_video->ds=demuxer->video;
+ demuxer->ts_resets_possible = true;
+
if(demuxer->audio->id!=-2) {
if(!ds_fill_buffer(demuxer->audio)){
mp_msg(MSGT_DEMUXER, MSGL_INFO, "MPEG: %s",