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

mov: Parse tmcd extradata

Browse Source
This commit is contained in:
Luca Barbato
2013-08-25 13:02:07 +02:00
parent 0b5af5cf12
commit 5b41eb91e0
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/mov.c
View File

@@ -1306,6 +1306,23 @@ static void mov_parse_stsd_subtitle(MOVContext *c, AVIOContext *pb,
st->codec->height = sc->height; st->codec->height = sc->height;
} }
static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb,
AVStream *st, MOVStreamContext *sc,
int size)
{
if (st->codec->codec_tag == MKTAG('t','m','c','d')) {
st->codec->extradata_size = size;
st->codec->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata)
return AVERROR(ENOMEM);
avio_read(pb, st->codec->extradata, size);
} else {
/* other codec type, just skip (rtp, mp4s ...) */
avio_skip(pb, size);
}
return 0;
}
static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb, static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb,
AVStream *st, MOVStreamContext *sc) AVStream *st, MOVStreamContext *sc)
{ {
@@ -1409,7 +1426,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
pseudo_stream_id++) { pseudo_stream_id++) {
//Parsing Sample description table //Parsing Sample description table
enum AVCodecID id; enum AVCodecID id;
int dref_id = 1; int ret, dref_id = 1;
MOVAtom a = { AV_RL32("stsd") }; MOVAtom a = { AV_RL32("stsd") };
int64_t start_pos = avio_tell(pb); int64_t start_pos = avio_tell(pb);
uint32_t size = avio_rb32(pb); /* size */ uint32_t size = avio_rb32(pb); /* size */
@@ -1448,13 +1465,14 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
mov_parse_stsd_subtitle(c, pb, st, sc, mov_parse_stsd_subtitle(c, pb, st, sc,
size - (avio_tell(pb) - start_pos)); size - (avio_tell(pb) - start_pos));
} else { } else {
/* other codec type, just skip (rtp, mp4s, tmcd ...) */ ret = mov_parse_stsd_data(c, pb, st, sc,
avio_skip(pb, size - (avio_tell(pb) - start_pos)); size - (avio_tell(pb) - start_pos));
if (ret < 0)
return ret;
} }
/* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */ /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */
a.size = size - (avio_tell(pb) - start_pos); a.size = size - (avio_tell(pb) - start_pos);
if (a.size > 8) { if (a.size > 8) {
int ret;
if ((ret = mov_read_default(c, pb, a)) < 0) if ((ret = mov_read_default(c, pb, a)) < 0)
return ret; return ret;
} else if (a.size > 0) } else if (a.size > 0)