From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 313E4499EA for ; Wed, 27 Mar 2024 00:12:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA97068D6AB; Wed, 27 Mar 2024 02:12:16 +0200 (EET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18B4968D5D5 for ; Wed, 27 Mar 2024 02:12:10 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1df01161b39so50124365ad.3 for ; Tue, 26 Mar 2024 17:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711498328; x=1712103128; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=q2dz8dhkmXp/uSYtseS8gFWvo00LIAyCd5EBcWUHWp4=; b=f0EmWIk14CSIvQxJyuG0lUUXX+P6agb11IchwFVBVCHhQYFTdVK3WWxYAFFoqxd5ia +L9XoiYpHN3GCxRcLWzsmkJD+uhfO0QQFgFFx3UTeHyLXEDr0jlPkW9OGTz6WRWs9sTq ZBJfsrUCa60Q7JdnrNKsG8SXgTozPwtuf2/JJLMEtZpBBk7bOX95A25/vJ6VRQXbFjcV 13Dz9JsQLaKuZKjL/LY6T4E7fapc6KmiyRMRmU6irOSH1u6hoG9E2eeZtjrcnGzeO65B KT3R75SryS+QsdgRqa1HpXYTrVWzcUg65HRyoUa5amkmNgC6D+vLogRokGiTzqFe+2TN O+FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711498328; x=1712103128; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q2dz8dhkmXp/uSYtseS8gFWvo00LIAyCd5EBcWUHWp4=; b=id/adgJkjwEAtWhmLeUipbQKy5hogoOJ1iG9lfYQWlQ+lNikXVGtaUkz0wHKTZSfCi yBxSdKqsqdtiz9x8A9GV5zxuelbQJrS/gk8ETtzS5Yx6Hv2zbKWTvQ6gKh5LYyDVDjZp Jd2/6cJkc2KyLmpJwTjQc0MfcGnFK7/MdbGYvbP6Dc35pBcats38t2hY0QFXfWNS1lPm CtORtbKjCZjkJafx0V4syZhJ1sOCV5wIVxOx1gYFFLgSQ0/2Y0cHSEqJNhiHsfKw5Vtk SAmtUaPTJGV3kXniS+sFY9+SGOIc5rlYwx8kRLH/Tfwgy00LuiBSnkaAyK1BqKnI77BC 4RVw== X-Gm-Message-State: AOJu0YyyEMFiynBqKq2bvpyRTQmB9FNEyS0eNesj0rg+sHyu8XMVQrvA pI9j/jOSOGw/QeXXR57GMXR3pDbQZMxNNiaQTzYe4PWosE20Zc6I98zJDyfr X-Google-Smtp-Source: AGHT+IF/IPatimSY8FtauUQZij3w+msqdF+4yPtaSm9PBO9mZpOYDB+B8z2Gw5J9cKM4jfI/yR3Z0g== X-Received: by 2002:a17:902:db0d:b0:1e0:9da6:1763 with SMTP id m13-20020a170902db0d00b001e09da61763mr1448732plx.4.1711498327419; Tue, 26 Mar 2024 17:12:07 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s23-20020a170902a51700b001e0310bb84fsm7500842plq.289.2024.03.26.17.12.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 17:12:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Mar 2024 21:11:54 -0300 Message-ID: <20240327001154.2239-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: don't abort on duplicate Mastering Display Metadata boxes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The VP9 spec defines a SmDm box for this information, and the ISOBMFF spec defines a mdvc one. If both are present, just ignore one of them. This is in line with clli and CoLL boxes. Fixes ticket #10711. Signed-off-by: James Almer --- libavformat/mov.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e7aa8d1833..5463f36770 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6140,8 +6140,10 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_WARNING, "Unsupported Mastering Display Metadata box version %d\n", version); return 0; } - if (sc->mastering) - return AVERROR_INVALIDDATA; + if (sc->mastering) { + av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate Mastering Display Metadata\n"); + return 0; + } avio_skip(pb, 3); /* flags */ @@ -6178,11 +6180,16 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data; - if (atom.size < 24 || sc->mastering) { + if (atom.size < 24) { av_log(c->fc, AV_LOG_ERROR, "Invalid Mastering Display Color Volume box\n"); return AVERROR_INVALIDDATA; } + if (sc->mastering) { + av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate Mastering Display Color Volume\n"); + return 0; + } + sc->mastering = av_mastering_display_metadata_alloc(); if (!sc->mastering) return AVERROR(ENOMEM); -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".