From patchwork Thu Sep 7 17:55:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43643 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp769381pzh; Thu, 7 Sep 2023 10:55:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYif83KBIjwXUojaRmYB1MTwj0OQmjxE5MKjHTthrum8BSyuVsM/aAlfvOhUD3gCX/4vKT X-Received: by 2002:ac2:5f99:0:b0:4ff:a23b:de27 with SMTP id r25-20020ac25f99000000b004ffa23bde27mr102946lfe.50.1694109347234; Thu, 07 Sep 2023 10:55:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694109347; cv=none; d=google.com; s=arc-20160816; b=PD3UuL1CI2TNGuZmk9wQvapI+ymV4m6Yof/Xw/HVtwsYFrpN1a1yRYB3xb9OQ0kXCX MyCOhkIU2biEmaurU5LPpYHkqFD1oC9ByHEKkWlBayiJ/6Pz8n2XRVMTrHgjk9j+W0Gl jAWkWLUw3MlyM/TrycU5PZcCtKb2pUqht4i0XJWqchE1QZf3tmNE6zWZ7TwOFzXKGwLi 8Plie3qCByarPbab3Y9UCit9Y6j//SMnca927Es+K0x/fMoHYW8ChiL3IFVVIAKWryiI JzZoLcGnT49+5vvzW897QBq2fP9KMOp2QfR3vuDt3Vzw8i8jBfmp73ophB3/0d+ZhIc1 9Pow== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=AcVrgov8SokFUhgmT07ZgoRjF1n5DppVjRX4AGh66gM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=EZJsRq+C6P8pckjU5IP7h7WN5w8xSUKpfVaLIbiMhZ1X03ok7haeqEtT0fZ6BW8fgF olNriq3A13p4Vk5FLKMV2TnbY54nU7AgfjTl5BvaYwpiMvMeWixAYjGBXvXA3nubC3sQ 7mIa1TScTJfBADwka/1MmxwWvsvFHndL+/4CJQQpTXSQaf9LhvmMWpo5CT3vUcN/83Fx IaunH4/KvGv3+flmvGY0JOOjk8ojtUQz1zFkAlKFf2LJjfIEKZxLwtYkCjpAHFkYipbi 59J6lbSx90L3MXjmZ7gw/CaOljNKGqu4lUMK5uzsm7qVsMPOh/73ZYtr7hmrw2pGNYlY axWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=F9hecLeS; 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 s1-20020aa7c541000000b0052a1882b560si58810edr.648.2023.09.07.10.55.46; Thu, 07 Sep 2023 10:55:47 -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=F9hecLeS; 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 3A69C68C823; Thu, 7 Sep 2023 20:55:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F0CC68C7B8 for ; Thu, 7 Sep 2023 20:55:38 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-1d544a4a2f2so785553fac.3 for ; Thu, 07 Sep 2023 10:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694109336; x=1694714136; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RrgRRXx7A/Mn1/suPjQa3GNQ0Dk3DlntMbOtqNsB4wg=; b=F9hecLeSDbDuOcpa9MK3sX90NDrnzvtbcwfZ1Eouo6LYocR1Fy7z8V2e86RZDGO5Ae Dy2vWAgix4jlljppI9d+BfPS5LRP6wsgu/w7YwQ/M6cZXOdAooloZnJPLeRegdw9gknh kIUIHBdoYoU+mpKFt6z0vuvqHtBQzR5EjDFTrp1D9TWLx/MrmCI5YnE374ZwcaqZAoaD auGWp7pzaZLLhTGGK8uJ/7QL0i5MX9PcIPvJYieyrHtwP7caggcjXENxtoYEqTyYhH25 jCtBaq7tfs07HD1VQ1RbHJIY9h8oMK0AtSqPJ6msrdFVukdUp4EJLx7a1KNruUo1zGtc 0RDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694109336; x=1694714136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RrgRRXx7A/Mn1/suPjQa3GNQ0Dk3DlntMbOtqNsB4wg=; b=l4SE6hma0SbJwa65+i+pj1P+PhifttcMyCbimZ07jP23oWhlaDnUB7+QuwD5fcyhJF rwjqJDudI8OE7oFnbv7umGR3jAXPcy5cX8TB2RKD6w8OAFwlyUfIE0sa8a11KSM6wVYn TVekrN+vug6Of8vLmefE3LacWCJL8KKMUgEsswnyO4v+9Fxby+o3vUnkCzmyJ8d5iSW9 cj4JtRA0+AmfWi5IA8vNTRfygKfQZlhPFsW0hr/n4vgpTdgmbnFkbTgQg65MtJKqNUfx ClftMSWdHRx5yJO2Dr3ZcSFd/er7yiJ2ok5otoNeT4odlnE3VMjzR0pAURQnP7/vvlkA dImQ== X-Gm-Message-State: AOJu0Yz6PDNo/SYuzTTP28cwBjgF699X3sGNZDuIJV8o234trvV8etPb oxL3Pa7Z1DpFF7dAeie3uV+PWQ9jWAA= X-Received: by 2002:a05:6871:294:b0:1be:ffae:29a4 with SMTP id i20-20020a056871029400b001beffae29a4mr319463oae.26.1694109335996; Thu, 07 Sep 2023 10:55:35 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id u3-20020a05687004c300b001b0550b2affsm53530oam.10.2023.09.07.10.55.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 10:55:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 14:55:25 -0300 Message-ID: <20230907175525.939-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907020645.37017-1-jamrial@gmail.com> References: <20230907020645.37017-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: eoNj4SL8Lbgt 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 | 50 ++++++++++++++++++++------------- 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, 39 insertions(+), 29 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index ec8401f4e0..3766290c0f 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -440,20 +440,11 @@ static int get_tiles_info(AVCodecContext *avctx, const AV1RawTileGroup *tile_gro } -static int get_pixel_format(AVCodecContext *avctx) +static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, + const AV1RawSequenceHeader *seq) { - AV1DecContext *s = avctx->priv_data; - const AV1RawSequenceHeader *seq = s->raw_seq; - uint8_t bit_depth; - int ret; enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE; -#define HWACCEL_MAX (CONFIG_AV1_DXVA2_HWACCEL + \ - CONFIG_AV1_D3D11VA_HWACCEL * 2 + \ - CONFIG_AV1_NVDEC_HWACCEL + \ - CONFIG_AV1_VAAPI_HWACCEL + \ - CONFIG_AV1_VDPAU_HWACCEL + \ - CONFIG_AV1_VULKAN_HWACCEL) - enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts; + uint8_t bit_depth; if (seq->seq_profile == 2 && seq->color_config.high_bitdepth) bit_depth = seq->color_config.twelve_bit ? 12 : 10; @@ -505,15 +496,29 @@ static int get_pixel_format(AVCodecContext *avctx) pix_fmt = AV_PIX_FMT_GRAY10; else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_GRAY12; - else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } - av_log(avctx, AV_LOG_DEBUG, "AV1 decode get format: %s.\n", - av_get_pix_fmt_name(pix_fmt)); + return pix_fmt; +} - if (pix_fmt == AV_PIX_FMT_NONE) +static int get_pixel_format(AVCodecContext *avctx) +{ + AV1DecContext *s = avctx->priv_data; + const AV1RawSequenceHeader *seq = s->raw_seq; + int ret; + enum AVPixelFormat pix_fmt = get_sw_pixel_format(avctx, seq); +#define HWACCEL_MAX (CONFIG_AV1_DXVA2_HWACCEL + \ + CONFIG_AV1_D3D11VA_HWACCEL * 2 + \ + CONFIG_AV1_NVDEC_HWACCEL + \ + CONFIG_AV1_VAAPI_HWACCEL + \ + CONFIG_AV1_VDPAU_HWACCEL + \ + CONFIG_AV1_VULKAN_HWACCEL) + enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts; + + if (pix_fmt == AV_PIX_FMT_NONE) { + av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); return -1; + } switch (pix_fmt) { case AV_PIX_FMT_YUV420P: @@ -605,13 +610,14 @@ static int get_pixel_format(AVCodecContext *avctx) break; } - *fmtp++ = pix_fmt; *fmtp = AV_PIX_FMT_NONE; ret = ff_thread_get_format(avctx, pix_fmts); if (ret < 0) return ret; + 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 @@ -624,7 +630,9 @@ static int get_pixel_format(AVCodecContext *avctx) } s->pix_fmt = pix_fmt; - avctx->pix_fmt = ret; + + av_log(avctx, AV_LOG_DEBUG, "AV1 decode get format: %s.\n", + av_get_pix_fmt_name(pix_fmt)); return 0; } @@ -865,6 +873,8 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) goto end; } + avctx->pix_fmt = get_sw_pixel_format(avctx, seq); + end: ff_cbs_fragment_reset(&s->current_obu); } @@ -1518,7 +1528,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