From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4E53A4F7FC for ; Mon, 23 Jun 2025 13:14:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 367F768E0AA; Mon, 23 Jun 2025 16:14:39 +0300 (EEST) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CFF9668DC05 for ; Mon, 23 Jun 2025 16:14:32 +0300 (EEST) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-60179d8e65fso7399620a12.0 for ; Mon, 23 Jun 2025 06:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750684472; x=1751289272; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=//EuLR40xKUSLtcrs6Kokwg+svK9+knQ3GUIbV7dIU8=; b=Qrsw600J0EyCz+atD4CZNDsG8JdtJHYUkei2fn40zZNazCUj/I9jO7Cjao8XunhMCD EiIepgZEm4drrEbf6Y/1uAjDGNfwX182BEmSaqd0aWk7b5EigyLDw5R18VB4/Hm6OO2f m8Z7+BG3mlEXOFHcBaNC/8bQafz8kw90nH53EWunhvRV1i0JFTm7mWVKdPGbssZN51UE 5yrHprgfpLyOXGAxKGX3QW84Ke63H2RtS3pf+r3OO8J+hB3W4MM6F/9VFEmonb2TFlrx 5vpMCPed9S41361YXEnIcca/cZgGmAOBx42WERSzddCHu+25fZZ9Q4aPtxeKQZ201XEF MT3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750684472; x=1751289272; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=//EuLR40xKUSLtcrs6Kokwg+svK9+knQ3GUIbV7dIU8=; b=W03wxNnmz56VajFFUUpBVudIm6ef0AN50mdCXgSUYM/CEiff0BaN/By4fNGl5/CYlF bKIfnY1Hw54cL4HwZ1t9GLX597xzRAuBHK2GzOfUDxI22+PbxFKLnSfMJef1pPm5OnKt Mn08yoZozFlvBtdsBCBhHKvu7ObYsVnJFanUp2pNZPUkpsrAB0BdxF5sWU54jwiKzm7M 6zn+d49WyutsYBYwfD3bCBAK8BJU1FHoaDiWfjXUXwYYQ4l1sCxZaQK7pL/LR1A3Mvr1 o8C1UBZlIRDHr/dusGqm7U8bUIQsT88Wa2CQNs63i4bVJ26Mx4Jcx3NdtEVhJKIzCFjk q4Qw== X-Gm-Message-State: AOJu0Yy45fbSRpHFlViulU1qDbHTIv8klM59MZ5sSW06plxyBOt3wCu4 4r3tU1B5W6eDxKjgJA2XMaMJSJd81NYnwZ+8ln1EgJoPqPLNWTAz0EiY8tvP21y4 X-Gm-Gg: ASbGncuU5wlBV4QvmwaludpwMmqLh89b8YLIL7hRffNdE+zpcnnbB9n4QjW1dP/RTUn oVMr7Mc80JGjkaVsacAd3l9Qf7wNLO/xwp7zXenZXwCgf2nmalJrAnjyqTX/9RpwqbNW3WFPZ6h l3D0+s3Y114t1tAoF5KZom0aeQKWjcLqrxoDQilR9p2PRo4m8Xw8IBE+naZ3GMwpzvY/3kg9rsn RcIKxKSKfm0HeKJHahA+laaMFcUkgZvwRM6qqrPLwFG2pBvgpWrJ6roBr005MtVSmBzH2I6XPpk D8qhiIXeEljI3y0x/uzQw4lqVlqZgi759ARdYdINhLXycABfd6dNweuKfVEQgXfr+Hin3fv9M+Z LkClWfD/D29aVfqmmRgTgQVN9AeS/x+6I6g== X-Google-Smtp-Source: AGHT+IH1edsyIJHiWzINzaTdqq8iifY2N8ecPtc9p+LbeGui2CAqzd1jtmcNmua6e2ee/f2GVtv5XQ== X-Received: by 2002:a17:906:81ce:b0:ad8:99cc:7749 with SMTP id a640c23a62f3a-ae057be6579mr942507966b.47.1750684471263; Mon, 23 Jun 2025 06:14:31 -0700 (PDT) Received: from localhost.localdomain ([87.116.182.236]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae053e7f534sm703830466b.9.2025.06.23.06.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 06:14:30 -0700 (PDT) From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Jun 2025 15:14:16 +0200 Message-ID: <20250623131416.98-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.47.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/amfdec: Add VP9 AMF decoder 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: nyanmisaka Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: nyanmisaka --- configure | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/amfdec.c | 16 ++++++++++++---- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configure b/configure index f76f946dfe..fcc0af5681 100755 --- a/configure +++ b/configure @@ -3457,6 +3457,7 @@ vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" vp8_vaapi_encoder_select="vaapi_encode" vp8_v4l2m2m_decoder_deps="v4l2_m2m vp8_v4l2_m2m" vp8_v4l2m2m_encoder_deps="v4l2_m2m vp8_v4l2_m2m" +vp9_amf_decoder_deps="amf" vp9_cuvid_decoder_deps="cuvid" vp9_mediacodec_decoder_deps="mediacodec" vp9_mediacodec_encoder_deps="mediacodec" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9630074205..3157729e55 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -799,6 +799,7 @@ OBJS-$(CONFIG_VP8_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9data.o vp9dsp.o vp9lpf.o vp9recon.o \ vp9block.o vp9prob.o vp9mvs.o vpx_rac.o \ vp9dsp_8bpp.o vp9dsp_10bpp.o vp9dsp_12bpp.o +OBJS-$(CONFIG_VP9_AMF_DECODER) += amfdec.o OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP9_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_VP9_MEDIACODEC_ENCODER) += mediacodecenc.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3be33f5cc4..fa90e25633 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -899,6 +899,7 @@ extern const FFCodec ff_vp8_mediacodec_encoder; extern const FFCodec ff_vp8_qsv_decoder; extern const FFCodec ff_vp8_v4l2m2m_encoder; extern const FFCodec ff_vp8_vaapi_encoder; +extern const FFCodec ff_vp9_amf_decoder; extern const FFCodec ff_vp9_cuvid_decoder; extern const FFCodec ff_vp9_mediacodec_decoder; extern const FFCodec ff_vp9_mediacodec_encoder; diff --git a/libavcodec/amfdec.c b/libavcodec/amfdec.c index 88e55a7752..75a624d48c 100644 --- a/libavcodec/amfdec.c +++ b/libavcodec/amfdec.c @@ -89,6 +89,9 @@ static int amf_init_decoder(AVCodecContext *avctx) AMFBuffer *buffer; amf_int64 color_profile; int pool_size = 36; + // way-around for older drivers that don't support dynamic bitness detection - + // define HEVC and VP9 10-bit based on container info + int no_bitness_detect = amf_legacy_driver_no_bitness_detect(amf_device_ctx); ctx->drain = 0; ctx->resolution_changed = 0; @@ -99,13 +102,17 @@ static int amf_init_decoder(AVCodecContext *avctx) break; case AV_CODEC_ID_HEVC: { codec_id = AMFVideoDecoderHW_H265_HEVC; - // way-around for older drivers that don't support dynamic butness detection - - // define HEVC 10-bit based on container info - if(amf_legacy_driver_no_bitness_detect(amf_device_ctx)){ + if(no_bitness_detect){ if(avctx->pix_fmt == AV_PIX_FMT_YUV420P10) codec_id = AMFVideoDecoderHW_H265_MAIN10; } - + } break; + case AV_CODEC_ID_VP9: { + codec_id = AMFVideoDecoderHW_VP9; + if(no_bitness_detect){ + if(avctx->pix_fmt == AV_PIX_FMT_YUV420P10) + codec_id = AMFVideoDecoderHW_VP9_10BIT; + } } break; case AV_CODEC_ID_AV1: codec_id = AMFVideoDecoderHW_AV1; @@ -713,4 +720,5 @@ const FFCodec ff_##x##_amf_decoder = { \ DEFINE_AMF_DECODER(h264, H264, "h264_mp4toannexb") DEFINE_AMF_DECODER(hevc, HEVC, NULL) +DEFINE_AMF_DECODER(vp9, VP9, NULL) DEFINE_AMF_DECODER(av1, AV1, NULL) -- 2.47.1.windows.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".