From patchwork Thu May 7 19:19:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19544 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 82CBD44A52F for ; Thu, 7 May 2020 22:20:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A3DE68AAD7; Thu, 7 May 2020 22:20:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C320B68A764 for ; Thu, 7 May 2020 22:20:07 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id k1so7748464wrx.4 for ; Thu, 07 May 2020 12:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ggJ556ZqgZxR7s49ndS7LM/N9qXcboVwCI1LR8Mvgq0=; b=CwXjqZAszeWhI9AJ/jS6+8wcGWp1yRsZn0ErtlO0Par9t9m5Pmw5MFOF24y5baohhy d5xnXj7/YSnhHvO6VlcoFLIL1m9x5+szebApkWPsJIzoaqfHzk/PRs/hhsyRuf6anodi w94NE0PKnjwNrm3UZuVDDhZwMW+pIdQXwTTk9SiKL1jhldLkQeidz48DweRhek79OWcv uCDv2bbu9NA89oJBlv8xMhDvMDE9r3kcJRNvHywCTiZK7e50LQkHNcgvuPpDk8mXMprb FRu114irl62FY3uQBe3qjA2LqOYF09Tx0MkdRrUUNbbxWWNnc+ltZUH7gdPt2XLNjcMz HGTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ggJ556ZqgZxR7s49ndS7LM/N9qXcboVwCI1LR8Mvgq0=; b=kGmIaHGLhMe4keXe/BdkyynjlM+Kj+UkdmJozbxjixtMgqNITirGou/BGlKm0nu5oh L897NxAePKyDR8x+6JWu5qQVbd1rPagfWgCFbDH0FiGiqfsMGJ/PYjbf7U+yXsMNAQzL yJaKL+Ga3qpcOUkoTA8t3yuuK0XPmXgThbtGlFmrP7lh0Ryh4MNkEfazIpZ3EcmhLdX+ bHxblHOxlk0IM1tcOXJoozYKs9nP4GN610ydbXrJ6mPXDaxse+VxdGwL08bxd3zQUppj hKkhC8jDHx+2KUFmSN3+XfQrteePEtaOVwwXd1wxsH8Mlp1A97CCbBBh/27V0mAEGjd5 gwUw== X-Gm-Message-State: AGi0PubaLxu94V6rHq3/ZnpQsHIVlwG8d9RlqIrQJ50y88hokxaJuxSv 2k4bRnFL60NEvW70cU0Ridl7g59k X-Google-Smtp-Source: APiQypJxU+j5sTa8ykoF5Kk3YeThjAaG21tM6jB2IimwodvJIReAnkZIu0mtRcaRVLMgdfCdfS0BAw== X-Received: by 2002:a5d:526f:: with SMTP id l15mr16718025wrc.367.1588879206808; Thu, 07 May 2020 12:20:06 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m188sm8928964wme.47.2020.05.07.12.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 12:20:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 21:19:33 +0200 Message-Id: <20200507191937.16691-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200502171700.28991-8-andreas.rheinhardt@gmail.com> References: <20200502171700.28991-8-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/21] avformat/matroskaenc: Allow a custom destination for writing Tags X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now, the Matroska muxer writes only one Tags level 1 element and therefore using a certain place to store the dynamic buffer used for writing it was hardcoded; yet the Matroska specifications allow an unlimited amount of Tags elements and we have reason to write a second one: If chapters are provided after writing the header, they are written when writing the trailer; yet the corresponding tags are ignored. This can be fixed by writing them in a second Tags element. Also use a MatroskaMuxContext * instead of an AVFormatContext * as parameter in mkv_write_tag() and mkv_write_tag_targets() as that is all these functions use. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 47 ++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c888f537fb..fad2c18e2b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1528,26 +1528,23 @@ static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t) return 0; } -static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid, - uint64_t uid, ebml_master *tag) +static int mkv_write_tag_targets(MatroskaMuxContext *mkv, AVIOContext **pb, + ebml_master *tag, uint32_t elementid, uint64_t uid) { - AVIOContext *pb; - MatroskaMuxContext *mkv = s->priv_data; ebml_master targets; int ret; - if (!mkv->tags.bc) { - ret = start_ebml_master_crc32(&mkv->tags.bc, mkv); + if (!*pb) { + ret = start_ebml_master_crc32(pb, mkv); if (ret < 0) return ret; } - pb = mkv->tags.bc; - *tag = start_ebml_master(pb, MATROSKA_ID_TAG, 0); - targets = start_ebml_master(pb, MATROSKA_ID_TAGTARGETS, 4 + 1 + 8); + *tag = start_ebml_master(*pb, MATROSKA_ID_TAG, 0); + targets = start_ebml_master(*pb, MATROSKA_ID_TAGTARGETS, 4 + 1 + 8); if (elementid) - put_ebml_uid(pb, elementid, uid); - end_ebml_master(pb, targets); + put_ebml_uid(*pb, elementid, uid); + end_ebml_master(*pb, targets); return 0; } @@ -1565,28 +1562,28 @@ static int mkv_check_tag_name(const char *name, uint32_t elementid) av_strcasecmp(name, "mimetype"))); } -static int mkv_write_tag(AVFormatContext *s, const AVDictionary *m, - uint32_t elementid, uint64_t uid, ebml_master *tag) +static int mkv_write_tag(MatroskaMuxContext *mkv, const AVDictionary *m, + AVIOContext **pb, ebml_master *tag, + uint32_t elementid, uint64_t uid) { - MatroskaMuxContext *mkv = s->priv_data; const AVDictionaryEntry *t = NULL; ebml_master tag2; int ret; - ret = mkv_write_tag_targets(s, elementid, uid, tag ? tag : &tag2); + ret = mkv_write_tag_targets(mkv, pb, tag ? tag : &tag2, elementid, uid); if (ret < 0) return ret; while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) { if (mkv_check_tag_name(t->key, elementid)) { - ret = mkv_write_simpletag(mkv->tags.bc, t); + ret = mkv_write_simpletag(*pb, t); if (ret < 0) return ret; } } if (!tag) - end_ebml_master(mkv->tags.bc, tag2); + end_ebml_master(*pb, tag2); return 0; } @@ -1611,7 +1608,7 @@ static int mkv_write_tags(AVFormatContext *s) ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL); if (mkv_check_tag(s->metadata, 0)) { - ret = mkv_write_tag(s, s->metadata, 0, 0, NULL); + ret = mkv_write_tag(mkv, s->metadata, &mkv->tags.bc, NULL, 0, 0); if (ret < 0) return ret; } @@ -1627,8 +1624,8 @@ static int mkv_write_tags(AVFormatContext *s) if (!tagp && !mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID)) continue; - ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, - track->uid, tagp); + ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, tagp, + MATROSKA_ID_TAGTARGETS_TRACKUID, track->uid); if (ret < 0) return ret; @@ -1656,9 +1653,9 @@ static int mkv_write_tags(AVFormatContext *s) if (!mkv_check_tag(ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) continue; - ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID, - (uint32_t)ch->id + (uint64_t)mkv->chapter_id_offset, - NULL); + ret = mkv_write_tag(mkv, ch->metadata, &mkv->tags.bc, NULL, + MATROSKA_ID_TAGTARGETS_CHAPTERUID, + (uint32_t)ch->id + (uint64_t)mkv->chapter_id_offset); if (ret < 0) return ret; } @@ -1675,8 +1672,8 @@ static int mkv_write_tags(AVFormatContext *s) if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID)) continue; - ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID, - track->uid, NULL); + ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, NULL, + MATROSKA_ID_TAGTARGETS_ATTACHUID, track->uid); if (ret < 0) return ret; }