From patchwork Tue May 29 19:45:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nik Johnson X-Patchwork-Id: 9154 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp3479781jad; Tue, 29 May 2018 12:45:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLCksRP+X/aQFVc9WqELLaRhfr7irOrwSBpv2oxpqAIMtkaqPN1dwahppzi/cf1W+QcwAwP X-Received: by 2002:a1c:ec1:: with SMTP id 184-v6mr184862wmo.84.1527623149764; Tue, 29 May 2018 12:45:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527623149; cv=none; d=google.com; s=arc-20160816; b=GW2lfLd1vfUNT6GhUm6WPOKJ0/7ZaNERcIVouGOARPwPKCMoXKfvuCYnXHuoJ3erot utxD6EAh0RU6GhSasRSNB8RDfmcIPiklOA6K4yBWjNE52uWM683+nUZuHRKFO3lCe8EN 9gUe1ffuraLivNysoJD3foZDe2l1oEcc5K9c4EoSg4/JBnWzWqdzcjpIBNR0MKYo0DfN GVsFlo5s9ckLAjhFxUbQbX8Uu3pkmrjvDbLyyTgH49t1g8Akt1EISudJ17IZyikWOaqt 3Umu/DDi6aLygFCMULYhEjJoYWgvRnRwPhRvi5MmmDi+MM9pQmNKS5txDLkMf4DlkrsN KvBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :dkim-signature:delivered-to:arc-authentication-results; bh=z/Cana5VS/T9UWAsJ4WYAy74AIk3Y/nvvE1hMNGkRUU=; b=e5vIEib95c+SihkEPQvs8N9GOkbBPst3daTDTKaED7VMqvz02u8Gd4SZjtH1ezPOBo 9uH7QyZ9TE571rbpF9BhRSGYeyq44LNsK0z7di7iHfcfR93amgiBIz7PvvpPeAnCIXgg 0BPGSLOd3o0ZDwfclCpgxiM0YQpunEdO3eL+MnuVIBeY7b1J4NhBxBajwhfw8rngHBVF IlZzoRu2qkRV67B2eLhoOCu80IUfFS/6Ke4IgYDOQz7yJFbU3rMh4RxBFhOFCedtRpjn /RZTLp9VhCOZeZrQnlxxjPODhECe3vge5zPXcns0dQvLtrNOkxX2mc/X815sTiZtLFub LSLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nikjohnson.net header.s=fm2 header.b=tWRVeVOE; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=fWtEuAcZ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v17-v6si14543421wrf.43.2018.05.29.12.45.49; Tue, 29 May 2018 12:45:49 -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=@nikjohnson.net header.s=fm2 header.b=tWRVeVOE; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=fWtEuAcZ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 385CA68A389; Tue, 29 May 2018 22:44:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6371768A204 for ; Tue, 29 May 2018 22:44:37 +0300 (EEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E218A21D0E; Tue, 29 May 2018 15:45:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 29 May 2018 15:45:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikjohnson.net; h=cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=N1MDc4qiUqn+sBEQgnkuzOhvBwKDlnlPxv6s0Dd8r Lk=; b=tWRVeVOEon7WU1qiMqH0ADh62uxsg+1ABZABGILx8sqLgj9oA0ztQa2BE Tnf8NlQftGe8rORMPflo7YtH6FnbxyFkirmZifoP3Ndp/fBmcFv1MXFa0MGXhWb8 2g8V3EQyLQJ6XR59wWFjzRm549KbQXMnVl8jsm7dHXFPrzKosKqG9ItyYTDomLgM 1onlykMjMtuN/ft1CvqBXuiolKTf7xRD3qyVjM+6gxKpchE9M/lmIlmA5FptawUM 6LmdKxLnaCzpVsEbrxrGwDistd3budLqSmJrLwM/N0H9SgrEubZE6StSWux2sl5U Zntd5W7b45yeC7/mGIyxg3JopHJpA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=N1MDc4qiUqn+sBEQg nkuzOhvBwKDlnlPxv6s0Dd8rLk=; b=fWtEuAcZPNIU5KOaWplT35Ks4TziA0BSM Md4YS3+AQAVhnox/8Xt2hjSJvVNrCYYWZCgMVJKApJzO3sBVUrocilJLuGbX849L lxrUAWP/j1UUeM1MYslWUKQCyJkn7VlTp8hDhzuXMcJIrA938uQuSrumVwkopjy9 2lpgeRaH2Toj8z70gx2N/7TyzpjzZcItplFHa1qdi7C5oEHX1nYlB9chBame2FYf JLnY8WYfmLk3rvIgObd61j69RUZNGNtBZJrrEqy2GYRBOlUiBEAiWPjpfgFM+Rnm jnAAQE8GMl92Ll2NDmbiJDzScj/+5oFjy7jgHUGOP1wq8U9sbIBYQ== X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Sender: Received: from localhost.localdomain (adsl-99-73-32-57.dsl.okcyok.sbcglobal.net [99.73.32.57]) by mail.messagingengine.com (Postfix) with ESMTPA id 24BCEE4394; Tue, 29 May 2018 15:45:18 -0400 (EDT) From: Nik Johnson To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 May 2018 12:45:00 -0700 Message-Id: <20180529194502.39608-1-nik@nikjohnson.net> X-Mailer: git-send-email 2.17.0.windows.1 Subject: [FFmpeg-devel] [PATCH v3 1/3] libavformat/mov: treat udta atoms within trak atoms as stream metadata 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: Nik Johnson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some muxers produce mp4s with a udta (user data) atom nested within a trak atom. The nested udta atoms typically contain stream information such as the title. ffmpeg should treat nested udta atoms as applicable to the stream instead of globally. Signed-off-by: Nik Johnson --- libavformat/mov.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f2a540ad50..b434802207 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -306,6 +306,8 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) int (*parse)(MOVContext*, AVIOContext*, unsigned, const char*) = NULL; int raw = 0; int num = 0; + AVStream *st; + AVDictionary **metadata; switch (atom.type) { case MKTAG( '@','P','R','M'): key = "premiere_version"; raw = 1; break; @@ -514,12 +516,23 @@ retry: } str[str_size] = 0; } - c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; - av_dict_set(&c->fc->metadata, key, str, 0); + + // A udta atom may occur inside a trak atom when specifying trak + // specific user data. For example, some muxers define a trak name. + if (c->fc->nb_streams > 0 && c->trak_index != -1) { + st = c->fc->streams[c->fc->nb_streams-1]; + st->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; + metadata = &st->metadata; + } else { + c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; + metadata = &c->fc->metadata; + } + av_dict_set(metadata, key, str, 0); if (*language && strcmp(language, "und")) { snprintf(key2, sizeof(key2), "%s-%s", key, language); - av_dict_set(&c->fc->metadata, key2, str, 0); + av_dict_set(metadata, key2, str, 0); } + if (!strcmp(key, "encoder")) { int major, minor, micro; if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, µ) == 3) {