X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmpeg.c;h=0c43a5ec5dc55003b8d0becbb4d387794904bc15;hb=67eb5da61a08a1c75dbfd2aef7380dfb304d98f4;hp=b3c2e3ed4915b533ec7e8a328a6ab0ad2559a8a4;hpb=7e1720dec6c28860de268b94b91e13d09cef7b20;p=ffmpeg diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index b3c2e3ed491..0c43a5ec5dc 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -1,6 +1,6 @@ /* * MPEG1/2 demuxer - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. * @@ -32,18 +32,6 @@ #define MAX_SYNC_SIZE 100000 -static int cdxa_probe(AVProbeData *p) -{ - /* check file header */ - if (p->buf[0] == 'R' && p->buf[1] == 'I' && - p->buf[2] == 'F' && p->buf[3] == 'F' && - p->buf[8] == 'C' && p->buf[9] == 'D' && - p->buf[10] == 'X' && p->buf[11] == 'A') - return AVPROBE_SCORE_MAX; - else - return 0; -} - static int check_pes(uint8_t *p, uint8_t *end){ int pes1; int pes2= (p[3] & 0xC0) == 0x80 @@ -71,10 +59,6 @@ static int mpegps_probe(AVProbeData *p) int i; int score=0; - score = cdxa_probe(p); - if (score > 0) return score; - - /* Search for MPEG stream */ for(i=0; ibuf_size; i++){ code = (code<<8) + p->buf[i]; if ((code & 0xffffff00) == 0x100) { @@ -83,8 +67,8 @@ static int mpegps_probe(AVProbeData *p) if(code == SYSTEM_HEADER_START_CODE) sys++; else if(code == PRIVATE_STREAM_1) priv1++; else if(code == PACK_START_CODE) pspack++; - else if((code & 0xf0) == VIDEO_ID && pes) vid++; - else if((code & 0xe0) == AUDIO_ID && pes) audio++; + else if((code & 0xf0) == VIDEO_ID && pes) vid++; + else if((code & 0xe0) == AUDIO_ID && pes) audio++; else if((code & 0xf0) == VIDEO_ID && !pes) invalid++; else if((code & 0xe0) == AUDIO_ID && !pes) invalid++; @@ -136,17 +120,12 @@ static int mpegps_read_header(AVFormatContext *s, static int64_t get_pts(ByteIOContext *pb, int c) { - int64_t pts; - int val; - - if (c < 0) - c = get_byte(pb); - pts = (int64_t)((c >> 1) & 0x07) << 30; - val = get_be16(pb); - pts |= (int64_t)(val >> 1) << 15; - val = get_be16(pb); - pts |= (int64_t)(val >> 1); - return pts; + uint8_t buf[5]; + + buf[0] = c<0 ? get_byte(pb) : c; + get_buffer(pb, buf+1, 4); + + return ff_parse_pes_pts(buf); } static int find_next_start_code(ByteIOContext *pb, int *size_ptr, @@ -232,8 +211,8 @@ static long mpegps_psm_parse(MpegDemuxContext *m, ByteIOContext *pb) /* at least one es available? */ while (es_map_length >= 4){ - unsigned char type = get_byte(pb); - unsigned char es_id = get_byte(pb); + unsigned char type = get_byte(pb); + unsigned char es_id = get_byte(pb); uint16_t es_info_length = get_be16(pb); /* remember mapping from stream id to stream type */ m->psm_es_type[es_id] = type; @@ -355,15 +334,20 @@ static int mpegps_read_pes_header(AVFormatContext *s, header_len -= 5; } } + if (flags & 0x3f && header_len == 0){ + flags &= 0xC0; + av_log(s, AV_LOG_WARNING, "Further flags set but no bytes left\n"); + } if (flags & 0x01) { /* PES extension */ pes_ext = get_byte(s->pb); header_len--; - if (pes_ext & 0x40) { /* pack header - should be zero in PS */ - goto error_redo; - } /* Skip PES private data, program packet sequence counter and P-STD buffer */ skip = (pes_ext >> 4) & 0xb; skip += skip & 0x9; + if (pes_ext & 0x40 || skip > header_len){ + av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext); + pes_ext=skip=0; + } url_fskip(s->pb, skip); header_len -= skip; @@ -406,7 +390,9 @@ static int mpegps_read_pes_header(AVFormatContext *s, if(dts != AV_NOPTS_VALUE && ppos){ int i; for(i=0; inb_streams; i++){ - if(startcode == s->streams[i]->id) { + if(startcode == s->streams[i]->id && + !url_is_streamed(s->pb) /* 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? */); } } @@ -423,7 +409,9 @@ static int mpegps_read_packet(AVFormatContext *s, { MpegDemuxContext *m = s->priv_data; AVStream *st; - int len, startcode, i, type, codec_id = 0, es_type; + int len, startcode, i, es_type; + enum CodecID codec_id = CODEC_ID_NONE; + enum CodecType type; int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work redo: @@ -473,7 +461,7 @@ static int mpegps_read_packet(AVFormatContext *s, if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) codec_id = CODEC_ID_CAVS; else - codec_id = CODEC_ID_MPEG2VIDEO; + codec_id = CODEC_ID_PROBE; type = CODEC_TYPE_VIDEO; } else if (startcode >= 0x1c0 && startcode <= 0x1df) { type = CODEC_TYPE_AUDIO; @@ -481,14 +469,15 @@ static int mpegps_read_packet(AVFormatContext *s, } else if (startcode >= 0x80 && startcode <= 0x87) { type = CODEC_TYPE_AUDIO; codec_id = CODEC_ID_AC3; - } else if ((startcode >= 0x88 && startcode <= 0x8f) + } else if ( ( startcode >= 0x88 && startcode <= 0x8f) ||( startcode >= 0x98 && startcode <= 0x9f)) { /* 0x90 - 0x97 is reserved for SDDS in DVD specs */ type = CODEC_TYPE_AUDIO; codec_id = CODEC_ID_DTS; } else if (startcode >= 0xa0 && startcode <= 0xaf) { type = CODEC_TYPE_AUDIO; - codec_id = CODEC_ID_PCM_S16BE; + /* 16 bit form will be handled as CODEC_ID_PCM_S16BE */ + codec_id = CODEC_ID_PCM_DVD; } else if (startcode >= 0xb0 && startcode <= 0xbf) { type = CODEC_TYPE_AUDIO; codec_id = CODEC_ID_MLP; @@ -533,7 +522,14 @@ static int mpegps_read_packet(AVFormatContext *s, freq = (b1 >> 4) & 3; st->codec->sample_rate = lpcm_freq_tab[freq]; st->codec->channels = 1 + (b1 & 7); - st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * 2; + st->codec->bits_per_coded_sample = 16 + ((b1 >> 6) & 3) * 4; + st->codec->bit_rate = st->codec->channels * + st->codec->sample_rate * + st->codec->bits_per_coded_sample; + if (st->codec->bits_per_coded_sample == 16) + st->codec->codec_id = CODEC_ID_PCM_S16BE; + else if (st->codec->bits_per_coded_sample == 28) + return AVERROR(EINVAL); } av_new_packet(pkt, len); get_buffer(s->pb, pkt->data, pkt->size); @@ -548,11 +544,6 @@ static int mpegps_read_packet(AVFormatContext *s, return 0; } -static int mpegps_read_close(AVFormatContext *s) -{ - return 0; -} - static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) { @@ -563,7 +554,9 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, #ifdef DEBUG_SEEK printf("read_dts: pos=0x%"PRIx64" next=%d -> ", pos, find_next); #endif - url_fseek(s->pb, pos, SEEK_SET); + if (url_fseek(s->pb, pos, SEEK_SET) < 0) + return AV_NOPTS_VALUE; + for(;;) { len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts); if (len < 0) { @@ -587,13 +580,13 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, AVInputFormat mpegps_demuxer = { "mpeg", - "MPEG PS format", + NULL_IF_CONFIG_SMALL("MPEG-PS format"), sizeof(MpegDemuxContext), mpegps_probe, mpegps_read_header, mpegps_read_packet, - mpegps_read_close, + NULL, NULL, //mpegps_read_seek, mpegps_read_dts, - .flags = AVFMT_SHOW_IDS, + .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, };