virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Parse ID3v[12] metadata from TTA files.

Browse Source 
As a side-effect, this commit also fixes issue 1310.

Originally committed as revision 20886 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jai Menon
2009-12-16 19:18:48 +00:00
parent 5c910fcad8
commit 22ff336145
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@@ -228,7 +228,7 @@ OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
OBJS-$(CONFIG_TMV_DEMUXER) += tmv.o OBJS-$(CONFIG_TMV_DEMUXER) += tmv.o
OBJS-$(CONFIG_TRUEHD_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_TRUEHD_DEMUXER) += raw.o id3v2.o
OBJS-$(CONFIG_TRUEHD_MUXER) += raw.o OBJS-$(CONFIG_TRUEHD_MUXER) += raw.o
OBJS-$(CONFIG_TTA_DEMUXER) += tta.o OBJS-$(CONFIG_TTA_DEMUXER) += tta.o id3v1.o id3v2.o
OBJS-$(CONFIG_TXD_DEMUXER) += txd.o OBJS-$(CONFIG_TXD_DEMUXER) += txd.o
OBJS-$(CONFIG_VC1_DEMUXER) += raw.o OBJS-$(CONFIG_VC1_DEMUXER) += raw.o
OBJS-$(CONFIG_VC1T_DEMUXER) += vc1test.o OBJS-$(CONFIG_VC1T_DEMUXER) += vc1test.o

17
libavformat/tta.c
View File

@@ -21,6 +21,8 @@
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "avformat.h" #include "avformat.h"
#include "id3v2.h"
#include "id3v1.h"
typedef struct { typedef struct {
int totalframes, currentframe; int totalframes, currentframe;
@@ -29,6 +31,10 @@ typedef struct {
static int tta_probe(AVProbeData *p) static int tta_probe(AVProbeData *p)
{ {
const uint8_t *d = p->buf; const uint8_t *d = p->buf;
if (ff_id3v2_match(d))
d += ff_id3v2_tag_len(d);
if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1') if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1')
return 80; return 80;
return 0; return 0;
@@ -39,8 +45,13 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
TTAContext *c = s->priv_data; TTAContext *c = s->priv_data;
AVStream *st; AVStream *st;
int i, channels, bps, samplerate, datalen, framelen; int i, channels, bps, samplerate, datalen, framelen;
uint64_t framepos; uint64_t framepos, start_offset;
ff_id3v2_read(s);
if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
ff_id3v1_read(s);
start_offset = url_ftell(s->pb);
if (get_le32(s->pb) != AV_RL32("TTA1")) if (get_le32(s->pb) != AV_RL32("TTA1"))
return -1; // not tta file return -1; // not tta file
@@ -93,14 +104,14 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->sample_rate = samplerate; st->codec->sample_rate = samplerate;
st->codec->bits_per_coded_sample = bps; st->codec->bits_per_coded_sample = bps;
st->codec->extradata_size = url_ftell(s->pb); st->codec->extradata_size = url_ftell(s->pb) - start_offset;
if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){ 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 get_buffer should fail
av_log(s, AV_LOG_ERROR, "extradata_size too large\n"); av_log(s, AV_LOG_ERROR, "extradata_size too large\n");
return -1; return -1;
} }
st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE);
url_fseek(s->pb, 0, SEEK_SET); url_fseek(s->pb, start_offset, SEEK_SET);
get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size); get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size);
return 0; return 0;