From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9E73647F18 for ; Thu, 4 Jan 2024 07:20:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1282468C334; Thu, 4 Jan 2024 09:20:40 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 695A968C334 for ; Thu, 4 Jan 2024 09:20:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704352837; x=1735888837; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=w+CaZd6Lq78UGdg2rg2zAKAVcm9Hwsv9qo/laa4+Fw0=; b=iYWiDsOj+Qj42O3b3EYxPiklibtdrd4hnHhBgyromdGUUG7wQMdXu7D6 kVimokKarUhXOdbVWRytlpv0KbELJFfQDgPscXDj39XfiBL2Ob9LMdm++ QA6E4/aDXT8g5KTwjXpiCzCIf13XSbK0Bv5fSZL6wR1+RAXuiIFhcT+vM DpKglVTSwYLhyrfoGMHjcQ7ikCG4f8Fd8Th2vdOVVJuHoeX14R6/ZY133 8bmfE3DaFtjoHZab7RUmDPNympen01wMQ75VYDzq2gh9UT6Ef/VHICKZq GTGCsPKDTstjkCDib+3gXiP8cVErMJrrnLVqp0jAHzkESKLiPvEL90RJz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="10724017" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="10724017" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2024 23:20:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="1111623545" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="1111623545" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmsmga005.fm.intel.com with ESMTP; 03 Jan 2024 23:20:15 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2024 15:19:04 +0800 Message-ID: <20240104071905.1262-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] d3d12va_decode|av1|h264|hevc|vc1|vp9: remove unused variables 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: Tong Wu 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: Signed-off-by: Tong Wu --- libavcodec/d3d12va_av1.c | 18 +++++------------- libavcodec/d3d12va_decode.c | 9 ++------- libavcodec/d3d12va_h264.c | 4 ---- libavcodec/d3d12va_hevc.c | 5 ----- libavcodec/d3d12va_vc1.c | 3 --- libavcodec/d3d12va_vp9.c | 4 ---- 6 files changed, 7 insertions(+), 36 deletions(-) diff --git a/libavcodec/d3d12va_av1.c b/libavcodec/d3d12va_av1.c index 6a3543353f..5f96f7da04 100644 --- a/libavcodec/d3d12va_av1.c +++ b/libavcodec/d3d12va_av1.c @@ -108,11 +108,8 @@ static int d3d12va_av1_decode_slice(AVCodecContext *avctx, static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer) { - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; - const AV1DecContext *h = avctx->priv_data; - AV1DecodePictureContext *ctx_pic = h->cur_frame.hwaccel_picture_private; + const AV1DecContext *h = avctx->priv_data; + AV1DecodePictureContext *ctx_pic = h->cur_frame.hwaccel_picture_private; uint8_t *mapped_data; D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args = &input_args->FrameArguments[input_args->NumFrameArguments++]; @@ -142,7 +139,6 @@ static int d3d12va_av1_end_frame(AVCodecContext *avctx) { int ret; const AV1DecContext *h = avctx->priv_data; - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); AV1DecodePictureContext *ctx_pic = h->cur_frame.hwaccel_picture_private; if (ctx_pic->tiles <= 0 || ctx_pic->bitstream_size <= 0) @@ -156,10 +152,8 @@ static int d3d12va_av1_end_frame(AVCodecContext *avctx) static int d3d12va_av1_decode_init(AVCodecContext *avctx) { - const AV1DecContext *h = avctx->priv_data; - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - D3D12AV1DecodeContext *av1_ctx = D3D12_AV1_DECODE_CONTEXT(avctx); - AV1DecodePictureContext *ctx_pic = h->cur_frame.hwaccel_picture_private; + D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); + D3D12AV1DecodeContext *av1_ctx = D3D12_AV1_DECODE_CONTEXT(avctx); DXVA_PicParams_AV1 pp; int ret; @@ -186,9 +180,7 @@ static int d3d12va_av1_decode_init(AVCodecContext *avctx) static int d3d12va_av1_decode_uninit(AVCodecContext *avctx) { - const AV1DecContext *h = avctx->priv_data; - D3D12AV1DecodeContext *ctx = D3D12_AV1_DECODE_CONTEXT(avctx); - AV1DecodePictureContext *ctx_pic = h->cur_frame.hwaccel_picture_private; + D3D12AV1DecodeContext *ctx = D3D12_AV1_DECODE_CONTEXT(avctx); if (ctx->bitstream_buffer) av_freep(&ctx->bitstream_buffer); diff --git a/libavcodec/d3d12va_decode.c b/libavcodec/d3d12va_decode.c index e0b67bf964..f705002c10 100644 --- a/libavcodec/d3d12va_decode.c +++ b/libavcodec/d3d12va_decode.c @@ -266,8 +266,7 @@ fail: int ff_d3d12va_common_frame_params(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx) { - AVHWFramesContext *frames_ctx = (AVHWFramesContext *)hw_frames_ctx->data; - AVHWDeviceContext *device_ctx = frames_ctx->device_ctx; + AVHWFramesContext *frames_ctx = (AVHWFramesContext *)hw_frames_ctx->data; frames_ctx->format = AV_PIX_FMT_D3D12; frames_ctx->sw_format = avctx->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ? AV_PIX_FMT_P010 : AV_PIX_FMT_NV12; @@ -408,9 +407,7 @@ int ff_d3d12va_decode_uninit(AVCodecContext *avctx) static inline int d3d12va_update_reference_frames_state(AVCodecContext *avctx, D3D12_RESOURCE_BARRIER *barriers, int state_before, int state_end) { - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; + D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); int num_barrier = 0; for (int i = 0; i < ctx->max_num_ref; i++) { @@ -437,8 +434,6 @@ int ff_d3d12va_common_end_frame(AVCodecContext *avctx, AVFrame *frame, { int ret; D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; ID3D12Resource *buffer = NULL; ID3D12CommandAllocator *command_allocator = NULL; AVD3D12VAFrame *f = (AVD3D12VAFrame *)frame->data[0]; diff --git a/libavcodec/d3d12va_h264.c b/libavcodec/d3d12va_h264.c index 5a6d6852c8..be5cf0d527 100644 --- a/libavcodec/d3d12va_h264.c +++ b/libavcodec/d3d12va_h264.c @@ -104,10 +104,6 @@ static int d3d12va_h264_decode_slice(AVCodecContext *avctx, const uint8_t *buffe #define START_CODE_SIZE 3 static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer) { - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; - const H264Context *h = avctx->priv_data; const H264Picture *current_picture = h->cur_pic_ptr; H264DecodePictureContext *ctx_pic = current_picture->hwaccel_picture_private; diff --git a/libavcodec/d3d12va_hevc.c b/libavcodec/d3d12va_hevc.c index 7e0c295a2d..a6a3b802f9 100644 --- a/libavcodec/d3d12va_hevc.c +++ b/libavcodec/d3d12va_hevc.c @@ -98,10 +98,6 @@ static int d3d12va_hevc_decode_slice(AVCodecContext *avctx, const uint8_t *buffe #define START_CODE_SIZE 3 static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer) { - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; - const HEVCContext *h = avctx->priv_data; const HEVCFrame *current_picture = h->ref; HEVCDecodePictureContext *ctx_pic = current_picture->hwaccel_picture_private; @@ -166,7 +162,6 @@ static int d3d12va_hevc_end_frame(AVCodecContext *avctx) static int d3d12va_hevc_decode_init(AVCodecContext *avctx) { - HEVCContext *h = avctx->priv_data; D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); DXVA_PicParams_HEVC pp; diff --git a/libavcodec/d3d12va_vc1.c b/libavcodec/d3d12va_vc1.c index 3d15abd1f1..b39b03ab45 100644 --- a/libavcodec/d3d12va_vc1.c +++ b/libavcodec/d3d12va_vc1.c @@ -95,9 +95,6 @@ static int d3d12va_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer) { - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; const VC1Context *v = avctx->priv_data; const MpegEncContext *s = &v->s; D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private; diff --git a/libavcodec/d3d12va_vp9.c b/libavcodec/d3d12va_vp9.c index bb94e18781..3d8f3a4466 100644 --- a/libavcodec/d3d12va_vp9.c +++ b/libavcodec/d3d12va_vp9.c @@ -85,10 +85,6 @@ static int d3d12va_vp9_decode_slice(AVCodecContext *avctx, const uint8_t *buffer static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer) { - D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); - AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx); - AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx; - const VP9SharedContext *h = avctx->priv_data; VP9DecodePictureContext *ctx_pic = h->frames[CUR_FRAME].hwaccel_picture_private; -- 2.41.0.windows.1 _______________________________________________ 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".