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 1104C4A36A for ; Wed, 27 Mar 2024 00:16:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55E3F68D6AB; Wed, 27 Mar 2024 02:16:54 +0200 (EET) Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D93E68D6A4 for ; Wed, 27 Mar 2024 02:16:48 +0200 (EET) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6e69a9c0eaeso3601541a34.3 for ; Tue, 26 Mar 2024 17:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711498605; x=1712103405; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=u3e2RcpEutI+5oBOzGAkRBmKVfqdejewOK5S9fGthhg=; b=P3ihysXcGRZHMaTJ0bDvJWl9ZKRniveEmWbl60GrpCl4bATyjxH/9mdBWyI2CUdIsM 8aGt96DBLyOx8/iPxNNSByR3fD4lFVnLuEEe+BiYJXi/ORdT+u4VLhXGH6SUhBCq+jw2 8ZfvqrUuo8O/dbha4Ug4M5B0DALSjZi9jh/53Ir7f/oKaxOgDhGsRoFKJM33DmY2LrqF KLBMjaLj9gpK94JYVmeugE6xDSXQqPQznuWu1L48RZqEqNg/HnzyNzbRDTCOdksAsBwe G95N7JcZlGOuo82JDlkw2F8WuDggHtGD3OlmJ0hTsZqsTNDYr8KfcUxcY8opOXWrRMCa aaWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711498605; x=1712103405; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u3e2RcpEutI+5oBOzGAkRBmKVfqdejewOK5S9fGthhg=; b=F6/XT5JhoVdJXKuupYov+Wv3CAsQ1mFDDEtkWyAaB5ywUVWQzDUyaKo/NzpcU2X5B1 ZmGlXBVcz0YmPSK5KXUdVLOiRdokp6VR5P+GXZAlI9ZCqSppssWK7klaWB2wi2kArzfF M/m7oWlAvHWH01hc7j+qTmbOQqG5LTV2TLCz+y7iamBioyKQTHaJHqWfzFPGOAzP3LX2 EEC750Hq5t3Ecbx7uBBsW+ACb8ZYTQaIZDnmq+kSJRc7vlfLhNIXJRbGZrDHFF0ChiaC M6F7Q44B6sAcuVw7Kjm8Oyq3tNhWkZkJ9nyGriAevTy0dZ7Vb84zqO7WHPi0j95yEwSC vRnw== X-Gm-Message-State: AOJu0Yxwikk1kQfRJQgqFwQ87S0FKiqV+WJNOgaRynb3Wth+444Wfe74 ntm+qRkMGh0prEHqXjXp9bu2NOkBEU0P9sStvpEk4okGAPJH9xkdd9GNZKLZ X-Google-Smtp-Source: AGHT+IFTBlL053w7CfqIoNW4042/sgWx1DwECUUue2QiPGNJyriOipPa0Q/DNTSbhYPhNvb+bDD7tg== X-Received: by 2002:a05:6870:3325:b0:21f:dfb9:c150 with SMTP id x37-20020a056870332500b0021fdfb9c150mr13725350oae.54.1711498605383; Tue, 26 Mar 2024 17:16:45 -0700 (PDT) Received: from [192.168.0.15] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id fb29-20020a056a002d9d00b006eac44e402csm791572pfb.23.2024.03.26.17.16.44 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Mar 2024 17:16:44 -0700 (PDT) Message-ID: <8dad9db1-6b77-4a3b-8918-fae08577adbe@gmail.com> Date: Tue, 26 Mar 2024 21:16:44 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240327001154.2239-1-jamrial@gmail.com> Content-Language: en-US From: James Almer In-Reply-To: Subject: Re: [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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/26/2024 9:13 PM, Andreas Rheinhardt wrote: > James Almer: >> 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"); > > If this is expected (and maybe even encouraged/required by some spec), > then why is this a warning? I don't know if it's expected. I'd expect VP9 streams would not come with mdvc and CoLL boxes at all, but apparently Youtube ones now do (Guess they are phasing out webm-dash and so now VP9 is served on mp4). I just copied the existing behavior from clli and CoLL. > >> + 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); > > _______________________________________________ > 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". _______________________________________________ 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".