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

reformatted ts_parse() after previous commit 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20483 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2006-10-28 09:52:19 +00:00
parent 6355be18bd
commit c57f415693
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libmpdemux/demux_ts.c
View File

@ -2792,16 +2792,16 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
if(dvdsub_lang) if(dvdsub_lang)
{ {
if(!strcmp(dvdsub_lang, "")) if(!strcmp(dvdsub_lang, ""))
asgn = 1; asgn = 1;
else
{
lang = pid_lang_from_pmt(priv, pid);
if(lang != NULL)
asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
else else
asgn = 0; {
} lang = pid_lang_from_pmt(priv, pid);
if(lang != NULL)
asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
else
asgn = 0;
}
} }
if(asgn) if(asgn)
@ -2887,19 +2887,19 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
return 0; return 0;
tss->payload_size = es->payload_size; tss->payload_size = es->payload_size;
tss->type = es->type; tss->type = es->type;
tss->subtype = es->subtype; tss->subtype = es->subtype;
if(is_audio) if(is_audio)
lang = pid_lang_from_pmt(priv, es->pid); lang = pid_lang_from_pmt(priv, es->pid);
if(lang != NULL) if(lang != NULL)
{ {
memcpy(es->lang, lang, 3); memcpy(es->lang, lang, 3);
es->lang[3] = 0; es->lang[3] = 0;
} }
else else
es->lang[0] = 0; es->lang[0] = 0;
return 1; return 1;
} }
else else
{ {
@ -2915,18 +2915,18 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
demuxer->filepos = stream_tell(demuxer->stream) - es->size; demuxer->filepos = stream_tell(demuxer->stream) - es->size;
if(*dp_offset + es->size > *buffer_size) if(*dp_offset + es->size > *buffer_size)
{ {
*buffer_size = *dp_offset + es->size + TS_FEC_PACKET_SIZE; *buffer_size = *dp_offset + es->size + TS_FEC_PACKET_SIZE;
resize_demux_packet(*dp, *buffer_size); resize_demux_packet(*dp, *buffer_size);
//we'll skip at least one RESIZE() in the next iteration of ts_parse() //we'll skip at least one RESIZE() in the next iteration of ts_parse()
mp_msg(MSGT_DEMUX, MSGL_DBG2, "RESIZE DP TO %d\n", *buffer_size); mp_msg(MSGT_DEMUX, MSGL_DBG2, "RESIZE DP TO %d\n", *buffer_size);
} }
memcpy(&((*dp)->buffer[*dp_offset]), es->start, es->size); memcpy(&((*dp)->buffer[*dp_offset]), es->start, es->size);
*dp_offset += es->size; *dp_offset += es->size;
(*dp)->flags = 0; (*dp)->flags = 0;
(*dp)->pos = stream_tell(demuxer->stream); (*dp)->pos = stream_tell(demuxer->stream);
(*dp)->pts = es->pts; (*dp)->pts = es->pts;
if(*dp_offset >= MAX_PACK_BYTES) if(*dp_offset >= MAX_PACK_BYTES)
{ {