---
libavformat/mpeg.c | 82 +++++++++++++++++++++++++++---------------------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 7430bb0..99112ac 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -38,15 +38,15 @@ static int check_pes(uint8_t *p, uint8_t *end){
&&((p[4] & 0xC0) == 0x00 || (p[4]&0xC0)>>2 == (p[6]&0xF0));
for(p+=3; p<end && *p == 0xFF; p++);
- if((*p&0xC0) == 0x40) p+=2;
- if((*p&0xF0) == 0x20){
+ if ((*p&0xC0) == 0x40) p += 2;
+ if ((*p&0xF0) == 0x20){
pes1= p[0]&p[2]&p[4]&1;
- }else if((*p&0xF0) == 0x30){
+ } else if ((*p&0xF0) == 0x30){
pes1= p[0]&p[2]&p[4]&p[5]&p[7]&p[9]&1;
- }else
+ } else
pes1 = *p == 0x0F;
- return pes1||pes2;
+ return pes1 || pes2;
}
static int check_pack_header(const uint8_t *buf) {
@@ -60,35 +60,35 @@ static int mpegps_probe(AVProbeData *p)
int i;
int score=0;
- for(i=0; i<p->buf_size; i++){
+ for (i = 0; i < p->buf_size; i++) {
code = (code<<8) + p->buf[i];
if ((code & 0xffffff00) == 0x100) {
int len= p->buf[i+1] << 8 | p->buf[i+2];
int pes= check_pes(p->buf+i, p->buf+p->buf_size);
int pack = check_pack_header(p->buf+i);
- if(code == SYSTEM_HEADER_START_CODE) sys++;
- else if(code == PACK_START_CODE && pack) pspack++;
- else if((code & 0xf0) == VIDEO_ID && pes) vid++;
+ if (code == SYSTEM_HEADER_START_CODE) sys++;
+ else if (code == PACK_START_CODE && pack) pspack++;
+ else if ((code & 0xf0) == VIDEO_ID && pes) vid++;
// skip pes payload to avoid start code emulation for private
// and audio streams
- else if((code & 0xe0) == AUDIO_ID && pes) {audio++; i+=len;}
- else if(code == PRIVATE_STREAM_1 && pes) {priv1++; i+=len;}
+ else if ((code & 0xe0) == AUDIO_ID && pes) {audio++; i+=len;}
+ else if (code == PRIVATE_STREAM_1 && pes) {priv1++; i+=len;}
- else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
- else if((code & 0xe0) == AUDIO_ID && !pes) invalid++;
- else if(code == PRIVATE_STREAM_1 && !pes) invalid++;
+ else if ((code & 0xf0) == VIDEO_ID && !pes) invalid++;
+ else if ((code & 0xe0) == AUDIO_ID && !pes) invalid++;
+ else if (code == PRIVATE_STREAM_1 && !pes) invalid++;
}
}
- if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
+ if (vid+audio > invalid) /* invalid VDR files nd short PES streams */
score = AVPROBE_SCORE_EXTENSION / 2;
- if(sys>invalid && sys*9 <= pspack*10)
+ if (sys > invalid && sys*9 <= pspack*10)
return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 :
AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg
- if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9)
+ if (pspack > invalid && (priv1+vid+audio) * 10 >= pspack * 9)
return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 :
AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg
- if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack &&
p->buf_size>2048 && vid + audio > invalid) /* PES stream */
+ if ((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack &&
p->buf_size > 2048 && vid + audio > invalid) /* PES stream */
return (audio > 12 || vid > 3) ? AVPROBE_SCORE_EXTENSION + 2 :
AVPROBE_SCORE_EXTENSION / 2;
//02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
@@ -218,7 +218,7 @@ static int mpegps_read_pes_header(AVFormatContext *s,
startcode = find_next_start_code(s->pb, &size, &m->header_state);
last_sync = avio_tell(s->pb);
if (startcode < 0){
- if(s->pb->eof_reached)
+ if (s->pb->eof_reached)
return AVERROR_EOF;
//FIXME we should remember header_state
return AVERROR(EAGAIN);
@@ -332,11 +332,11 @@ static int mpegps_read_pes_header(AVFormatContext *s,
}
}
}
- if(header_len < 0)
+ if (header_len < 0)
goto error_redo;
avio_skip(s->pb, header_len);
}
- else if( c!= 0xf )
+ else if (c!= 0xf)
goto redo;
if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) {
@@ -355,12 +355,12 @@ static int mpegps_read_pes_header(AVFormatContext *s,
}
}
}
- if(len<0)
+ if (len < 0)
goto error_redo;
- if(dts != AV_NOPTS_VALUE && ppos){
+ if (dts != AV_NOPTS_VALUE && ppos){
int i;
- for(i=0; i<s->nb_streams; i++){
- if(startcode == s->streams[i]->id &&
+ for (i = 0; i < s->nb_streams; i++){
+ if (startcode == s->streams[i]->id &&
s->pb->seekable /* index useless on streams anyway */) {
ff_reduce_index(s, i);
av_add_index_entry(s->streams[i], *ppos, dts, 0, 0,
AVINDEX_KEYFRAME /* FIXME keyframe? */);
@@ -390,41 +390,41 @@ static int mpegps_read_packet(AVFormatContext *s,
if (len < 0)
return len;
- if(startcode == 0x1bd) {
+ if (startcode == 0x1bd) {
dvdaudio_substream_type = avio_r8(s->pb);
avio_skip(s->pb, 3);
len -= 4;
}
/* now find stream */
- for(i=0;i<s->nb_streams;i++) {
+ for (i = 0; i < s->nb_streams;i++) {
st = s->streams[i];
if (st->id == startcode)
goto found;
}
es_type = m->psm_es_type[startcode & 0xff];
- if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){
- if(es_type == STREAM_TYPE_VIDEO_MPEG1){
+ if (es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){
+ if (es_type == STREAM_TYPE_VIDEO_MPEG1){
codec_id = AV_CODEC_ID_MPEG2VIDEO;
type = AVMEDIA_TYPE_VIDEO;
- } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){
+ } else if (es_type == STREAM_TYPE_VIDEO_MPEG2){
codec_id = AV_CODEC_ID_MPEG2VIDEO;
type = AVMEDIA_TYPE_VIDEO;
- } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 ||
+ } else if (es_type == STREAM_TYPE_AUDIO_MPEG1 ||
es_type == STREAM_TYPE_AUDIO_MPEG2){
codec_id = AV_CODEC_ID_MP3;
type = AVMEDIA_TYPE_AUDIO;
- } else if(es_type == STREAM_TYPE_AUDIO_AAC){
+ } else if (es_type == STREAM_TYPE_AUDIO_AAC){
codec_id = AV_CODEC_ID_AAC;
type = AVMEDIA_TYPE_AUDIO;
- } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){
+ } else if (es_type == STREAM_TYPE_VIDEO_MPEG4){
codec_id = AV_CODEC_ID_MPEG4;
type = AVMEDIA_TYPE_VIDEO;
- } else if(es_type == STREAM_TYPE_VIDEO_H264){
+ } else if (es_type == STREAM_TYPE_VIDEO_H264){
codec_id = AV_CODEC_ID_H264;
type = AVMEDIA_TYPE_VIDEO;
- } else if(es_type == STREAM_TYPE_AUDIO_AC3){
+ } else if (es_type == STREAM_TYPE_AUDIO_AC3){
codec_id = AV_CODEC_ID_AC3;
type = AVMEDIA_TYPE_AUDIO;
} else {
@@ -435,7 +435,7 @@ static int mpegps_read_packet(AVFormatContext *s,
unsigned char buf[8];
avio_read(s->pb, buf, 8);
avio_seek(s->pb, -8, SEEK_CUR);
- if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
+ if (!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
codec_id = AV_CODEC_ID_CAVS;
else
codec_id = AV_CODEC_ID_PROBE;
@@ -446,8 +446,8 @@ static int mpegps_read_packet(AVFormatContext *s,
} else if (startcode >= 0x80 && startcode <= 0x87) {
type = AVMEDIA_TYPE_AUDIO;
codec_id = AV_CODEC_ID_AC3;
- } else if ( ( startcode >= 0x88 && startcode <= 0x8f)
- ||( startcode >= 0x98 && startcode <= 0x9f)) {
+ } else if ((startcode >= 0x88 && startcode <= 0x8f) ||
+ (startcode >= 0x98 && startcode <= 0x9f)) {
/* 0x90 - 0x97 is reserved for SDDS in DVD specs */
type = AVMEDIA_TYPE_AUDIO;
codec_id = AV_CODEC_ID_DTS;
@@ -473,7 +473,7 @@ static int mpegps_read_packet(AVFormatContext *s,
switch(dvdaudio_substream_type & 0xe0) {
case 0xa0: codec_id = AV_CODEC_ID_PCM_DVD;
break;
- case 0x80: if((dvdaudio_substream_type & 0xf8) == 0x88)
+ case 0x80: if ((dvdaudio_substream_type & 0xf8) == 0x88)
codec_id = AV_CODEC_ID_DTS;
else codec_id = AV_CODEC_ID_AC3;
break;
@@ -495,7 +495,7 @@ static int mpegps_read_packet(AVFormatContext *s,
st->codec->codec_id = codec_id;
st->need_parsing = AVSTREAM_PARSE_FULL;
found:
- if(st->discard >= AVDISCARD_ALL)
+ if (st->discard >= AVDISCARD_ALL)
goto skip;
ret = av_get_packet(s->pb, pkt, len);
pkt->pts = pts;
@@ -519,7 +519,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int
stream_index,
if (avio_seek(s->pb, pos, SEEK_SET) < 0)
return AV_NOPTS_VALUE;
- for(;;) {
+ for (;;) {
len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts);
if (len < 0) {
av_dlog(s, "none (ret=%d)\n", len);
--
1.9.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
