eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mov: merge mov_read_custom functions

Browse Source 
This also fixes reading gapless metadata when the entries do not start with the
mean atom. Such samples can be found here:
https://hydrogenaud.io/index.php/topic,93310.0.html

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2016-02-20 01:34:42 +01:00
parent c66a6369e4
commit 4840effe42
1 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libavformat/mov.c
View File

@@ -3173,10 +3173,10 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
} }
static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t size) static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
int64_t end = avio_tell(pb) + size; int64_t end = avio_tell(pb) + atom.size;
uint8_t *key = NULL, *val = NULL; uint8_t *key = NULL, *val = NULL, *mean = NULL;
int i; int i;
AVStream *st; AVStream *st;
MOVStreamContext *sc; MOVStreamContext *sc;
@@ -3186,7 +3186,7 @@ static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t size)
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
sc = st->priv_data; sc = st->priv_data;
for (i = 0; i < 2; i++) { for (i = 0; i < 3; i++) {
uint8_t **p; uint8_t **p;
uint32_t len, tag; uint32_t len, tag;
int ret; int ret;
@@ -3202,7 +3202,9 @@ static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t size)
break; break;
len -= 12; len -= 12;
if (tag == MKTAG('n', 'a', 'm', 'e')) if (tag == MKTAG('m', 'e', 'a', 'n'))
p = &mean;
else if (tag == MKTAG('n', 'a', 'm', 'e'))
p = &key; p = &key;
else if (tag == MKTAG('d', 'a', 't', 'a') && len > 4) { else if (tag == MKTAG('d', 'a', 't', 'a') && len > 4) {
avio_skip(pb, 4); avio_skip(pb, 4);
@@ -3222,7 +3224,7 @@ static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t size)
(*p)[len] = 0; (*p)[len] = 0;
} }
if (key && val) { if (mean && key && val) {
if (strcmp(key, "iTunSMPB") == 0) { if (strcmp(key, "iTunSMPB") == 0) {
int priming, remainder, samples; int priming, remainder, samples;
if(sscanf(val, "%*X %X %X %X", &priming, &remainder, &samples) == 3){ if(sscanf(val, "%*X %X %X %X", &priming, &remainder, &samples) == 3){
@@ -3235,43 +3237,15 @@ static int mov_read_custom_2plus(MOVContext *c, AVIOContext *pb, int64_t size)
AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
key = val = NULL; key = val = NULL;
} }
} else {
av_log(c->fc, AV_LOG_VERBOSE,
"Unhandled or malformed custom metadata of size %"PRId64"\n", atom.size);
} }
avio_seek(pb, end, SEEK_SET); avio_seek(pb, end, SEEK_SET);
av_freep(&key); av_freep(&key);
av_freep(&val); av_freep(&val);
return 0; av_freep(&mean);
}
static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
int64_t end = avio_tell(pb) + atom.size;
uint32_t tag, len;
if (atom.size < 8)
goto fail;
len = avio_rb32(pb);
tag = avio_rl32(pb);
if (len > atom.size)
goto fail;
if (tag == MKTAG('m', 'e', 'a', 'n') && len > 12) {
uint8_t domain[128];
int domain_len;
avio_skip(pb, 4); // flags
len -= 12;
domain_len = avio_get_str(pb, len, domain, sizeof(domain));
avio_skip(pb, len - domain_len);
return mov_read_custom_2plus(c, pb, end - avio_tell(pb));
}
fail:
av_log(c->fc, AV_LOG_VERBOSE,
"Unhandled or malformed custom metadata of size %"PRId64"\n", atom.size);
return 0; return 0;
} }