X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavformat%2Ftta.c;h=e5e6e7186c8a89615dcec0a50a01a92384a9df69;hb=db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf;hp=431afc00fb96834b3792318f840915ec90ab4d8e;hpb=ff70e60176056daf646109b8e42654a3036fa02b;p=ffmpeg diff --git a/libavformat/tta.c b/libavformat/tta.c index 431afc00fb9..e5e6e7186c8 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -2,102 +2,124 @@ * TTA demuxer * Copyright (c) 2006 Alex Beregszaszi * - * This library is free software; you can redistribute it and/or + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavcodec/get_bits.h" #include "avformat.h" -#define ALT_BITSREAM_READER_LE -#include "bitstream.h" +#include "internal.h" +#include "id3v1.h" +#include "libavutil/dict.h" typedef struct { int totalframes, currentframe; - uint32_t *seektable; + int frame_size; + int last_frame_size; } TTAContext; static int tta_probe(AVProbeData *p) { const uint8_t *d = p->buf; - if (p->buf_size < 4) - return 0; + if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1') - return 80; + return AVPROBE_SCORE_EXTENSION + 30; return 0; } -static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int tta_read_header(AVFormatContext *s) { TTAContext *c = s->priv_data; AVStream *st; - int i, channels, bps, samplerate, datalen, framelen, start; + int i, channels, bps, samplerate, datalen; + uint64_t framepos, start_offset; - start = url_ftell(&s->pb); + if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) + ff_id3v1_read(s); - if (get_le32(&s->pb) != ff_get_fourcc("TTA1")) + start_offset = avio_tell(s->pb); + if (avio_rl32(s->pb) != AV_RL32("TTA1")) return -1; // not tta file - url_fskip(&s->pb, 2); // FIXME: flags - channels = get_le16(&s->pb); - bps = get_le16(&s->pb); - samplerate = get_le32(&s->pb); + avio_skip(s->pb, 2); // FIXME: flags + channels = avio_rl16(s->pb); + bps = avio_rl16(s->pb); + samplerate = avio_rl32(s->pb); if(samplerate <= 0 || samplerate > 1000000){ av_log(s, AV_LOG_ERROR, "nonsense samplerate\n"); return -1; } - datalen = get_le32(&s->pb); + datalen = avio_rl32(s->pb); if(datalen < 0){ av_log(s, AV_LOG_ERROR, "nonsense datalen\n"); return -1; } - url_fskip(&s->pb, 4); // header crc + avio_skip(s->pb, 4); // header crc - framelen = 1.04489795918367346939 * samplerate; - c->totalframes = datalen / framelen + ((datalen % framelen) ? 1 : 0); + c->frame_size = samplerate * 256 / 245; + c->last_frame_size = datalen % c->frame_size; + if (!c->last_frame_size) + c->last_frame_size = c->frame_size; + c->totalframes = datalen / c->frame_size + (c->last_frame_size < c->frame_size); c->currentframe = 0; if(c->totalframes >= UINT_MAX/sizeof(uint32_t)){ av_log(s, AV_LOG_ERROR, "totalframes too large\n"); return -1; } - c->seektable = av_mallocz(sizeof(uint32_t)*c->totalframes); - if (!c->seektable) - return AVERROR_NOMEM; - for (i = 0; i < c->totalframes; i++) - c->seektable[i] = get_le32(&s->pb); - url_fskip(&s->pb, 4); // seektable crc - - st = av_new_stream(s, 0); -// av_set_pts_info(st, 32, 1, 1000); + st = avformat_new_stream(s, NULL); if (!st) - return AVERROR_NOMEM; - st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_TTA; + return AVERROR(ENOMEM); + + avpriv_set_pts_info(st, 64, 1, samplerate); + st->start_time = 0; + st->duration = datalen; + + framepos = avio_tell(s->pb) + 4*c->totalframes + 4; + + for (i = 0; i < c->totalframes; i++) { + uint32_t size = avio_rl32(s->pb); + av_add_index_entry(st, framepos, i * c->frame_size, size, 0, + AVINDEX_KEYFRAME); + framepos += size; + } + avio_skip(s->pb, 4); // seektable crc + + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = AV_CODEC_ID_TTA; st->codec->channels = channels; st->codec->sample_rate = samplerate; - st->codec->bits_per_sample = bps; + st->codec->bits_per_coded_sample = bps; - st->codec->extradata_size = url_ftell(&s->pb) - start; + st->codec->extradata_size = avio_tell(s->pb) - start_offset; if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){ - //this check is redundant as get_buffer should fail + //this check is redundant as avio_read should fail av_log(s, AV_LOG_ERROR, "extradata_size too large\n"); return -1; } st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE); - url_fseek(&s->pb, start, SEEK_SET); // or SEEK_CUR and -size ? :) - get_buffer(&s->pb, st->codec->extradata, st->codec->extradata_size); + if (!st->codec->extradata) { + st->codec->extradata_size = 0; + return AVERROR(ENOMEM); + } + avio_seek(s->pb, start_offset, SEEK_SET); + avio_read(s->pb, st->codec->extradata, st->codec->extradata_size); return 0; } @@ -105,47 +127,44 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) static int tta_read_packet(AVFormatContext *s, AVPacket *pkt) { TTAContext *c = s->priv_data; - int ret, size; + AVStream *st = s->streams[0]; + int size, ret; // FIXME! - if (c->currentframe > c->totalframes) - size = 0; - else - size = c->seektable[c->currentframe]; - - c->currentframe++; - - if (av_new_packet(pkt, size) < 0) - return AVERROR_IO; - - pkt->pos = url_ftell(&s->pb); - pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, size); - if (ret <= 0) { - av_free_packet(pkt); - return AVERROR_IO; - } - pkt->size = ret; -// av_log(s, AV_LOG_INFO, "TTA packet #%d desired size: %d read size: %d at pos %d\n", -// c->currentframe, size, ret, pkt->pos); - return 0; //ret; + if (c->currentframe >= c->totalframes) + return AVERROR_EOF; + + size = st->index_entries[c->currentframe].size; + + ret = av_get_packet(s->pb, pkt, size); + pkt->dts = st->index_entries[c->currentframe++].timestamp; + pkt->duration = c->currentframe == c->totalframes ? c->last_frame_size : + c->frame_size; + return ret; } -static int tta_read_close(AVFormatContext *s) +static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { TTAContext *c = s->priv_data; - if (c->seektable) - av_free(c->seektable); + AVStream *st = s->streams[stream_index]; + int index = av_index_search_timestamp(st, timestamp, flags); + if (index < 0) + return -1; + if (avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET) < 0) + return -1; + + c->currentframe = index; + return 0; } -AVInputFormat tta_demuxer = { - "tta", - "true-audio", - sizeof(TTAContext), - tta_probe, - tta_read_header, - tta_read_packet, - tta_read_close, - .extensions = "tta", +AVInputFormat ff_tta_demuxer = { + .name = "tta", + .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), + .priv_data_size = sizeof(TTAContext), + .read_probe = tta_probe, + .read_header = tta_read_header, + .read_packet = tta_read_packet, + .read_seek = tta_read_seek, + .extensions = "tta", };