RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e' 

* commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e':
  mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-26 13:18:34 +02:00
parent 9748f1477d dc518a3ae2
commit 80e0599402
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/mov.c
View File

@ -1471,6 +1471,20 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
} }
} }
static void mov_parse_stsd_subtitle(MOVContext *c, AVIOContext *pb,
AVStream *st, MOVStreamContext *sc,
int size)
{
// ttxt stsd contains display flags, justification, background
// color, fonts, and default styles, so fake an atom to read it
MOVAtom fake_atom = { .size = size };
// mp4s contains a regular esds atom
if (st->codec->codec_tag != AV_RL32("mp4s"))
mov_read_glbl(c, pb, fake_atom);
st->codec->width = sc->width;
st->codec->height = sc->height;
}
int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
{ {
AVStream *st; AVStream *st;
@ -1533,14 +1547,9 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
st->codec->codec_id = id; st->codec->codec_id = id;
mov_parse_stsd_audio(c, pb, st, sc); mov_parse_stsd_audio(c, pb, st, sc);
} else if (st->codec->codec_type==AVMEDIA_TYPE_SUBTITLE){ } else if (st->codec->codec_type==AVMEDIA_TYPE_SUBTITLE){
// ttxt stsd contains display flags, justification, background st->codec->codec_id = id;
// color, fonts, and default styles, so fake an atom to read it mov_parse_stsd_subtitle(c, pb, st, sc,
MOVAtom fake_atom = { .size = size - (avio_tell(pb) - start_pos) }; size - (avio_tell(pb) - start_pos));
if (format != AV_RL32("mp4s")) // mp4s contains a regular esds atom
mov_read_glbl(c, pb, fake_atom);
st->codec->codec_id= id;
st->codec->width = sc->width;
st->codec->height = sc->height;
} else { } else {
if (st->codec->codec_tag == MKTAG('t','m','c','d')) { if (st->codec->codec_tag == MKTAG('t','m','c','d')) {
MOVStreamContext *tmcd_ctx = st->priv_data; MOVStreamContext *tmcd_ctx = st->priv_data;