X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftta.c;h=da6c04e70391724a85394c49360b8ae555423e88;hb=8d9f12657c3cf489bb033c2fc29965859657193e;hp=a513d9d3877209cb4781a58be746f10a190bf5d1;hpb=b78e7197a81e193827cf2408fe25bc1f14843a72;p=ffmpeg diff --git a/libavformat/tta.c b/libavformat/tta.c index a513d9d3877..da6c04e7039 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -16,21 +16,19 @@ * * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavcodec/get_bits.h" #include "avformat.h" -#include "bitstream.h" typedef struct { int totalframes, currentframe; - uint32_t *seektable; } 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 0; @@ -40,31 +38,30 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) { TTAContext *c = s->priv_data; AVStream *st; - int i, channels, bps, samplerate, datalen, framelen, start; - - start = url_ftell(&s->pb); + int i, channels, bps, samplerate, datalen, framelen; + uint64_t framepos; - if (get_le32(&s->pb) != ff_get_fourcc("TTA1")) + if (get_le32(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); + url_fskip(s->pb, 2); // FIXME: flags + channels = get_le16(s->pb); + bps = get_le16(s->pb); + samplerate = get_le32(s->pb); if(samplerate <= 0 || samplerate > 1000000){ av_log(s, AV_LOG_ERROR, "nonsense samplerate\n"); return -1; } - datalen = get_le32(&s->pb); + datalen = get_le32(s->pb); if(datalen < 0){ av_log(s, AV_LOG_ERROR, "nonsense datalen\n"); return -1; } - url_fskip(&s->pb, 4); // header crc + url_fskip(s->pb, 4); // header crc - framelen = 1.04489795918367346939 * samplerate; + framelen = samplerate*256/245; c->totalframes = datalen / framelen + ((datalen % framelen) ? 1 : 0); c->currentframe = 0; @@ -72,33 +69,39 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap) 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); if (!st) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); + + av_set_pts_info(st, 64, 1, samplerate); + st->start_time = 0; + st->duration = datalen; + + framepos = url_ftell(s->pb) + 4*c->totalframes + 4; + + for (i = 0; i < c->totalframes; i++) { + uint32_t size = get_le32(s->pb); + av_add_index_entry(st, framepos, i*framelen, size, 0, AVINDEX_KEYFRAME); + framepos += size; + } + url_fskip(s->pb, 4); // seektable crc + st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_id = 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 = url_ftell(s->pb); if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){ //this check is redundant as get_buffer 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); + url_fseek(s->pb, 0, SEEK_SET); + get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size); return 0; } @@ -106,47 +109,42 @@ 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++; + return -1; - if (av_new_packet(pkt, size) < 0) - return AVERROR_IO; + size = st->index_entries[c->currentframe].size; - 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; + ret = av_get_packet(s->pb, pkt, size); + pkt->dts = st->index_entries[c->currentframe++].timestamp; + 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; + + c->currentframe = index; + url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET); + return 0; } AVInputFormat tta_demuxer = { "tta", - "true-audio", + NULL_IF_CONFIG_SMALL("True Audio"), sizeof(TTAContext), tta_probe, tta_read_header, tta_read_packet, - tta_read_close, + NULL, + tta_read_seek, .extensions = "tta", };