/*
* MPEG1/2 demuxer
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
*
* This file is part of FFmpeg.
*
if((*p&0xC0) == 0x40) p+=2;
if((*p&0xF0) == 0x20){
pes1= p[0]&p[2]&p[4]&1;
- p+=5;
}else if((*p&0xF0) == 0x30){
pes1= p[0]&p[2]&p[4]&p[5]&p[7]&p[9]&1;
- p+=10;
}else
pes1 = *p == 0x0F;
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++;
if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
score= AVPROBE_SCORE_MAX/4;
-//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, invalid, p->buf_size);
if(sys>invalid && sys*9 <= pspack*10)
- return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
- if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
- return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
- if((!!vid ^ !!audio) && (audio+vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
- return AVPROBE_SCORE_MAX/2+2;
+ return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+ if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9)
+ return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+ 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_MAX/2+2 : AVPROBE_SCORE_MAX/4;
//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
return score;
}
m->sofdec++;
} while (v == sofdec[i] && i++ < 6);
+ m->sofdec = (m->sofdec == 6) ? 1 : 0;
+
/* no need to do more */
return 0;
}
/* 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;
startcode = find_next_start_code(s->pb, &size, &m->header_state);
last_sync = url_ftell(s->pb);
//printf("startcode=%x pos=0x%"PRIx64"\n", startcode, url_ftell(s->pb));
- if (startcode < 0)
- return AVERROR(EIO);
+ if (startcode < 0){
+ if(url_feof(s->pb))
+ return AVERROR_EOF;
+ //FIXME we should remember header_state
+ return AVERROR(EAGAIN);
+ }
+
if (startcode == PACK_START_CODE)
goto redo;
if (startcode == SYSTEM_HEADER_START_CODE)
{
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
+ uint8_t av_uninit(dvdaudio_substream_type);
redo:
len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts);
if (len < 0)
return len;
+ if(startcode == 0x1bd) {
+ dvdaudio_substream_type = get_byte(s->pb);
+ url_fskip(s->pb, 3);
+ len -= 4;
+ }
+
/* now find stream */
for(i=0;i<s->nb_streams;i++) {
st = s->streams[i];
}
es_type = m->psm_es_type[startcode & 0xff];
- if(es_type > 0){
+ if(es_type > 0 && es_type != STREAM_TYPE_PRIVATE_DATA){
if(es_type == STREAM_TYPE_VIDEO_MPEG1){
codec_id = CODEC_ID_MPEG2VIDEO;
type = CODEC_TYPE_VIDEO;
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;
} 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_PCM_DVD;
} else if (startcode >= 0xb0 && startcode <= 0xbf) {
type = CODEC_TYPE_AUDIO;
- codec_id = CODEC_ID_MLP;
+ codec_id = CODEC_ID_TRUEHD;
} else if (startcode >= 0xc0 && startcode <= 0xcf) {
/* Used for both AC-3 and E-AC-3 in EVOB files */
type = CODEC_TYPE_AUDIO;
} else if (startcode >= 0xfd55 && startcode <= 0xfd5f) {
type = CODEC_TYPE_VIDEO;
codec_id = CODEC_ID_VC1;
+ } else if (startcode == 0x1bd) {
+ // check dvd audio substream type
+ type = CODEC_TYPE_AUDIO;
+ switch(dvdaudio_substream_type & 0xe0) {
+ case 0xa0: codec_id = CODEC_ID_PCM_DVD;
+ break;
+ case 0x80: if((dvdaudio_substream_type & 0xf8) == 0x88)
+ codec_id = CODEC_ID_DTS;
+ else codec_id = CODEC_ID_AC3;
+ break;
+ default: av_log(s, AV_LOG_ERROR, "Unknown 0x1bd sub-stream\n");
+ goto skip;
+ }
} else {
skip:
/* skip packet */
found:
if(st->discard >= AVDISCARD_ALL)
goto skip;
- if (startcode >= 0xa0 && startcode <= 0xaf) {
+ if ((startcode >= 0xa0 && startcode <= 0xaf) ||
+ (startcode == 0x1bd && ((dvdaudio_substream_type & 0xe0) == 0xa0))) {
int b1, freq;
/* for LPCM, we just skip the header and consider it is raw
freq = (b1 >> 4) & 3;
st->codec->sample_rate = lpcm_freq_tab[freq];
st->codec->channels = 1 + (b1 & 7);
- st->codec->bits_per_sample = 16 + ((b1 >> 6) & 3) * 4;
+ 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_sample;
- if (st->codec->bits_per_sample == 16)
+ 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_sample == 28)
+ 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);
pkt->pts = pts;
pkt->dts = dts;
+ pkt->pos = dummy_pos;
pkt->stream_index = st->index;
#if 0
av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",
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)
{
#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) {
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,
};
projects / ffmpeg / blobdiff