From patchwork Tue Jan 9 22:17:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp692206pzb; Tue, 9 Jan 2024 14:17:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IGY6JK8PiRgMZPKI9NGVaZV7lLu/7aTNrFhSM3IQ99VeKVIB7a2nbx4SieK8cqlRSMstuVo X-Received: by 2002:a05:6402:5d84:b0:558:322f:a13a with SMTP id if4-20020a0564025d8400b00558322fa13amr41096edb.85.1704838675799; Tue, 09 Jan 2024 14:17:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704838675; cv=none; d=google.com; s=arc-20160816; b=lvg+y7setJwCoJMpwpvlx0Ro2zsxMIGqtyyh0rsUt8/6GcufeYyIY8Qv879uR6qPj2 f8eUL7df1iTEyRkmvmA+jGRdwi0nA0KZGxKVpYMWt+zA6ZYx70RuA1hwAXnED8PD/T5y +XJav7I4NC5Dt1mM5Z+zRrnh1NHAf8vF75BXpDcqGpRY4Ih6OrcUvIWIAc5CYDyVIJSb rb8wdUzOxcgADQBjji9bSZXi7EvAspq9jjQr1gM2Awaz5nij/Xu5s/D4KJ6olQxki522 gIVApCM56Pmd/mJ86orjmtoPxYHJXCDiByhLqzEVqhvq/t8Soaxf4jX8q+MOjhdDJHeQ PAsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=tp78/AS8q7wU0P3kbyLYGpjdTLyMp5XuHyyIrntRR2k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jU/FmdTA18GC+BhVl41fQLwocITTQowj4Rr4kmG6ZA1oqGupAHiAaoCH+faQc3IasT TqVhzFG9mSlUsXWGa5DCpnNi4g2oxdDPc+BvU/PSG1Zv6jkYs01bXiPkERR4mmbb3wM8 QSDZDzlBHShC5LIVsFbQY5QXPkEv0h+UG/XLzXPpYE8hOmIbMjUxt4DYWhPVSnKufHno F3mir0WHWaaji/ZJn/u35UFmC+HchOPzjQd4Hm81eFc1Ikr+P9BUOwifh/Wh7Qkg7U2b 0PmUDgUIoeuncVapgInt1cTuQSF1WHxpUmBH0bFJpNPBax3eVA5a2zRCfGAny+D3IUaV iwhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=mioN9kdg; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c27-20020a50f61b000000b005532cbdb2a8si1096082edn.605.2024.01.09.14.17.55; Tue, 09 Jan 2024 14:17:55 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=mioN9kdg; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41ECD68C58B; Wed, 10 Jan 2024 00:17:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C2D068C58B for ; Wed, 10 Jan 2024 00:17:45 +0200 (EET) Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3bba50cd318so3772598b6e.0 for ; Tue, 09 Jan 2024 14:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704838663; x=1705443463; 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=cyQW5TvY/mvUw3Gy6HUtKI6cNJoE0YahqqRm2eRRvkY=; b=mioN9kdgf8127WiQWEbXeOFLwb1OjtXo0OGhb1KuMQGjvDtyqDiTveCmDZA3LX6Eka SaVuBfXopsN2y4U9cOSwQ47I2QaPyTAO6OSBAPC4Sb2Yy7AF5XWmbgOJ4Ptcl5GVGZdl ZbsXJelkE2qqER2RAq6obUvswcllk6uJHjNuO6Wz7QymFEEBONKQefhTK9ZYQZDVWx7O AQbGtq5k6QhPTR40sLsp3/U9+/UdxuO2RYpkny77UQ+/WZ7pV5mOMnljH/khw5TkT4JC gxZ+mAO/aBp+MQBJ9mU8PHWY5/HIXPpPxkWXyGTfoiRcgjiGXgzh9qEqdsasNTGIxUna /9dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704838663; x=1705443463; 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=cyQW5TvY/mvUw3Gy6HUtKI6cNJoE0YahqqRm2eRRvkY=; b=QHhN0Oie4t97e65AmrjifMKqUktjEu3BNCtTlv9zWngZYdn4Gtt17sPXxQedsFz62u hjRLcOfZMv5nnwjD0xsMjDghUGHXauMQX0MGpgFcly2YrCHs7wF4gDviz3YNx8+alszG 0d+7NmafJvLT17x9EImQJK2Xcp1PgS3c1NiYAF77lYKNbX78pPP/Lk5so0wNiJV2VLlZ 2hyavmqFcRYvgu5dBX4jwVifM95fI9u8WjZjs7sAMDl4TQoOcJMGOVrPrxFf0vrXfl+d mknR/AI75kW2e6R7sAD1/t9tu7zD+tmoGb1fTHYAf9AG2i//E/za6j39CXWSxlAvHxOw uFwQ== X-Gm-Message-State: AOJu0YwX6I+8Bk58h8sJcmhXPcolot+a9LsG+cG8olyf0LiDlinXpY4J PnicJ95gflpB1cCDOfL6kWEd6tjG2E8= X-Received: by 2002:a05:6808:14cf:b0:3bd:3fc4:eb17 with SMTP id f15-20020a05680814cf00b003bd3fc4eb17mr109943oiw.36.1704838662861; Tue, 09 Jan 2024 14:17:42 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id i9-20020a056a00004900b006d9b98a8ea4sm2141430pfk.159.2024.01.09.14.17.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 14:17:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jan 2024 19:17:41 -0300 Message-ID: <20240109221741.60485-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/av1dec: attempt to set SAR even if no hardware decoding is available 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Hh60Wr/G6S65 Should fix fate failures in avif tests when no external decoder is available. Signed-off-by: James Almer --- libavcodec/av1dec.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index da05a0f039..43b5aef687 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1227,7 +1227,7 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) av_log(avctx, AV_LOG_ERROR, "Failed to get pixel format.\n"); s->raw_seq = NULL; - goto end; + continue; } } @@ -1248,6 +1248,16 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) case AV1_OBU_FRAME: case AV1_OBU_FRAME_HEADER: if (!s->raw_seq) { + // Attempt to set dimensions in all cases + if (s->pix_fmt == AV_PIX_FMT_NONE) { + ret = update_context_with_frame_header(avctx, &obu->obu.frame.header); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to update context with frame header\n"); + return ret; + } + ret = AVERROR(ENOSYS); + goto end; + } av_log(avctx, AV_LOG_ERROR, "Missing Sequence Header.\n"); ret = AVERROR_INVALIDDATA; goto end;