X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmp3dec.c;h=48deefd126c5fd1a550aa19ff1a7ac2bfbd914a2;hb=d1bec33b46091546c5b2e6815210e73f87abf413;hp=a1db2323ac88fd3b2be3091ed554b9b2016287f3;hpb=d2d67e424fa10d883e13709095c80bd3b502ce03;p=ffmpeg diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index a1db2323ac8..48deefd126c 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -22,11 +22,19 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "avformat.h" +#include "internal.h" #include "id3v2.h" #include "id3v1.h" #include "libavcodec/mpegaudiodecheader.h" +#define XING_FLAG_FRAMES 0x01 +#define XING_FLAG_SIZE 0x02 +#define XING_FLAG_TOC 0x04 + +#define XING_TOC_COUNT 100 + /* mp3 read */ static int mp3_read_probe(AVProbeData *p) @@ -50,7 +58,7 @@ static int mp3_read_probe(AVProbeData *p) for(frames = 0; buf2 < end; frames++) { header = AV_RB32(buf2); - fsize = ff_mpa_decode_header(&avctx, header, &sample_rate, &sample_rate, &sample_rate, &sample_rate); + fsize = avpriv_mpa_decode_header(&avctx, header, &sample_rate, &sample_rate, &sample_rate, &sample_rate); if(fsize < 0) break; buf2 += fsize; @@ -61,14 +69,54 @@ static int mp3_read_probe(AVProbeData *p) } // keep this in sync with ac3 probe, both need to avoid // issues with MPEG-files! - if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1; - else if(max_frames>500)return AVPROBE_SCORE_MAX/2; - else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; - else if(max_frames>=1) return 1; - else return 0; + if (first_frames >= 4) return AVPROBE_SCORE_MAX / 2 + 1; + + if (max_frames) { + int pes = 0, i; + unsigned int code = -1; + +#define VIDEO_ID 0x000001e0 +#define AUDIO_ID 0x000001c0 + /* do a search for mpegps headers to be able to properly bias + * towards mpegps if we detect this stream as both. */ + for (i = 0; ibuf_size; i++) { + code = (code << 8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + if ((code & 0x1f0) == VIDEO_ID) pes++; + else if((code & 0x1e0) == AUDIO_ID) pes++; + } + } + + if (pes) + max_frames = (max_frames + pes - 1) / pes; + } + if (max_frames > 500) return AVPROBE_SCORE_MAX / 2; + else if (max_frames >= 4) return AVPROBE_SCORE_MAX / 4; + else if (max_frames >= 1) return 1; + else return 0; //mpegps_mp3_unrecognized_format.mpg has max_frames=3 } +static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration) +{ + int i; + + if (!filesize && + !(filesize = avio_size(s->pb))) { + av_log(s, AV_LOG_WARNING, "Cannot determine file size, skipping TOC table.\n"); + return; + } + + for (i = 0; i < XING_TOC_COUNT; i++) { + uint8_t b = avio_r8(s->pb); + + av_add_index_entry(s->streams[0], + av_rescale(b, filesize, 256), + av_rescale(i, duration, XING_TOC_COUNT), + 0, 0, AVINDEX_KEYFRAME); + } +} + /** * Try to find Xing/Info/VBRI tags and compute duration from info therein */ @@ -80,25 +128,32 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; MPADecodeHeader c; int vbrtag_size = 0; + int is_cbr; v = avio_rb32(s->pb); if(ff_mpa_check_header(v) < 0) return -1; - if (ff_mpegaudio_decode_header(&c, v) == 0) + if (avpriv_mpegaudio_decode_header(&c, v) == 0) vbrtag_size = c.frame_size; if(c.layer != 3) return -1; + spf = c.lsf ? 576 : 1152; /* Samples per frame, layer 3 */ + /* Check for Xing / Info tag */ avio_skip(s->pb, xing_offtbl[c.lsf == 1][c.nb_channels == 1]); v = avio_rb32(s->pb); - if(v == MKBETAG('X', 'i', 'n', 'g') || v == MKBETAG('I', 'n', 'f', 'o')) { + is_cbr = v == MKBETAG('I', 'n', 'f', 'o'); + if (v == MKBETAG('X', 'i', 'n', 'g') || is_cbr) { v = avio_rb32(s->pb); - if(v & 0x1) + if(v & XING_FLAG_FRAMES) frames = avio_rb32(s->pb); - if(v & 0x2) + if(v & XING_FLAG_SIZE) size = avio_rb32(s->pb); + if (v & XING_FLAG_TOC && frames) + read_xing_toc(s, size, av_rescale_q(frames, (AVRational){spf, c.sample_rate}, + st->time_base)); } /* Check for VBRI tag (always 32 bytes after end of mpegaudio header) */ @@ -109,8 +164,8 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) if(avio_rb16(s->pb) == 1) { /* skip delay and quality */ avio_skip(s->pb, 4); - frames = avio_rb32(s->pb); size = avio_rb32(s->pb); + frames = avio_rb32(s->pb); } } @@ -120,33 +175,31 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) /* Skip the vbr tag frame */ avio_seek(s->pb, base + vbrtag_size, SEEK_SET); - spf = c.lsf ? 576 : 1152; /* Samples per frame, layer 3 */ if(frames) st->duration = av_rescale_q(frames, (AVRational){spf, c.sample_rate}, st->time_base); - if(size && frames) + if (size && frames && !is_cbr) st->codec->bit_rate = av_rescale(size, 8 * c.sample_rate, frames * (int64_t)spf); return 0; } -static int mp3_read_header(AVFormatContext *s, - AVFormatParameters *ap) +static int mp3_read_header(AVFormatContext *s) { AVStream *st; int64_t off; - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_MP3; + st->codec->codec_id = AV_CODEC_ID_MP3; st->need_parsing = AVSTREAM_PARSE_FULL; st->start_time = 0; // lcm of all mp3 sample rates - av_set_pts_info(st, 64, 1, 14112000); + avpriv_set_pts_info(st, 64, 1, 14112000); off = avio_tell(s->pb); @@ -164,17 +217,13 @@ static int mp3_read_header(AVFormatContext *s, static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret, size; - // AVStream *st = s->streams[0]; - - size= MP3_PACKET_SIZE; + int ret; - ret= av_get_packet(s->pb, pkt, size); + ret = av_get_packet(s->pb, pkt, MP3_PACKET_SIZE); + if (ret < 0) + return ret; pkt->stream_index = 0; - if (ret <= 0) { - return AVERROR(EIO); - } if (ret > ID3v1_TAG_SIZE && memcmp(&pkt->data[ret - ID3v1_TAG_SIZE], "TAG", 3) == 0) @@ -186,13 +235,41 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } +static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp, + int flags) +{ + AVIndexEntry *ie; + AVStream *st = s->streams[0]; + int64_t ret = av_index_search_timestamp(st, timestamp, flags); + uint32_t header = 0; + + if (ret < 0) + return ret; + + ie = &st->index_entries[ret]; + ret = avio_seek(s->pb, ie->pos, SEEK_SET); + if (ret < 0) + return ret; + + while (!s->pb->eof_reached) { + header = (header << 8) + avio_r8(s->pb); + if (ff_mpa_check_header(header) >= 0) { + ff_update_cur_dts(s, st, ie->timestamp); + ret = avio_seek(s->pb, -4, SEEK_CUR); + return (ret >= 0) ? 0 : ret; + } + } + + return AVERROR_EOF; +} + AVInputFormat ff_mp3_demuxer = { - "mp3", - NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"), - 0, - mp3_read_probe, - mp3_read_header, - mp3_read_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "mp2,mp3,m2a", /* XXX: use probe */ + .name = "mp3", + .long_name = NULL_IF_CONFIG_SMALL("MP2/3 (MPEG audio layer 2/3)"), + .read_probe = mp3_read_probe, + .read_header = mp3_read_header, + .read_packet = mp3_read_packet, + .read_seek = mp3_seek, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "mp2,mp3,m2a", /* XXX: use probe */ };