Simplify demux_ty_FindESHeader

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24498 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-09-14 19:53:09 +00:00
parent fb090bd8fa
commit 8d8edc990a
1 changed files with 7 additions and 12 deletions

View File

@ -359,22 +359,17 @@ static void demux_ty_CopyToDemuxPacket( int type, TiVoInfo *tivo, demux_stream_t
tivo->firstAudioPTS = pts; tivo->firstAudioPTS = pts;
} }
static int demux_ty_FindESHeader( unsigned char *header, int headerSize, static int demux_ty_FindESHeader( unsigned char *header,
unsigned char *buffer, int bufferSize, int *esOffset1 ) unsigned char *buffer, int bufferSize )
{ {
int count; int count;
*esOffset1 = -1;
for( count = 0 ; count < bufferSize ; count++ ) for( count = 0 ; count < bufferSize ; count++ )
{ {
if ( buffer[ count + 0 ] == header[ 0 ] && if ( buffer[ count + 0 ] == header[ 0 ] &&
buffer[ count + 1 ] == header[ 1 ] && buffer[ count + 1 ] == header[ 1 ] &&
buffer[ count + 2 ] == header[ 2 ] && buffer[ count + 2 ] == header[ 2 ] &&
buffer[ count + 3 ] == header[ 3 ] ) buffer[ count + 3 ] == header[ 3 ] )
{ return count;
*esOffset1 = count;
return 1;
}
} }
return -1; return -1;
} }
@ -652,8 +647,8 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
} }
printf( "\n" ); printf( "\n" );
#endif #endif
demux_ty_FindESHeader( ty_VideoPacket, 4, &chunk[ offset ], esOffset1 = demux_ty_FindESHeader( ty_VideoPacket, &chunk[ offset ],
size, &esOffset1 ); size);
if ( esOffset1 != -1 ) if ( esOffset1 != -1 )
tivo->lastVideoPTS = get_ty_pts( tivo->lastVideoPTS = get_ty_pts(
&chunk[ offset + esOffset1 + 9 ] ); &chunk[ offset + esOffset1 + 9 ] );
@ -745,8 +740,8 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
{ {
int esOffset1, esOffset2; int esOffset1, esOffset2;
if ( nybbleType == 0x03 ) if ( nybbleType == 0x03 )
demux_ty_FindESHeader( ty_MPEGAudioPacket, 4, &chunk[ offset ], esOffset1 = demux_ty_FindESHeader( ty_MPEGAudioPacket, &chunk[ offset ],
size, &esOffset1 ); size);
// SA PES Header, No Audio Data // SA PES Header, No Audio Data
// ================================================ // ================================================