RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
nicodvb 2007-03-24 10:37:05 +00:00
parent cdec77961c
commit f33671dc08
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stream/stream_vcd.c
View File

@ -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__)