[FFmpeg-devel] [PATCH 1/2] avcodec/d3d12va_mpeg2: remove unused variables

[FFmpeg-devel] [PATCH 1/2] avcodec/d3d12va_mpeg2: remove unused variables

[James Almer]

Signed-off-by: James Almer <jamrial@gmail.com>
---
is_field worries me. Was it a copy-paste left over, or is it meant to
be checked?

 libavcodec/d3d12va_mpeg2.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libavcodec/d3d12va_mpeg2.c b/libavcodec/d3d12va_mpeg2.c
index 91bf3f8b75..a2ae8bf948 100644
--- a/libavcodec/d3d12va_mpeg2.c
+++ b/libavcodec/d3d12va_mpeg2.c
@@ -49,7 +49,6 @@ static int d3d12va_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint
     const MpegEncContext      *s       = avctx->priv_data;
     D3D12VADecodeContext      *ctx     = D3D12VA_DECODE_CONTEXT(avctx);
     D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
-    DXVA_QmatrixData          *qm      = &ctx_pic->qm;
 
     if (!ctx)
         return -1;
@@ -76,8 +75,6 @@ static int d3d12va_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buff
     const MpegEncContext      *s       = avctx->priv_data;
     D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
 
-    int is_field = s->picture_structure != PICT_FRAME;
-
     if (ctx_pic->slice_count >= MAX_SLICES) {
         return AVERROR(ERANGE);
     }
@@ -94,9 +91,6 @@ static int d3d12va_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buff
 
 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 MpegEncContext      *s            = avctx->priv_data;
     D3D12DecodePictureContext *ctx_pic      = s->current_picture_ptr->hwaccel_picture_private;
 
@@ -147,7 +141,6 @@ static int d3d12va_mpeg2_end_frame(AVCodecContext *avctx)
 {
     int ret;
     MpegEncContext            *s       = avctx->priv_data;
-    D3D12VADecodeContext      *ctx     = D3D12VA_DECODE_CONTEXT(avctx);
     D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
 
     if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
@@ -163,7 +156,6 @@ static int d3d12va_mpeg2_end_frame(AVCodecContext *avctx)
 
 static int d3d12va_mpeg2_decode_init(AVCodecContext *avctx)
 {
-    const MpegEncContext       *s      = avctx->priv_data;
     D3D12VADecodeContext      *ctx     = D3D12VA_DECODE_CONTEXT(avctx);
 
     ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_MPEG2;
-- 
2.43.0

_______________________________________________
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".

[FFmpeg-devel] [PATCH 2/2] avcodec/d3d12va_mpeg2: change the type for the ID3D12Resource_Map input data argument

[James Almer]

Fixes -Wincompatible-pointer-types warnings.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/d3d12va_mpeg2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/d3d12va_mpeg2.c b/libavcodec/d3d12va_mpeg2.c
index a2ae8bf948..b964f8d2ff 100644
--- a/libavcodec/d3d12va_mpeg2.c
+++ b/libavcodec/d3d12va_mpeg2.c
@@ -98,7 +98,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU
     const unsigned mb_count = s->mb_width * (s->mb_height >> is_field);
 
     int i;
-    uint8_t *mapped_data = NULL;
+    void *mapped_data = NULL;
     D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args = &input_args->FrameArguments[input_args->NumFrameArguments++];
 
     D3D12_RANGE range = {
-- 
2.43.0

_______________________________________________
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".

[FFmpeg-devel] 回复: [PATCH 1/2] avcodec/d3d12va_mpeg2: remove unused variables

[Wu Jianhua]

James Almer:
> [FFmpeg-devel] [PATCH 1/2] avcodec/d3d12va_mpeg2: remove unused variables
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> is_field worries me. Was it a copy-paste left over, or is it meant to
> be checked?
>
> libavcodec/d3d12va_mpeg2.c | 8 --------
> 1 file changed, 8 deletions(-)

> diff --git a/libavcodec/d3d12va_mpeg2.c b/libavcodec/d3d12va_mpeg2.c
> index 91bf3f8b75..a2ae8bf948 100644
> --- a/libavcodec/d3d12va_mpeg2.c
> +++ b/libavcodec/d3d12va_mpeg2.c
> @@ -49,7 +49,6 @@ static int d3d12va_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint
>     const MpegEncContext      *s       = avctx->priv_data;
>     D3D12VADecodeContext      *ctx     = D3D12VA_DECODE_CONTEXT(avctx);
>     D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
>-    DXVA_QmatrixData          *qm      = &ctx_pic->qm;
>
>     if (!ctx)
>         return -1;
>@@ -76,8 +75,6 @@ static int d3d12va_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buff
>     const MpegEncContext      *s       = avctx->priv_data;
>     D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
>
> -    int is_field = s->picture_structure != PICT_FRAME;
> -
> 

This patch set LGTM. It's something added for debugging but forgot to remove. Thanks for your fix.
_______________________________________________
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".