From patchwork Fri Sep 8 00:49:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43648 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp173830pzb; Thu, 7 Sep 2023 17:49:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWLGGmD3MQ/fGrw2ebXMaAUw+YGdwzltJllKz7V7omRvIZTL8JIoCMN+mXmn4A82CSvLRs X-Received: by 2002:aa7:cb52:0:b0:52a:46a7:4597 with SMTP id w18-20020aa7cb52000000b0052a46a74597mr565483edt.33.1694134174004; Thu, 07 Sep 2023 17:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694134173; cv=none; d=google.com; s=arc-20160816; b=S/eN3vhA3P1U82+g60C4FaEspNzgX9HQ+yWrItu0tsaYgARY4Yk+kVTi3j1qE3v9Ig 7P1mp7UisZrCe6ylliN71WTHXRS8lqG3ScUjMd7VSvreH/m8Mbpps0Q1AdHsFxFqJcIP hqgL0cDTozXRYd1Dv1iYZbJ6Yq9j6zXGSLEK/RBlL15+Y3YhNo2KILyTR5RhAM/KWEjv n2NEwSYfAE7wKsSlzcRfs4sMP/0hxmT2hrpjPrBRS5IB7pcrhTbASz5ansfeMrWBSW63 gC7jQjw30ZCH7McVegAnuReoGn1n5nrvB5RQYxmY63gid39Kt/l1SD98e7wKoI6ZBmrQ dgug== 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=NNAvXYAdXWJziSOvwcnX77yeAyIy7PNphlD1JLRcosA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xtSYAc72FocNfao2LbXrR0OOtoS6udzGi1YcnDB+vl2D0z/pSbpr0GxnZN5Y50gFuS CafUU2QfXmtx8K6Ywg2FaeM8jJWJeC1+JZZjVogXwAz3zjEbj6D3pHRv7lfXenPc+T7p OBEOQ18T0iIhffR+LlEixJdykquXh56gPqIXRKXPIPpEzg6Z2wqDhQmYfh456X0kEshx eLRu/SqOKVvGKJQBXUF9lJs4R1iVwBummn0/xDkZsNo4q8BhdIRPPDf9Il7xLsuLJxHB hBjO6lI6jDLb+8NCcMqj6WsXnZX1JL2WhO19vg5Uzl7mxU9Vd764OzHnXU+iRYTJL0PW wCXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=j7ZcYfEz; 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 n15-20020a05640206cf00b00529197b9a82si487326edy.673.2023.09.07.17.49.33; Thu, 07 Sep 2023 17:49:33 -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=j7ZcYfEz; 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 6894A68C883; Fri, 8 Sep 2023 03:49:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 539D068C751 for ; Fri, 8 Sep 2023 03:49:22 +0300 (EEST) Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6bd066b0fd4so1125275a34.2 for ; Thu, 07 Sep 2023 17:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694134160; x=1694738960; 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=blQNKTGFHTyxiWLh/X8TXmb+zChHhbx9mqaUaRPKVRk=; b=j7ZcYfEz1NBfcuNHKgbZQ++XTfp9skLPfCtjhL4qihzBHQuQrIAd+bKV6ttIoht9za iyJmRxnqRo/taFu29H3hmnhckVgXB3Zm2pfd0cVJpfWNVYicCXfQ/3If46GopSQy0HvV /jKLn7NXTQsD3zEbdGUR1EzziesSq6Jjh/kYyVRfm7N5VBU4H0juJBaL0Bb5GRWxXv+5 Z56on4Cj39d9oq06nhMzTiJNl3Ps5WvuzB1U0BoW+3t5WKFp+RxAbGksTQB1Zl9cJ2G+ AzKs6RpQ7Gadtuh1nD8HTHP5xkwO4npYKFOuKbb4hAHlqKAe1I1VVrW33SlczrO02csq K2vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694134160; x=1694738960; 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=blQNKTGFHTyxiWLh/X8TXmb+zChHhbx9mqaUaRPKVRk=; b=aDHJMBFXmMNxOa6JBoAv/sD9rTAFV81YDDmV3uSRGTrfi1NwJFNYjDKTPwff/3p3tI zPo7OqSh52Z/kf3xFmuhL49b14+6XWkQccRRGOZCR736v61xQrJ130Lk9l5xFDmzGZvS aLJQvlnSSK6rlXuEZHkzsY6hvijP08oL2FSCoTP+5fguKlY+xpCtb5/aIEMNL9DKkRh7 HUlQUtT+2hrByw5hXMs/3F2tl+Ps7/xmmqa0DQooqQs3SFtWi1/Cq9wdAleA5QmTwF3l 9YHvS3XEfiKCd+SDwY0QJvK6yPCwvZ2lpqjem9djA6tkv4zv1dtvGTpLlyM7STaVDufH MLSg== X-Gm-Message-State: AOJu0YyN6MTS14dtOU+vbRXcdxtGzkm4/IKyoC5ssheXvSrNNOiW6U/w mVlw5rf7Soy3kRWI1wQIQEYDcxWEiII= X-Received: by 2002:a9d:7515:0:b0:6bc:f328:696e with SMTP id r21-20020a9d7515000000b006bcf328696emr914296otk.0.1694134159960; Thu, 07 Sep 2023 17:49:19 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q19-20020a05683033d300b006b94a14b52asm258314ott.9.2023.09.07.17.49.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 17:49:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 21:49:05 -0300 Message-ID: <20230908004905.8813-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907234129.GV8640@pb2> References: <20230907234129.GV8640@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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: e/PIMly2vyTe 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 | 41 ++++++++++++++++++++------------- tests/fate-run.sh | 11 +++++---- tests/fate/flvenc.mak | 4 ++-- tests/fate/lavf-container.mak | 8 +++---- tests/fate/mpegps.mak | 2 +- tests/ref/fate/av1-annexb-demux | 2 +- tests/ref/lavf-fate/av1.mkv | 4 ++-- tests/ref/lavf-fate/av1.mp4 | 4 ++-- 8 files changed, 43 insertions(+), 33 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index ec8401f4e0..8f9c2dfefb 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; if (seq->seq_profile == 2 && seq->color_config.high_bitdepth) bit_depth = seq->color_config.twelve_bit ? 12 : 10; @@ -509,8 +500,22 @@ static int get_pixel_format(AVCodecContext *avctx) 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; +} + +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) return -1; @@ -609,8 +614,6 @@ static int get_pixel_format(AVCodecContext *avctx) *fmtp = AV_PIX_FMT_NONE; ret = ff_thread_get_format(avctx, pix_fmts); - if (ret < 0) - return ret; /** * check if the HW accel is inited correctly. If not, return un-implemented. @@ -620,12 +623,16 @@ static int get_pixel_format(AVCodecContext *avctx) if (!avctx->hwaccel) { av_log(avctx, AV_LOG_ERROR, "Your platform doesn't support" " hardware accelerated AV1 decoding.\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; return AVERROR(ENOSYS); } 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(avctx->pix_fmt)); + return 0; } @@ -865,6 +872,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 +1527,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-run.sh b/tests/fate-run.sh index 5a71ac001e..743d9b3620 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -275,15 +275,16 @@ transcode(){ stream_remux(){ src_fmt=$1 srcfile=$2 - enc_fmt=$3 - stream_maps=$4 - final_decode=$5 - ffprobe_opts=$6 + src_opts=$3 + enc_fmt=$4 + stream_maps=$5 + final_decode=$6 + ffprobe_opts=$7 encfile="${outdir}/${test}.${enc_fmt}" test $keep -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) - ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \ + ffmpeg -f $src_fmt $src_opts -i $tsrcfile $stream_maps -codec copy $FLAGS \ -f $enc_fmt -y $tencfile || return ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ -f framecrc - || return diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 8dc2f7adfd..3cfe930e43 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -9,8 +9,8 @@ FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER VP9_PARSER) += fa fate-enhanced-flv-vp9: CMD = transcode ivf $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf\ flv "-c copy" "-c copy" -FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER AV1_PARSER) += fate-enhanced-flv-av1 -fate-enhanced-flv-av1: CMD = stream_remux ivf $(TARGET_SAMPLES)/av1/seq_hdr_op_param_info.ivf\ +FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER AV1_DECODER AV1_PARSER) += fate-enhanced-flv-av1 +fate-enhanced-flv-av1: CMD = stream_remux ivf $(TARGET_SAMPLES)/av1/seq_hdr_op_param_info.ivf "-c:v av1" \ flv "-c copy" "-c copy" FATE_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes) 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/fate/mpegps.mak b/tests/fate/mpegps.mak index 87a8e1480e..807da1f713 100644 --- a/tests/fate/mpegps.mak +++ b/tests/fate/mpegps.mak @@ -1,7 +1,7 @@ # This tests that a 16-bit pcm_dvd stream is correctly remuxed in mpegps FATE_MPEGPS-$(call DEMMUX, MPEGPS, MPEG1SYSTEM) += fate-mpegps-remuxed-pcm-demux fate-mpegps-remuxed-pcm-demux: $(SAMPLES)/mpegps/pcm_aud.mpg -fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "mpeg" "-map 0:a:0" "-codec copy" +fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "mpeg" "" "-map 0:a:0" "-codec copy" FATE_SAMPLES_FFMPEG += $(FATE_MPEGPS-yes) fate-mpegps: $(FATE_MPEGPS-yes) 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