From patchwork Tue Sep 6 03:26:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 444 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp378032vsd; Mon, 5 Sep 2016 20:42:38 -0700 (PDT) X-Received: by 10.28.68.136 with SMTP id r130mr9048230wma.38.1473133358700; Mon, 05 Sep 2016 20:42:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v186si4773319wmb.1.2016.09.05.20.42.36; Mon, 05 Sep 2016 20:42:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04869689CF6; Tue, 6 Sep 2016 06:42:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93A6B689BCC for ; Tue, 6 Sep 2016 06:42:17 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id u131so3110689oif.3 for ; Mon, 05 Sep 2016 20:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=3a74SyFk/3zqqIJaYgFszGrGh/q9nkuLvqmkzyqBZYc=; b=IhW8avLv74pfSUVZz6JHr8c0fRbqXVmC9PpY90eQ8d1POtVI5rwOh70+sL96W9Z7b1 uqi6tSb+2QpNjh8GK/L/aaiz3hl3WQWpPmm9RCrqQmJAIDIX7lAAQzE0G0spRhypznKb nc6ovXFBpfYY1VD42MhN93AksdMQI2rvSEeHOK7IgReAXIZVdXSKa9E91kcQ+lWyzc/X zeGMGtakfi+W12HrMG1c1zITFg4ADAnW2r55m2QFx1eGThWo275IdOzQmTsCGQ5y1JB2 YsCBSdEKrTiC8UJBkUoVg7+TK0l+pemo3Mzmuyx2o0YXTS17fLr1fuhA/k29hQgmNLiH 6fig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3a74SyFk/3zqqIJaYgFszGrGh/q9nkuLvqmkzyqBZYc=; b=f/TgGCWsmJXjK3BpCUjocTFtAukkQ4UVO0nv0DGXS71FKnzMxtg5WZrMAL6UPbi6Mr atlZnzUj3GWWRywBj+SBkX0DzYA9yie3TNhXucJ3v2ahXQVsdP4S7b94KMtKsfUWY0OS 1my0Zq83Wo/cWYdWc+eSm1Coum2UgLPjeE7X62GS4eebnHb7L0La0GwpyjntDc++Lull Nx9pb8KBET8eCR/tiUQrdayg3iGGYQqv9zHxgP9NNvUHmEBe7XpFgpzIorJwBrX8Hbpj 4nFQfcD7yml7Ose8W7D3Ag4HM6Bgu2fLNvx03S+a/2lE2cnflVj4102LAV+CgvR6NSXe DwFw== X-Gm-Message-State: AE9vXwNfXakzInAOoNMkW2G9RPyjMPGqypAPR0XgNBA+F450IkiPTaFiE0SKJWoXB8hgrw== X-Received: by 10.202.72.194 with SMTP id v185mr5720255oia.201.1473132402455; Mon, 05 Sep 2016 20:26:42 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id u108sm2957073ota.25.2016.09.05.20.26.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Sep 2016 20:26:41 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Sep 2016 22:26:28 -0500 Message-Id: <20160906032628.71847-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160906032628.71847-1-rodger.combs@gmail.com> References: <20160906032628.71847-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavf/matroskaenc: use mkv_check_tag_name consistently; update test 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/matroskaenc.c | 10 +++++----- tests/fate/matroska.mak | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7deccaa..3eeb09b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1342,12 +1342,12 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme return 0; } -static int mkv_check_tag(AVDictionary *m) +static int mkv_check_tag(AVDictionary *m, unsigned int elementid) { AVDictionaryEntry *t = NULL; while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) - if (av_strcasecmp(t->key, "title") && av_strcasecmp(t->key, "stereo_mode")) + if (mkv_check_tag_name(t->key, elementid)) return 1; return 0; @@ -1361,7 +1361,7 @@ static int mkv_write_tags(AVFormatContext *s) ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL); - if (mkv_check_tag(s->metadata)) { + if (mkv_check_tag(s->metadata, 0)) { ret = mkv_write_tag(s, s->metadata, 0, 0, &tags); if (ret < 0) return ret; } @@ -1369,7 +1369,7 @@ static int mkv_write_tags(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; - if (!mkv_check_tag(st->metadata)) + if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID)) continue; ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tags); @@ -1398,7 +1398,7 @@ static int mkv_write_tags(AVFormatContext *s) for (i = 0; i < s->nb_chapters; i++) { AVChapter *ch = s->chapters[i]; - if (!mkv_check_tag(ch->metadata)) + if (!mkv_check_tag(ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) continue; ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID, ch->id + mkv->chapter_id_offset, &tags); diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 8cf1734..8e4a1e8 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,6 +4,6 @@ FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline -fate-matroska-remux: REF = 5ebcfaa8e3d534f8a800a58fd2b0aca6 +fate-matroska-remux: REF = f08b20b90f158a4de5a02a52c25596b9 FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)