From patchwork Thu Sep 7 02:06:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43630 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp320142pzh; Wed, 6 Sep 2023 19:07:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBXtp+Ov7lkAKtaTJN09BVExjVxj4z4G7Im3urawyNtPdBirF6pCtEOPBqbtdcqm636GDN X-Received: by 2002:a05:6402:274c:b0:52c:8e9b:6bcd with SMTP id z12-20020a056402274c00b0052c8e9b6bcdmr1969544edd.12.1694052435497; Wed, 06 Sep 2023 19:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694052435; cv=none; d=google.com; s=arc-20160816; b=qrcPATt5IxCfZy3oBmLiVcYof7uwm2PmC8NtC1j2RMjSZDXTEXbXg12m8khLjgPaPS GS3bPr2Z2SwOR6gTG4EEa0BqrPckIR1OHOy8pBF//E4gJPEMWQ1rmn3vl9V/DGImoJGo HDwf1qIQXaq1snT5/cmXimz7h0hT2ajbht5vhQNKXvipjUniweKmLDLiHomLtifyFGZP L4sjliOcHdG0OdYLz0mqULDux8/5aL5T2MgU1QamrNWpFKFUxozQ98YjaUV+wop4qsEY QsFqfm9VV6v3iSnYQTidjnKZ+6e4dmjlGwJcUIksYNN3vj9kFP8q6xafhF69HxLW9YCy yDHg== 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=xGAskkW6tOK3Tk5OMFNOMDCNuSmQdX6FndA8dnRLWQ8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kyr9cry7RbU08zyy1cWSFo7PHEJ6AM5fOtOQXhcmDGmQdcPbYPzZP1tGkeO9dMrLWV rmxtQkrnEVSjFGeOIXgplT6I4yY32J7+OFosnevo92bLYda8QScglMiMG0r45Qm468hb ljHqMjmpduPxAz3CppmYiKDVwTXH53IjzVEoKRApqYRuuYCCvy16ddNrLiITza1FktB/ M882Xh9CQYgAyod8V7QwXjaTbBs5/DBe64WC6NzFZRJzlj3fMkz1ZKZpOrcDBqfFRPe4 5hsa5JPUZh04KkiHliHgq9C9Kl/NUrPl05l7bHNtk7z/1Om1XRN7IzO4qamcMyJ/IZ+A CCFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=NccfVscB; 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 i22-20020a0564020f1600b0052cd122429bsi6472066eda.206.2023.09.06.19.07.13; Wed, 06 Sep 2023 19:07:15 -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=@gmail.com header.s=20221208 header.b=NccfVscB; 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 1333068C835; Thu, 7 Sep 2023 05:07:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70A7368C63A for ; Thu, 7 Sep 2023 05:07:03 +0300 (EEST) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3a7e68f4214so320685b6e.1 for ; Wed, 06 Sep 2023 19:07:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694052421; x=1694657221; 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=vUJ29PP37umX1wz0+fj10U0D0qcZf0hUlZkFFftLblM=; b=NccfVscBCaazgLaO4YAh9Qz5gvPpLKgGW6HhohRO+Gljqtsdey76CX1mIJnyWQ4vjJ kRKpgOgGHt/pBkmFr5mISGpcRm25/XsK1MHWrwnASpI4f8Yd1xg7zOwdV6anfmgYXCFj Kgx8E7s1dN7nk05zW9MQB356XsMYKXmRIQNthvpO2UVEOXgS1CjFYs7AXAcl7jOP2lWN UmaLtcr0/Fhen9qB3R7qRyg+FksoLyfYAm7n/5owv/Sg8OMWHCUkCyLtrfNv2zGYeybn I19WUWJaUL2AJW5XX32oV2WBE8wwuz65amripqLhn73F9hFMWIseO+inQ5R8PlufpFSt CArg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694052421; x=1694657221; 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=vUJ29PP37umX1wz0+fj10U0D0qcZf0hUlZkFFftLblM=; b=kIPAqtVLdCo61h3EkITEFl+UJWwgfxHo5U+LLWgT7AWMXHkMyFyNUATislcpnVys94 ZIwHbeazkxJrNafZnNmVFK1sKqbCEH3u5Y3KcIbs/8bAcW3weoDQ0qSX4ZxVTueOoJWG kIrFLSzmMY+37yY73eCXhHsrHJIj+Q05uonRyxPl55azzLljoiLYrARqsK4VAwcbJA1h A3aGkpPCS7SQaaIIOSf5IwN7XQoOKnEEVUNiwYTP1jCCvEFGsCFQYX6bv85yw5aCqwBS p1NhPqf/vwbvvRfiLxIEYps845WZwCX9Kh4k4Gj+f925/xEPjy2F2OT180YVuPkQPrEk jDxg== X-Gm-Message-State: AOJu0YwSHSsRrXantt7A0Xoaxzz3MAaeqM9pIEjlt8r5yEjLKCp4PIR0 0z6Gx/ex5qM+FU8CsnrbwT0KclvK4dY= X-Received: by 2002:a05:6808:d51:b0:3a8:4dfd:4f0b with SMTP id w17-20020a0568080d5100b003a84dfd4f0bmr23386312oik.19.1694052421285; Wed, 06 Sep 2023 19:07:01 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id w15-20020a056808090f00b003a9a35349b1sm5086134oih.24.2023.09.06.19.06.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 19:07:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2023 23:06:45 -0300 Message-ID: <20230907020645.37017-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/av1dec: export pixel format even if no hardware decoder is present 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: T+dr0rbCYvwR And remove the AVOID_PROBING flag, given it's the last av1 decoder to be tested either way. This fixes a regression introduced in 1652f2492f88434010053289d946dab6a57e4d58, where even if forcing the native av1 decoder, if another decoder was present, like libdav1d or libaom-av1, they'd be used for probing and some fate tests would have different results. Signed-off-by: James Almer --- libavcodec/av1dec.c | 8 ++++---- tests/fate/lavf-container.mak | 8 ++++---- tests/ref/fate/av1-annexb-demux | 2 +- tests/ref/lavf-fate/av1.mkv | 4 ++-- tests/ref/lavf-fate/av1.mp4 | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index ec8401f4e0..a1e08185a7 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -612,6 +612,9 @@ static int get_pixel_format(AVCodecContext *avctx) if (ret < 0) return ret; + s->pix_fmt = pix_fmt; + avctx->pix_fmt = ret; + /** * check if the HW accel is inited correctly. If not, return un-implemented. * Since now the av1 decoder doesn't support native decode, if it will be @@ -623,9 +626,6 @@ static int get_pixel_format(AVCodecContext *avctx) return AVERROR(ENOSYS); } - s->pix_fmt = pix_fmt; - avctx->pix_fmt = ret; - return 0; } @@ -1518,7 +1518,7 @@ const FFCodec ff_av1_decoder = { .init = av1_decode_init, .close = av1_decode_free, FF_CODEC_RECEIVE_FRAME_CB(av1_receive_frame), - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, + .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .flush = av1_decode_flush, .p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 0d4a224601..0081b45eea 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -70,9 +70,9 @@ fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1" FATE_AVCONV += $(FATE_LAVF_CONTAINER) fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER) -FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_PARSER MOV_MUXER) += av1.mp4 +FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_DECODER AV1_PARSER MOV_MUXER) += av1.mp4 +FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_DECODER AV1_PARSER MATROSKA_MUXER) += av1.mkv FATE_LAVF_CONTAINER_FATE-$(call ALLYES, EVC_DEMUXER EVC_PARSER MOV_MUXER) += evc.mp4 -FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_PARSER MATROSKA_MUXER) += av1.mkv FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER MOV_MUXER) += h264.mp4 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += vp8.ogg @@ -86,8 +86,8 @@ FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%) $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%) $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF) -fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" -fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" +fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy" +fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy" fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v copy" fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy" fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto" diff --git a/tests/ref/fate/av1-annexb-demux b/tests/ref/fate/av1-annexb-demux index 77e0e378ab..139a893ec1 100644 --- a/tests/ref/fate/av1-annexb-demux +++ b/tests/ref/fate/av1-annexb-demux @@ -3,7 +3,7 @@ #media_type 0: video #codec_id 0: av1 #dimensions 0: 300x300 -#sar 0: 1/1 +#sar 0: 0/1 0, 0, 0, 48000, 12691, 0xf0adcc79 0, 48000, 48000, 48000, 4975, 0x1742a45f, F=0x0 0, 96000, 96000, 48000, 928, 0x7408be1a, F=0x0 diff --git a/tests/ref/lavf-fate/av1.mkv b/tests/ref/lavf-fate/av1.mkv index 84924fe05c..e6db3a814a 100644 --- a/tests/ref/lavf-fate/av1.mkv +++ b/tests/ref/lavf-fate/av1.mkv @@ -1,3 +1,3 @@ -ba198efa114b4db3c9f772728f84978b *tests/data/lavf-fate/lavf.av1.mkv -55656 tests/data/lavf-fate/lavf.av1.mkv +d875b42964dd55c8cea2e2752379d327 *tests/data/lavf-fate/lavf.av1.mkv +55660 tests/data/lavf-fate/lavf.av1.mkv tests/data/lavf-fate/lavf.av1.mkv CRC=0x7c27cc15 diff --git a/tests/ref/lavf-fate/av1.mp4 b/tests/ref/lavf-fate/av1.mp4 index ef174589ba..53b0cbe637 100644 --- a/tests/ref/lavf-fate/av1.mp4 +++ b/tests/ref/lavf-fate/av1.mp4 @@ -1,3 +1,3 @@ -d6afef355cf1bcf1a71b9cfb98c32fba *tests/data/lavf-fate/lavf.av1.mp4 -55976 tests/data/lavf-fate/lavf.av1.mp4 +194cd796f3d28a890b516b2507f57180 *tests/data/lavf-fate/lavf.av1.mp4 +55960 tests/data/lavf-fate/lavf.av1.mp4 tests/data/lavf-fate/lavf.av1.mp4 CRC=0x7c27cc15