generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpeg: K&R formatting cosmetics

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Tanja Batchelor 2014-03-20 01:02:42 +00:00 committed by Vittorio Giovara
parent f51d0f39c0
commit 5b8f0a5eac
1 changed files with 165 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
libavformat/mpeg.c
View File

@ -31,34 +31,39 @@
#define MAX_SYNC_SIZE 100000 #define MAX_SYNC_SIZE 100000
static int check_pes(uint8_t *p, uint8_t *end){ static int check_pes(uint8_t *p, uint8_t *end)
{
int pes1; int pes1;
int pes2= (p[3] & 0xC0) == 0x80 int pes2 = (p[3] & 0xC0) == 0x80 &&
&& (p[4] & 0xC0) != 0x40 (p[4] & 0xC0) != 0x40 &&
&&((p[4] & 0xC0) == 0x00 || (p[4]&0xC0)>>2 == (p[6]&0xF0)); ((p[4] & 0xC0) == 0x00 ||
(p[4] & 0xC0) >> 2 == (p[6] & 0xF0));
for (p += 3; p < end && *p == 0xFF; p++) ; for (p += 3; p < end && *p == 0xFF; p++) ;
if((*p&0xC0) == 0x40) p+=2; if ((*p & 0xC0) == 0x40)
if((*p&0xF0) == 0x20){ p += 2;
if ((*p & 0xF0) == 0x20)
pes1 = p[0] & p[2] & p[4] & 1; 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; pes1 = p[0] & p[2] & p[4] & p[5] & p[7] & p[9] & 1;
}else else
pes1 = *p == 0x0F; pes1 = *p == 0x0F;
return pes1 || pes2; return pes1 || pes2;
} }
static int check_pack_header(const uint8_t *buf) { static int check_pack_header(const uint8_t *buf)
{
return (buf[1] & 0xC0) == 0x40 || (buf[1] & 0xF0) == 0x20; return (buf[1] & 0xC0) == 0x40 || (buf[1] & 0xF0) == 0x20;
} }
static int mpegps_probe(AVProbeData *p) static int mpegps_probe(AVProbeData *p)
{ {
uint32_t code = -1; uint32_t code = -1;
int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0;
int i; int i;
int score=0; int sys = 0, pspack = 0, priv1 = 0, vid = 0;
int audio = 0, invalid = 0, score = 0;
for (i = 0; i < p->buf_size; i++) { for (i = 0; i < p->buf_size; i++) {
code = (code << 8) + p->buf[i]; code = (code << 8) + p->buf[i];
@ -67,17 +72,26 @@ static int mpegps_probe(AVProbeData *p)
int pes = check_pes(p->buf + i, p->buf + p->buf_size); int pes = check_pes(p->buf + i, p->buf + p->buf_size);
int pack = check_pack_header(p->buf + i); int pack = check_pack_header(p->buf + i);
if(code == SYSTEM_HEADER_START_CODE) sys++; if (code == SYSTEM_HEADER_START_CODE)
else if(code == PACK_START_CODE && pack) pspack++; sys++;
else if((code & 0xf0) == VIDEO_ID && pes) vid++; 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 // skip pes payload to avoid start code emulation for private
// and audio streams // and audio streams
else if((code & 0xe0) == AUDIO_ID && pes) {audio++; i+=len;} else if ((code & 0xe0) == AUDIO_ID && pes) {
else if(code == PRIVATE_STREAM_1 && pes) {priv1++; i+=len;} audio++;
i += len;
else if((code & 0xf0) == VIDEO_ID && !pes) invalid++; } else if (code == PRIVATE_STREAM_1 && pes) {
else if((code & 0xe0) == AUDIO_ID && !pes) invalid++; priv1++;
else if(code == PRIVATE_STREAM_1 && !pes) invalid++; 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++;
} }
} }
@ -85,18 +99,21 @@ static int mpegps_probe(AVProbeData *p)
score = AVPROBE_SCORE_EXTENSION / 2; 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 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 return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2
if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */ : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg
return (audio > 12 || vid > 3) ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; 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 // 02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
// mp3_misidentified_2.mp3 has sys:0 priv1:0 pspack:0 vid:0 audio:6 // mp3_misidentified_2.mp3 has sys:0 priv1:0 pspack:0 vid:0 audio:6
return score; return score;
} }
typedef struct MpegDemuxContext { typedef struct MpegDemuxContext {
int32_t header_state; int32_t header_state;
unsigned char psm_es_type[256]; unsigned char psm_es_type[256];
@ -156,6 +173,7 @@ static int find_next_start_code(AVIOContext *pb, int *size_ptr,
state = ((state << 8) | v) & 0xffffff; state = ((state << 8) | v) & 0xffffff;
} }
val = -1; val = -1;
found: found:
*header_state = state; *header_state = state;
*size_ptr = n; *size_ptr = n;
@ -186,6 +204,7 @@ static long mpegps_psm_parse(MpegDemuxContext *m, AVIOContext *pb)
unsigned char type = avio_r8(pb); unsigned char type = avio_r8(pb);
unsigned char es_id = avio_r8(pb); unsigned char es_id = avio_r8(pb);
uint16_t es_info_length = avio_rb16(pb); uint16_t es_info_length = avio_rb16(pb);
/* remember mapping from stream id to stream type */ /* remember mapping from stream id to stream type */
m->psm_es_type[es_id] = type; m->psm_es_type[es_id] = type;
/* skip program_stream_info */ /* skip program_stream_info */
@ -197,7 +216,7 @@ static long mpegps_psm_parse(MpegDemuxContext *m, AVIOContext *pb)
} }
/* read the next PES header. Return its position in ppos /* read the next PES header. Return its position in ppos
(if not NULL), and its start code, pts and dts. * (if not NULL), and its start code, pts and dts.
*/ */
static int mpegps_read_pes_header(AVFormatContext *s, static int mpegps_read_pes_header(AVFormatContext *s,
int64_t *ppos, int *pstart_code, int64_t *ppos, int *pstart_code,
@ -282,7 +301,8 @@ static int mpegps_read_pes_header(AVFormatContext *s,
len -= 2; len -= 2;
} }
if ((c & 0xe0) == 0x20) { if ((c & 0xe0) == 0x20) {
dts = pts = get_pts(s->pb, c); dts =
pts = get_pts(s->pb, c);
len -= 4; len -= 4;
if (c & 0x10) { if (c & 0x10) {
dts = get_pts(s->pb, -1); dts = get_pts(s->pb, -1);
@ -311,7 +331,8 @@ static int mpegps_read_pes_header(AVFormatContext *s,
if (flags & 0x01) { /* PES extension */ if (flags & 0x01) { /* PES extension */
pes_ext = avio_r8(s->pb); pes_ext = avio_r8(s->pb);
header_len--; header_len--;
/* Skip PES private data, program packet sequence counter and P-STD buffer */ /* Skip PES private data, program packet sequence counter
* and P-STD buffer */
skip = (pes_ext >> 4) & 0xb; skip = (pes_ext >> 4) & 0xb;
skip += skip & 0x9; skip += skip & 0x9;
if (pes_ext & 0x40 || skip > header_len) { if (pes_ext & 0x40 || skip > header_len) {
@ -335,8 +356,7 @@ static int mpegps_read_pes_header(AVFormatContext *s,
if (header_len < 0) if (header_len < 0)
goto error_redo; goto error_redo;
avio_skip(s->pb, header_len); avio_skip(s->pb, header_len);
} } else if (c != 0xf)
else if( c!= 0xf )
goto redo; goto redo;
if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) { if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) {
@ -363,7 +383,8 @@ static int mpegps_read_pes_header(AVFormatContext *s,
if (startcode == s->streams[i]->id && if (startcode == s->streams[i]->id &&
s->pb->seekable /* index useless on streams anyway */) { s->pb->seekable /* index useless on streams anyway */) {
ff_reduce_index(s, i); ff_reduce_index(s, i);
av_add_index_entry(s->streams[i], *ppos, dts, 0, 0, AVINDEX_KEYFRAME /* FIXME keyframe? */); av_add_index_entry(s->streams[i], *ppos, dts, 0, 0,
AVINDEX_KEYFRAME /* FIXME keyframe? */);
} }
} }
} }
@ -433,6 +454,7 @@ static int mpegps_read_packet(AVFormatContext *s,
} else if (startcode >= 0x1e0 && startcode <= 0x1ef) { } else if (startcode >= 0x1e0 && startcode <= 0x1ef) {
static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 };
unsigned char buf[8]; unsigned char buf[8];
avio_read(s->pb, buf, 8); avio_read(s->pb, buf, 8);
avio_seek(s->pb, -8, SEEK_CUR); 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))
@ -446,8 +468,8 @@ static int mpegps_read_packet(AVFormatContext *s,
} else if (startcode >= 0x80 && startcode <= 0x87) { } else if (startcode >= 0x80 && startcode <= 0x87) {
type = AVMEDIA_TYPE_AUDIO; type = AVMEDIA_TYPE_AUDIO;
codec_id = AV_CODEC_ID_AC3; codec_id = AV_CODEC_ID_AC3;
} else if ( ( startcode >= 0x88 && startcode <= 0x8f) } else if ((startcode >= 0x88 && startcode <= 0x8f) ||
||( startcode >= 0x98 && startcode <= 0x9f)) { (startcode >= 0x98 && startcode <= 0x9f)) {
/* 0x90 - 0x97 is reserved for SDDS in DVD specs */ /* 0x90 - 0x97 is reserved for SDDS in DVD specs */
type = AVMEDIA_TYPE_AUDIO; type = AVMEDIA_TYPE_AUDIO;
codec_id = AV_CODEC_ID_DTS; codec_id = AV_CODEC_ID_DTS;
@ -471,13 +493,17 @@ static int mpegps_read_packet(AVFormatContext *s,
// check dvd audio substream type // check dvd audio substream type
type = AVMEDIA_TYPE_AUDIO; type = AVMEDIA_TYPE_AUDIO;
switch (dvdaudio_substream_type & 0xe0) { switch (dvdaudio_substream_type & 0xe0) {
case 0xa0: codec_id = AV_CODEC_ID_PCM_DVD; case 0xa0:
codec_id = AV_CODEC_ID_PCM_DVD;
break; break;
case 0x80: if((dvdaudio_substream_type & 0xf8) == 0x88) case 0x80:
if ((dvdaudio_substream_type & 0xf8) == 0x88)
codec_id = AV_CODEC_ID_DTS; codec_id = AV_CODEC_ID_DTS;
else codec_id = AV_CODEC_ID_AC3; else
codec_id = AV_CODEC_ID_AC3;
break; break;
default: av_log(s, AV_LOG_ERROR, "Unknown 0x1bd sub-stream\n"); default:
av_log(s, AV_LOG_ERROR, "Unknown 0x1bd sub-stream\n");
goto skip; goto skip;
} }
} else { } else {
@ -494,10 +520,12 @@ static int mpegps_read_packet(AVFormatContext *s,
st->codec->codec_type = type; st->codec->codec_type = type;
st->codec->codec_id = codec_id; st->codec->codec_id = codec_id;
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
found: found:
if (st->discard >= AVDISCARD_ALL) if (st->discard >= AVDISCARD_ALL)
goto skip; goto skip;
ret = av_get_packet(s->pb, pkt, len); ret = av_get_packet(s->pb, pkt, len);
pkt->pts = pts; pkt->pts = pts;
pkt->dts = dts; pkt->dts = dts;
pkt->pos = dummy_pos; pkt->pos = dummy_pos;