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

get rid of pointless size parameter for tmf_load_chunk 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24526 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-09-15 12:13:45 +00:00
parent 40f7ef2fb5
commit b03ca2821f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmpdemux/demux_ty.c
View File

@ -187,7 +187,7 @@ static off_t tmf_filetooffset(TiVoInfo *tivo, int chunk)
// =========================================================================== // ===========================================================================
static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo, static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo,
unsigned char *buff, int size, int readChunk ) unsigned char *buff, int readChunk )
{ {
off_t fileoffset; off_t fileoffset;
int count; int count;
@ -201,7 +201,7 @@ static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo,
mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" ); mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" );
return 0; return 0;
} }
count = stream_read( demux->stream, buff, size ); count = stream_read( demux->stream, buff, CHUNKSIZE );
demux->filepos = stream_tell( demux->stream ); demux->filepos = stream_tell( demux->stream );
mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() count %x\n", mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() count %x\n",
@ -391,7 +391,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Detected a tmf\n" ); mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Detected a tmf\n" );
tivo->tmf = 1; tivo->tmf = 1;
ty_tmf_filetoparts( demux, tivo ); ty_tmf_filetoparts( demux, tivo );
readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, 0 ); readSize = tmf_load_chunk( demux, tivo, chunk, 0 );
} }
if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID ) if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID )
@ -420,7 +420,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
{ {
numberParts = tivo->tmf_totalparts; numberParts = tivo->tmf_totalparts;
offset = numberParts * TIVO_PART_LENGTH; offset = numberParts * TIVO_PART_LENGTH;
readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, readSize = tmf_load_chunk( demux, tivo, chunk,
numberParts * ( TIVO_PART_LENGTH - CHUNKSIZE ) / numberParts * ( TIVO_PART_LENGTH - CHUNKSIZE ) /
CHUNKSIZE ); CHUNKSIZE );
} }
@ -484,8 +484,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
} }
else else
{ {
readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, readSize = tmf_load_chunk( demux, tivo, chunk, tivo->whichChunk );
tivo->whichChunk );
if ( readSize != CHUNKSIZE ) if ( readSize != CHUNKSIZE )
return 0; return 0;
tivo->whichChunk++; tivo->whichChunk++;
@ -502,8 +501,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
} }
else else
{ {
readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, readSize = tmf_load_chunk( demux, tivo, chunk, tivo->whichChunk );
tivo->whichChunk );
tivo->whichChunk++; tivo->whichChunk++;
} }