From patchwork Mon May 21 14:18:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nik Johnson X-Patchwork-Id: 9036 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp344542jad; Mon, 21 May 2018 07:19:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZplWHH6ZlgqTTYr/UCbkjpynv9SU7a4+3XpiAqp9RTSSYqwgsjst/2RgFsRFWUPoqw4C21E X-Received: by 2002:adf:e9c3:: with SMTP id l3-v6mr16621045wrn.195.1526912395980; Mon, 21 May 2018 07:19:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526912395; cv=none; d=google.com; s=arc-20160816; b=n9lKiVQnbpurZ0mXvP/y0uEkgGNM4W7PRpgDnhaUIz74hebGlOdjJIIUvW0GSJyQuN KamobpkGReXfcFIE7oJKEYGuODXxWhboEiNljRDn118au/3/Lb0naulq2TxLKQJLEl39 MaYijP19G0QiMWS0HYZYDAXokNpttVrOUmX/6ILcmWBSD81CwYxL10bDCirBZB0OT4oN eRoAXG8/sjbaOpnjXkTcc3vjjtcojUbXSp922fBt7NOQ9ArDLi1yti/ncEys1VxIlida gkwC4VMnaMoOgafJKHxcOGrcE6ZbVPbaKR7ci1iap7IzEAnGidzeqNWm3CQqNM/jZtQq bJsw== 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=xeGzm9Hch22ICi4m5/iRAZLUrGA7qMEl9s2PGASfPmw=; b=VUQX8j0rPPdIQ2RoAts1VK+1WUnfQ7Tal/g1zekNnd1KCK4F3PDcFvIhNDS9OYpVez caiDcZc72jHoT5jncp4bNBxn0x8a0C+DTxLxfsdKayskRIiTEucd4FHwAWAGS8WHTS/w Nn0O2Oyuh6jtBFfk7Aade/afEsgq20B9l0bK0tl5xVXvkApG5U/ca684lzOZ2Aln+X+L u25RYYQD1ohGzXp4H7PQW0ruT+bzLZQAmkSubHJuXXcOocDtAJDIH7QGRnlfjlkHGp1+ dlxmHe2tZic5wLCQQs5yvD84uEtmfWcHduOdDVso9ISaE3JuUC7ZvFsapwjL/hG82gy8 6jmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nikjohnson.net header.s=fm2 header.b=WExaP2gc; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=WSKHPATY; 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 x124-v6si10193124wmx.216.2018.05.21.07.19.55; Mon, 21 May 2018 07:19:55 -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=WExaP2gc; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=WSKHPATY; 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 5CFE168A55C; Mon, 21 May 2018 17:19:13 +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 E5AE268A468 for ; Mon, 21 May 2018 17:19:06 +0300 (EEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 4DE7C2267A; Mon, 21 May 2018 10:19:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 21 May 2018 10:19:46 -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=m6Udeghx0XjP8UvZs66mfJJKDIWY0QnzhOSwVzMtK qw=; b=WExaP2gcMlsYp7rJ4wBRuh+A/oE6c20QaNSL7efzOnwqdO9N+SBYe0FFV 8uSos3hChAaEyAZefc7dDNGhBwkOoqH5sU+qUAko1X7XdHOvkP5YCK8Y75R1luCY i0Sp7UokGDTo0Ko3yFKJmQ1OClIZllfKkJyOITLyu5zZIDAKqE9VJZGo8rMy3Xb/ rJMc3tKgVhF4OtMnQRixuldjY6QsW1xVGOPwtpJtVk0uJljATSxjjAihO0uUr1nL V6LuXPVu2tXlPB+s3zPsOjdE2IGv1+TUWIU8jR+47vVO5v6hE0FsQ6gJ5vD7dWEI RtSTz/fb8c2IabKChwDYtMAeobO8Q== 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=m6Udeghx0XjP8UvZs 66mfJJKDIWY0QnzhOSwVzMtKqw=; b=WSKHPATY1PjRhiaEfjyQF3me6dqcTJ9DK TQzfFSBg7a/ieq+/VfdACaDOVjFHmiS4BjDYxnoR06SC1VQ8Amqra9Own4jZzf48 pf4dTy4Gi+9XKNezU3ZDYf3Ke4ynYLk4U2CkAhJXZxu4fnoG23SC1Q1/40A4yEHA ACgePGtGWfWkEi6GlMoI60g+G1tpSFYqzdOPSpXWWYTe9JYFraPJxb/lTu/m15mm CgF/LBzqsGuqUeIMJkgyx/Y+L7jsyPufL8QqSqwEE4hMWSJkAhfdti37bK1B+zJI nzWe0bfFJaBeZ0QdgqGpMdBuRZ5uchuG8y8wc6IP2viVMP97Uk/8Q== 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 BAC7FE4BB5; Mon, 21 May 2018 10:19:45 -0400 (EDT) From: Nik Johnson To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 May 2018 07:18:52 -0700 Message-Id: <20180521141853.6124-1-nik@nikjohnson.net> X-Mailer: git-send-email 2.17.0.windows.1 Subject: [FFmpeg-devel] [PATCH 1/2] 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 1975011741..5332d48eb1 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) {