diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-24 10:37:05 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-24 10:37:05 +0000 |
| commit | f33671dc089264c046320ae1cb8ad8123e333370 (patch) | |
| tree | 8211de0275f9f3a94d9b1add2ad6c8b2e78ca602 /stream | |
| parent | cdec77961c6972992c7393609ba1f6bc33916995 (diff) | |
| download | mpv-f33671dc089264c046320ae1cb8ad8123e333370.tar.bz2 mpv-f33671dc089264c046320ae1cb8ad8123e333370.tar.xz | |
at open() discard front margin/empty sectors (fixes demuxing by libavformat); patch by Zuxy meng
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22793 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_vcd.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index b496a745be..201b17b614 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -79,7 +79,7 @@ static void close_s(stream_t *stream) { static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { struct stream_priv_s* p = (struct stream_priv_s*)opts; - int ret,ret2,f; + int ret,ret2,f,sect,tmp; mp_vcd_priv_t* vcd; #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) int bsize = VCD_SECTOR_SIZE; @@ -143,6 +143,18 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { m_struct_free(&stream_opts,opts); return STREAM_ERROR; } + /* search forward up to at most 3 seconds to skip leading margin */ + sect = ret / VCD_SECTOR_DATA; + for (tmp = sect; tmp < sect + 3 * 75; tmp++) { + char mem[VCD_SECTOR_DATA]; + //since MPEG packs are block-aligned we stop discarding sectors if they are non-null + if (vcd_read(vcd, mem) != VCD_SECTOR_DATA || mem[2] || mem[3]) + break; + } + mp_msg(MSGT_OPEN, MSGL_DBG2, "%d leading sectors skipped\n", tmp - sect); + vcd_set_msf(vcd, tmp); + ret = tmp * VCD_SECTOR_DATA; + mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X end: 0x%X\n",ret,ret2); #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) |