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

Remove tabs and trailing whitespace 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24507 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-09-14 20:59:05 +00:00
parent d1ee624657
commit abac8f8fab
1 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
libmpdemux/demux_ty.c
View File

@ -251,15 +251,15 @@ static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo,
return 0; return 0;
} }
count = stream_read( demux->stream, buff, size ); count = stream_read( demux->stream, buff, size );
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",
count ); count );
mp_msg( MSGT_DEMUX, MSGL_DBG3, mp_msg( MSGT_DEMUX, MSGL_DBG3,
"tmf_load_chunk() bytes %x %x %x %x %x %x %x %x\n", "tmf_load_chunk() bytes %x %x %x %x %x %x %x %x\n",
buff[ 0 ], buff[ 1 ], buff[ 2 ], buff[ 3 ], buff[ 0 ], buff[ 1 ], buff[ 2 ], buff[ 3 ],
buff[ 4 ], buff[ 5 ], buff[ 6 ], buff[ 7 ] ); buff[ 4 ], buff[ 5 ], buff[ 6 ], buff[ 7 ] );
mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() end\n" ); mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() end\n" );
@ -338,7 +338,7 @@ static void demux_ty_AddToAudioBuffer( TiVoInfo *tivo, unsigned char *buffer,
} }
static void demux_ty_CopyToDemuxPacket( int type, TiVoInfo *tivo, demux_stream_t *ds, static void demux_ty_CopyToDemuxPacket( int type, TiVoInfo *tivo, demux_stream_t *ds,
unsigned char *buffer, int size, off_t pos, float pts ) unsigned char *buffer, int size, off_t pos, float pts )
{ {
demux_packet_t *dp = new_demux_packet( size ); demux_packet_t *dp = new_demux_packet( size );
memcpy( dp->buffer, buffer, size ); memcpy( dp->buffer, buffer, size );
@ -347,10 +347,10 @@ static void demux_ty_CopyToDemuxPacket( int type, TiVoInfo *tivo, demux_stream_t
dp->pos = pos; dp->pos = pos;
dp->flags = 0; dp->flags = 0;
ds_add_packet( ds, dp ); ds_add_packet( ds, dp );
if ( type == TY_V && tivo->firstVideoPTS == MP_NOPTS_VALUE ) if ( type == TY_V && tivo->firstVideoPTS == MP_NOPTS_VALUE )
tivo->firstVideoPTS = pts; tivo->firstVideoPTS = pts;
if ( type == TY_A && tivo->firstAudioPTS == MP_NOPTS_VALUE ) if ( type == TY_A && tivo->firstAudioPTS == MP_NOPTS_VALUE )
tivo->firstAudioPTS = pts; tivo->firstAudioPTS = pts;
} }
static int demux_ty_FindESHeader( uint8_t nal, static int demux_ty_FindESHeader( uint8_t nal,
@ -408,7 +408,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
TiVoInfo *tivo = demux->priv; TiVoInfo *tivo = demux->priv;
if ( demux->stream->type == STREAMTYPE_DVD ) if ( demux->stream->type == STREAMTYPE_DVD )
return 0; return 0;
mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty processing\n" ); mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty processing\n" );
@ -496,10 +496,10 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
if ( tivo->size > demux->stream->end_pos ) if ( tivo->size > demux->stream->end_pos )
tivo->size = demux->stream->end_pos; tivo->size = demux->stream->end_pos;
if ( demux->stream->start_pos > 0 ) if ( demux->stream->start_pos > 0 )
filePos = demux->stream->start_pos; filePos = demux->stream->start_pos;
stream_seek( demux->stream, filePos ); stream_seek( demux->stream, filePos );
demux->filepos = stream_tell( demux->stream ); demux->filepos = stream_tell( demux->stream );
tivo->whichChunk = filePos / CHUNKSIZE; tivo->whichChunk = filePos / CHUNKSIZE;
} }
demux->movi_start = 0; demux->movi_start = 0;
@ -571,7 +571,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
} }
mp_msg( MSGT_DEMUX, MSGL_DBG3, mp_msg( MSGT_DEMUX, MSGL_DBG3,
"\nty:actual current offset %"PRIx64"\n", stream_tell( demux->stream ) - "\nty:actual current offset %"PRIx64"\n", stream_tell( demux->stream ) -
CHUNKSIZE ); CHUNKSIZE );
// Let's make a Video Demux Stream for MPlayer // Let's make a Video Demux Stream for MPlayer
@ -617,17 +617,17 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
// Do NOT Pass the PES Header onto the MPEG2 Decode // Do NOT Pass the PES Header onto the MPEG2 Decode
if( nybbleType != 0x06 ) if( nybbleType != 0x06 )
demux_ty_CopyToDemuxPacket( TY_V, tivo, demux->video, demux_ty_CopyToDemuxPacket( TY_V, tivo, demux->video,
&chunk[ offset ], size, demux->filepos + offset, &chunk[ offset ], size, demux->filepos + offset,
tivo->lastVideoPTS ); tivo->lastVideoPTS );
offset += size; offset += size;
} }
else else
errorHeader++; errorHeader++;
} }
// ================================================================ // ================================================================
// Audio Parsing // Audio Parsing
// ================================================================ // ================================================================
else if ( type == 0xc0 ) else if ( type == 0xc0 )
{ {
if ( size > 0 && size + offset <= CHUNKSIZE ) if ( size > 0 && size + offset <= CHUNKSIZE )
{ {
@ -680,8 +680,8 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
mp_msg( MSGT_DEMUX, MSGL_DBG3, mp_msg( MSGT_DEMUX, MSGL_DBG3,
"ty:Adding Audio Packet Size %d\n", size ); "ty:Adding Audio Packet Size %d\n", size );
demux_ty_CopyToDemuxPacket( TY_A, tivo, demux->audio, demux_ty_CopyToDemuxPacket( TY_A, tivo, demux->audio,
&chunk[ offset ], size, ( demux->filepos + offset ), &chunk[ offset ], size, ( demux->filepos + offset ),
tivo->lastAudioPTS ); tivo->lastAudioPTS );
} }
} }
@ -733,8 +733,8 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
if (nybbleType == 9) headerSize = 0; if (nybbleType == 9) headerSize = 0;
demux_ty_CopyToDemuxPacket demux_ty_CopyToDemuxPacket
( (
TY_A, TY_A,
tivo, tivo,
demux->audio, demux->audio,
&tivo->lastAudio[ esOffset1 + headerSize ], &tivo->lastAudio[ esOffset1 + headerSize ],
packetSize - headerSize, packetSize - headerSize,
@ -755,46 +755,46 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
offset += size; offset += size;
} }
else else
errorHeader++; errorHeader++;
} }
// ================================================================ // ================================================================
// 1 = Closed Caption // 1 = Closed Caption
// 2 = Extended Data Services // 2 = Extended Data Services
// ================================================================ // ================================================================
else if ( type == 0x01 || type == 0x02 ) else if ( type == 0x01 || type == 0x02 )
{ {
unsigned char lastXDS[ 16 ]; unsigned char lastXDS[ 16 ];
int b = AV_RB24(recPtr) >> 4; int b = AV_RB24(recPtr) >> 4;
b &= 0x7f7f; b &= 0x7f7f;
mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:%s %04x\n", type == 1 ? "CC" : "XDS", b); mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:%s %04x\n", type == 1 ? "CC" : "XDS", b);
lastXDS[ 0x00 ] = 0x00; lastXDS[ 0x00 ] = 0x00;
lastXDS[ 0x01 ] = 0x00; lastXDS[ 0x01 ] = 0x00;
lastXDS[ 0x02 ] = 0x01; lastXDS[ 0x02 ] = 0x01;
lastXDS[ 0x03 ] = 0xb2; lastXDS[ 0x03 ] = 0xb2;
lastXDS[ 0x04 ] = 'T'; lastXDS[ 0x04 ] = 'T';
lastXDS[ 0x05 ] = 'Y'; lastXDS[ 0x05 ] = 'Y';
lastXDS[ 0x06 ] = type; lastXDS[ 0x06 ] = type;
lastXDS[ 0x07 ] = b >> 8; lastXDS[ 0x07 ] = b >> 8;
lastXDS[ 0x08 ] = b; lastXDS[ 0x08 ] = b;
if ( subcc_enabled ) if ( subcc_enabled )
demux_ty_CopyToDemuxPacket( TY_V, tivo, demux->video, lastXDS, 0x09, demux_ty_CopyToDemuxPacket( TY_V, tivo, demux->video, lastXDS, 0x09,
demux->filepos + offset, tivo->lastVideoPTS ); demux->filepos + offset, tivo->lastVideoPTS );
} }
// ================================================================ // ================================================================
// Unknown // Unknown
// ================================================================ // ================================================================
else else
{ {
if ( size > 0 && size + offset <= CHUNKSIZE ) if ( size > 0 && size + offset <= CHUNKSIZE )
offset += size; offset += size;
if (type != 3 && type != 5) { if (type != 3 && type != 5) {
mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Invalid Type %x\n", type ); mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Invalid Type %x\n", type );
invalidType++; invalidType++;
} }
} }
recPtr += 16; recPtr += 16;
} }
@ -840,11 +840,11 @@ static void demux_seek_ty( demuxer_t *demuxer, float rel_seek_secs, float audio_
newpos = ( flags & 1 ) ? demuxer->movi_start : demuxer->filepos; newpos = ( flags & 1 ) ? demuxer->movi_start : demuxer->filepos;
if( flags & 2 ) if( flags & 2 )
// float seek 0..1 // float seek 0..1
newpos += ( demuxer->movi_end - demuxer->movi_start ) * rel_seek_secs; newpos += ( demuxer->movi_end - demuxer->movi_start ) * rel_seek_secs;
else else
{ {
// time seek (secs) // time seek (secs)
if( ! sh_video->i_bps ) // unspecified or VBR if( ! sh_video->i_bps ) // unspecified or VBR
newpos += 2324 * 75 * rel_seek_secs; // 174.3 kbyte/sec newpos += 2324 * 75 * rel_seek_secs; // 174.3 kbyte/sec
else else
@ -853,9 +853,9 @@ static void demux_seek_ty( demuxer_t *demuxer, float rel_seek_secs, float audio_
if ( newpos < demuxer->movi_start ) if ( newpos < demuxer->movi_start )
{ {
if( demuxer->stream->type != STREAMTYPE_VCD ) demuxer->movi_start = 0; if( demuxer->stream->type != STREAMTYPE_VCD ) demuxer->movi_start = 0;
if( newpos < demuxer->movi_start ) newpos = demuxer->movi_start; if( newpos < demuxer->movi_start ) newpos = demuxer->movi_start;
} }
res = newpos / CHUNKSIZE; res = newpos / CHUNKSIZE;
if ( rel_seek_secs >= 0 ) if ( rel_seek_secs >= 0 )
@ -873,30 +873,30 @@ static void demux_seek_ty( demuxer_t *demuxer, float rel_seek_secs, float audio_
// re-sync video: // re-sync video:
videobuf_code_len = 0; // reset ES stream buffer videobuf_code_len = 0; // reset ES stream buffer
ds_fill_buffer( d_video ); ds_fill_buffer( d_video );
if( sh_audio ) if( sh_audio )
ds_fill_buffer( d_audio ); ds_fill_buffer( d_audio );
while( 1 ) while( 1 )
{ {
int i; int i;
if( sh_audio && !d_audio->eof && d_video->pts && d_audio->pts ) if( sh_audio && !d_audio->eof && d_video->pts && d_audio->pts )
{ {
float a_pts = d_audio->pts; float a_pts = d_audio->pts;
a_pts += ( ds_tell_pts( d_audio ) - sh_audio->a_in_buffer_len ) / a_pts += ( ds_tell_pts( d_audio ) - sh_audio->a_in_buffer_len ) /
(float)sh_audio->i_bps; (float)sh_audio->i_bps;
if( d_video->pts > a_pts ) if( d_video->pts > a_pts )
{ {
skip_audio_frame( sh_audio ); // sync audio skip_audio_frame( sh_audio ); // sync audio
continue; continue;
} }
} }
i = sync_video_packet( d_video ); i = sync_video_packet( d_video );
if( i == 0x1B3 || i == 0x1B8 ) break; // found it! if( i == 0x1B3 || i == 0x1B8 ) break; // found it!
if( !i || !skip_video_packet( d_video ) ) break; // EOF? if( !i || !skip_video_packet( d_video ) ) break; // EOF?
} }
if ( subcc_enabled ) if ( subcc_enabled )
ty_ClearOSD( 0 ); ty_ClearOSD( 0 );
} }
static int demux_ty_control( demuxer_t *demuxer,int cmd, void *arg ) static int demux_ty_control( demuxer_t *demuxer,int cmd, void *arg )
@ -906,17 +906,17 @@ static int demux_ty_control( demuxer_t *demuxer,int cmd, void *arg )
switch(cmd) switch(cmd)
{ {
case DEMUXER_CTRL_GET_TIME_LENGTH: case DEMUXER_CTRL_GET_TIME_LENGTH:
if(!sh_video->i_bps) // unspecified or VBR if(!sh_video->i_bps) // unspecified or VBR
return DEMUXER_CTRL_DONTKNOW; return DEMUXER_CTRL_DONTKNOW;
*(double *)arg= *(double *)arg=
(double)demuxer->movi_end-demuxer->movi_start/sh_video->i_bps; (double)demuxer->movi_end-demuxer->movi_start/sh_video->i_bps;
return DEMUXER_CTRL_GUESS; return DEMUXER_CTRL_GUESS;
case DEMUXER_CTRL_GET_PERCENT_POS: case DEMUXER_CTRL_GET_PERCENT_POS:
return DEMUXER_CTRL_DONTKNOW; return DEMUXER_CTRL_DONTKNOW;
default: default:
return DEMUXER_CTRL_NOTIMPL; return DEMUXER_CTRL_NOTIMPL;
} }
} }
@ -926,7 +926,7 @@ static void demux_close_ty( demuxer_t *demux )
TiVoInfo *tivo = demux->priv; TiVoInfo *tivo = demux->priv;
free( tivo ); free( tivo );
sub_justify = 0; sub_justify = 0;
} }