virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/matroskaenc: Don't check twice whether to write tags

Browse Source 
Because not all metadata is written as tags, the Matroska muxer
filters out the tags that are not written as tags.
Therefore the code first checks whether a Tag master element
needs to be opened for a given stream/chapter/attachment/global
metadata. If the answer turns out to be yes, it is checked again
whether a given AVDictionaryEntry is written as a tag.
This commit changes this: The Tag element is opened unconditionally
and in case it turns out that it was unneeded, it is discarded again.
This is possible because the Tag element is written into its own
dynamic buffer.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-06-15 11:49:48 +02:00
parent b468ddc75d
commit fe662516a5
1 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libavformat/matroskaenc.c
View File

@@ -1963,7 +1963,7 @@ static int mkv_write_tag(MatroskaMuxContext *mkv, const AVDictionary *m,
const AVDictionaryEntry *t = NULL; const AVDictionaryEntry *t = NULL;
AVIOContext *const tmp_bc = mkv->tmp_bc; AVIOContext *const tmp_bc = mkv->tmp_bc;
uint8_t *buf; uint8_t *buf;
int ret, size; int ret = 0, size, tag_written = 0;
mkv_write_tag_targets(mkv, tmp_bc, elementid, uid); mkv_write_tag_targets(mkv, tmp_bc, elementid, uid);
@@ -1972,10 +1972,13 @@ static int mkv_write_tag(MatroskaMuxContext *mkv, const AVDictionary *m,
ret = mkv_write_simpletag(tmp_bc, t); ret = mkv_write_simpletag(tmp_bc, t);
if (ret < 0) if (ret < 0)
goto end; goto end;
tag_written = 1;
} }
} }
if (reserved_size) if (reserved_size)
put_ebml_void(tmp_bc, reserved_size); put_ebml_void(tmp_bc, reserved_size);
else if (!tag_written)
goto end;
size = avio_get_dyn_buf(tmp_bc, &buf); size = avio_get_dyn_buf(tmp_bc, &buf);
if (tmp_bc->error) { if (tmp_bc->error) {
@@ -1994,17 +1997,6 @@ end:
return ret; return ret;
} }
static int mkv_check_tag(const AVDictionary *m, uint32_t elementid)
{
const AVDictionaryEntry *t = NULL;
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
if (mkv_check_tag_name(t->key, elementid))
return 1;
return 0;
}
static int mkv_write_tags(AVFormatContext *s) static int mkv_write_tags(AVFormatContext *s)
{ {
MatroskaMuxContext *mkv = s->priv_data; MatroskaMuxContext *mkv = s->priv_data;
@@ -2014,11 +2006,9 @@ static int mkv_write_tags(AVFormatContext *s)
ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL); ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
if (mkv_check_tag(s->metadata, 0)) { ret = mkv_write_tag(mkv, s->metadata, &mkv->tags.bc, 0, 0, 0);
ret = mkv_write_tag(mkv, s->metadata, &mkv->tags.bc, 0, 0, 0); if (ret < 0)
if (ret < 0) return ret;
return ret;
}
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
const AVStream *st = s->streams[i]; const AVStream *st = s->streams[i];
@@ -2027,9 +2017,6 @@ static int mkv_write_tags(AVFormatContext *s)
if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
continue; continue;
if (!seekable && !mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID))
continue;
ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc,
seekable ? DURATION_SIMPLETAG_SIZE : 0, seekable ? DURATION_SIMPLETAG_SIZE : 0,
MATROSKA_ID_TAGTARGETS_TRACKUID, track->uid); MATROSKA_ID_TAGTARGETS_TRACKUID, track->uid);
@@ -2047,9 +2034,6 @@ static int mkv_write_tags(AVFormatContext *s)
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
continue; continue;
if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID))
continue;
ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, 0, ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, 0,
MATROSKA_ID_TAGTARGETS_ATTACHUID, track->uid); MATROSKA_ID_TAGTARGETS_ATTACHUID, track->uid);
if (ret < 0) if (ret < 0)
@@ -2134,12 +2118,10 @@ static int mkv_write_chapters(AVFormatContext *s)
if (tags) { if (tags) {
ff_metadata_conv(&c->metadata, ff_mkv_metadata_conv, NULL); ff_metadata_conv(&c->metadata, ff_mkv_metadata_conv, NULL);
if (mkv_check_tag(c->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) { ret = mkv_write_tag(mkv, c->metadata, tags, 0,
ret = mkv_write_tag(mkv, c->metadata, tags, 0, MATROSKA_ID_TAGTARGETS_CHAPTERUID, uid);
MATROSKA_ID_TAGTARGETS_CHAPTERUID, uid); if (ret < 0)
if (ret < 0) goto fail;
goto fail;
}
} }
} }
end_ebml_master(dyn_cp, editionentry); end_ebml_master(dyn_cp, editionentry);