From patchwork Sun Jul 28 10:25:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp675558vqi; Sun, 28 Jul 2024 07:41:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUce2kEIwDG0/nkiCjJvjovEqbciUYru6PDz7t+GDRmNXH/T3RZ+6VwFtR8IUy4WzDMe0u8AZYiD33fmUjYzNVZ4XxlRY/YutJxDw== X-Google-Smtp-Source: AGHT+IG1OSGq5eXVutcqMy9AuRMdORcSU1q8X76JhLtFOMLo84RG3RTeEW9lB6jklyuGoPvHjuXo X-Received: by 2002:a2e:95d0:0:b0:2ef:2dac:9076 with SMTP id 38308e7fff4ca-2f12ecd2742mr32840051fa.11.1722177716512; Sun, 28 Jul 2024 07:41:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722177716; cv=none; d=google.com; s=arc-20160816; b=gD1uxRxySLYCLvSwi0cazx9v/XyK8HpVL8lh2a5cyMbjMLRlfB9ZjLeKvG2aj7uuej 4Vjm4W3za8xKfPwtJ6K0snFy3EpdNkvsfCRNzDbe+NEVIQgopE3o7JcdojZSuSIS+oei QlOtGabciQ2zszgQ9GNroaHPbmt2JdUf48Dz1sMZU5mECIqzjUOXA2IT8wo8JasCz/j7 Nk471nJCHglBqgnjkaaQYGyQFxwr2ZoveCeyzSgkgPQSHBrQLUeK4SdeeyewNYBgb4/n PQf9sOkh+biPATJkbyOzSKX6ddYCZzUkwjaSWvfupaK6tOMRNdCqGuhZaHMFn6/Yb1xq SvJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=a6KsZO3GsWlybXqwCIqDevQuql93R0UG3EuBUDzAxYQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=FY1gZvk7RjcnIOpA9pLiDMvLjTQCNXIEm7lcPzjza6pPCTyKq44hYzvIpzWjEXgfkf 14ELpXRPUs5JdlFCGv+svs4CWnQlP+h5Cn0LPB/AkyQu+I0yYJkufE+CR3FSrlhEIZfb iZFYNKl41zq8HTfdFffTVz+P3y0OLcExSWj0rk60ioVxWWqI08kyE7k8DR6ilKTWf2Jp 184Wb4LLGc5wH5MqFZxqWo01zOPsMld09C+AIH1HnO975SaX8MDNrqOcXICCH0hI/BIh ebYn5I6eEBSHUJPv1ITDJQZszMVe9rqVVWBeeD1XQGxdS+y+qaOSBulXsYBlM03NqreT UXww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=n2Adn90a; 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 38308e7fff4ca-2f03d192cfesi19076611fa.625.2024.07.28.07.41.56; Sun, 28 Jul 2024 07:41:56 -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=@haasn.xyz header.s=mail header.b=n2Adn90a; 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 C057A68D909; Sun, 28 Jul 2024 13:25:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1A8468D80D for ; Sun, 28 Jul 2024 13:25:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162339; bh=+GIoX+fWQwm7L3zDgCrxpJTaapR5hXU9EXimhiSxR+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2Adn90arlU6E30wU3XhpH6g4xcjJffe/43kHLlwsmHCfvsr44a2Hwpau6rWrk254 XRA2utf9wT1ROUmBrbfABC+bX4Psh6RnOS1NITjHpE6nz74GL/wI/Wq4d31h5MTDg0 qVzKKr3GpmgQdm7g6XtopNalxE2tVCtsjVRPuyCM= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id CB06547043; Sun, 28 Jul 2024 12:25:39 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:26 +0200 Message-ID: <20240728102527.17991-21-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240728102527.17991-1-ffmpeg@haasn.xyz> References: <20240728102527.17991-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/22] avcodec/libsvtav1: raise strictness of missing DV error 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: y1Y4GCKSh5+X From: Niklas Haas While this is technically a spec violation, the result is still decodable (and will look perfectly fine to clients ignoring Dolby Vision metadata). It will also only happen in garbage in, garbage out scenarios. --- libavcodec/libsvtav1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index e7b12fb488..4c91750fbe 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -551,10 +551,10 @@ static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame) } else if (svt_enc->dovi.cfg.dv_profile) { av_log(avctx, AV_LOG_ERROR, "Dolby Vision enabled, but received frame " "without AV_FRAME_DATA_DOVI_METADATA\n"); - return AVERROR_INVALIDDATA; + if (avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) + return AVERROR_INVALIDDATA; } - svt_ret = svt_av1_enc_send_picture(svt_enc->svt_handle, headerPtr); if (svt_ret != EB_ErrorNone) return svt_print_error(avctx, svt_ret, "Error sending a frame to encoder");