From patchwork Sun Dec 31 20:24:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp5911335pzh; Sun, 31 Dec 2023 12:24:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IHt50mwl0qT54LMR1x5hDKNW6XTy3lJl1orxeAPO2cre+1HhXI5Jr7nI5vQUxE5tL/iXATE X-Received: by 2002:a19:e043:0:b0:50e:3dd8:8bee with SMTP id g3-20020a19e043000000b0050e3dd88beemr5920317lfj.58.1704054278365; Sun, 31 Dec 2023 12:24:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704054278; cv=none; d=google.com; s=arc-20160816; b=eyQml2V9czPB3aOBu9THh5HzCwBmZsstLxMQFxcGYHRiw8vfKhSZhxxZGI52U0bVZF z9I1HlTyU5LaqvTXi90vmPVl3/5W8iJDIwF3GSj6jVKvFB050pr24q6tJtVluY5kqxjF H+Cx3aELN1jo59+OfNiM5aS8zttkmqOc5BwIwoJ3AOoMMtfJEDvu2syjWLlK2RXdlofC yDCcryyzRSJzhAPSwMMMLkXF4BRhJtjl7cja3gpxLmxIDDaOrSM2uwujDWw8DAJGgoE0 8yaCob498Gr+QZUv0HJozN2mj1+opnk9FquT2Cu9XXdeTom8TfVkeuAryUbD3Jvcsv+W Yqhw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=y94GV2BqOr5KvF3ObWbePA5MG5/60CyHK9R6uftpxBQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ELuSpeFjxMuURU4DEgKDXN1QPCpJEqhqPV8ipM87A0Zjq6RUmwzC6G8SpBA2JiX4+E nEgs7LdU/eXtCKDgJeCTPBweE0Hz5d8AM1T3F1+8mPXLaqFPnxfdOLPdTwZzyA9LxNch /dn4aVeNJN3BSpdGrkHrc8Qc0pXf0og4X6LcACbpPZI4XQ38TXUEGVeYl8B/oxWJjEbJ VrUwuxYOXkrEfetI7aWdFQs+UNh0yCemjmALgQa8uCQpz0ywarQCFGLnTQzs+mWkXbO5 9iE4EzxuCfGpa35/NamZXHkTndzeuCe2WNDuPZRW/aDlbce45x+15Uru019aZziHzXLz mB4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CCnf4aFJ; 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 oq2-20020a170906cc8200b00a26f1e22c1esi5454011ejb.311.2023.12.31.12.24.37; Sun, 31 Dec 2023 12:24:38 -0800 (PST) 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=20230601 header.b=CCnf4aFJ; 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 C556268CCB4; Sun, 31 Dec 2023 22:24:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4700368C14E for ; Sun, 31 Dec 2023 22:24:27 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6d9bba6d773so4059645b3a.1 for ; Sun, 31 Dec 2023 12:24:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704054264; x=1704659064; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=UeSHsOCD1VeBh3c1Ecfd/5AMk4nioGBw31DVXJZNZwo=; b=CCnf4aFJMoyLNHU6F4oDlQW1JHz7WWu3HUSTA9YTgCYieGrP9UNgyeJthgdhmhwIXL canE2D5PBrmoERuug0E/+9/OQQaMHj7DKX0P6osxsacpXhOjdgkLPJVzA7REn6zOiMuc geG599pAOfdjtSOJHtas3W3neNHJIjzEsZMqzQ1uUGTIOa2fj/g/UZuVmC5dtS34q4b2 hK/IKXI39oanKLY9u9yJ/2Z3ST3+zNvUZTAQ2bPvUXlZIE5SFz5+8aXKivY66hcwI6Uq NjYQ5goJWMW0wMCOBNdHFs79EOHJRbeYB16r6a8H49wavUTKdznN31ryT/5novKzNSKq y2aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704054264; x=1704659064; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UeSHsOCD1VeBh3c1Ecfd/5AMk4nioGBw31DVXJZNZwo=; b=Jo/zFn89u1eNjdhY1s1uWHWxUsNWsGf0XvY+oTk0zL8+/a3iVLgbDZ+qpkIzevV1rm fwctJYOgdZKxOw2jvAWN9COxae+4ly5OvUIk+E25XOUjB0duM6Fkz0wCy3mp0MYabQzi PFdQK5PalAKDKKp3g0qXvXuwvsE9rJn4uBp4Ssq8uMnBpN4/sHSWr4ywWXQ2n/f7rGH0 134uHZfWLgAIpzbtPHu3BRDTQWVZbrRF8RmswbAOyvG0lZwbiYompWQiqW/2MLyxOccv Cw52adj11C5AJxqh6m3Wmt1yXdtKfEWgZd+a/WVXnw8w6FYl7B8bUKhvgIPXBXHamiLl RiVQ== X-Gm-Message-State: AOJu0YxeICQor17p1gjyQ8ZAuPwi7rxd/2WLk91a4TG7s5aXxaksnnUj +eybwLIPwJtqDX2YSALe+a44/mv7XvU= X-Received: by 2002:a62:bd19:0:b0:6d9:8453:e040 with SMTP id a25-20020a62bd19000000b006d98453e040mr14177163pff.1.1704054264290; Sun, 31 Dec 2023 12:24:24 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e27-20020a056a0000db00b006d9bf71461asm11403874pfj.86.2023.12.31.12.24.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 12:24:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Dec 2023 17:24:44 -0300 Message-ID: <20231231202445.2023-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/d3d12va_mpeg2: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hA9ZHn/W36Rf Signed-off-by: James Almer --- 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; From patchwork Sun Dec 31 20:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp5911364pzh; Sun, 31 Dec 2023 12:24:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGbYTbcoMuJiBkQEP82sIRmSOn2Joqj8cISxy+AiJT0zg3Fey9S48A4H31NgUkFFlqrs5Mw X-Received: by 2002:a05:651c:220a:b0:2cc:76c4:e7ce with SMTP id y10-20020a05651c220a00b002cc76c4e7cemr6668630ljq.67.1704054288164; Sun, 31 Dec 2023 12:24:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704054288; cv=none; d=google.com; s=arc-20160816; b=OQDvAmvHAJHgQc8VAgEilE3VKkz38iWMPV7scURXSuF9XTOCLiGMgu/STX3/ZwfZ5q DlHelA9rK/CQlJ83bitIuAKQRcBFQODrB4iZSlH1n9uGmf0R9YV7lNZJKn31ImJnYydf Bq1YEEQQVQ3dWpPWygkKIxE2xQVmflcbSMLG3Q04BoXoqbYhTd96qOetr+4ghPrruYdE WbzYvOcaULOcC5bGzvJhXoRkhMWkxOPXQ13tewFyht6ZjC9oER14w6iYTAWpguBz7OE1 1R9RXhK4SZ7lp1dcRgwJKQo62/05pa+BzARzrZFuLsXSxziUIBdLZp9xSDSkCd48FlIA 9s+A== 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=/xwyjk38530UFdDvP9wObyVeBVZK5GzpwX/arBLroN8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bMF6U0sXpbgyaBfRsbMNKHMXryIhuZPmWZ4malcw/NAZmECILj5MW9pmLHZT6BVnIa ld7XCmBdIrJ+wmaJ5RXXu3bU9ZaStyjkXu+txDqPqhDiEYjbdl5scc77hut1SBFbPoJh J0jPW7eeN5AaYg10eHgYLggOcXPccCeWeUMEjApbuygOpmEZESoOjkMHC2ZS7MFMhmHN NC253MapcwS2p3RxRNlDbtNqqcD2tiby77HAIf1pyEu57hn6EyYNmgN+TZy1RRuGHvDt +NHAuy2hBrAkVRxT4pCE/jQmK9JNZNqcUgJeEBksYgKvgDz87zRFXNWEvRuhomGL1B/1 fI+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=aa66Oo36; 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 f19-20020a056402355300b005535281246asi9499418edd.627.2023.12.31.12.24.47; Sun, 31 Dec 2023 12:24:48 -0800 (PST) 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=20230601 header.b=aa66Oo36; 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 20BCE68CCCF; Sun, 31 Dec 2023 22:24:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF4CD68C14E for ; Sun, 31 Dec 2023 22:24:27 +0200 (EET) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6d9b13fe9e9so4582163b3a.2 for ; Sun, 31 Dec 2023 12:24:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704054266; x=1704659066; 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=zUGATR1Aa3Pyre7B5d7Ph4zbtXr9L6O/t4QFdGD3RW0=; b=aa66Oo36brtRvglhvHhsY9G7FEZ3bPj9T0GV1ENtMulQR3PoPuNke4taKx2DidBWv8 ScM4ip1SIf39GypK17776y0OmWLRxOikio5tdyEHY4jAVNU4ezDTolkdhAKepF+ZgsEH 6CnE7lpia40yatri1+UQ6o0EBzgAgPzcK6hLdsQsasfsWYLZ+sUwrEZSAY9PBiDV8Fno x0v97AoSOtTxRLmeRyI5UEDZPBnQOoGZG076LoqtvNQKF3kyBwMG7qBsqGYaMAoj3rre Z+dYK0pyjvTFGpMZisrWCsbo5qiuNyNM+fQRQCx4Nz9g6yHqySwKd1ESAY64E37FrYl8 RFMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704054266; x=1704659066; 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=zUGATR1Aa3Pyre7B5d7Ph4zbtXr9L6O/t4QFdGD3RW0=; b=KWFjaUbY5cYw2G8Wk5PFiiJe5kS95pcfijfJTyNzW91MMLB4guEVy3RyjKWu4Mhowv M0rG3z6vkIJDlq02Oe+/pcDriXVtEpvay/9ecQgkywtRl+Ol/k9VuX7eJMTFSErJyI7Y H03aPukupt8nMeSr4lxHJS9ybHywZWDZso8Jubpz+Fxyidi2tzvkWUQ7esCQZYFuIxbK 63ZsgfGWW6OldbcA96WgmiUpFeB3agnLdjeXE923vfbzobbKJVNjScb1mlhnzMtV1Cn6 EVg/jNxhHscoRH2kMREsO+bGEHMeaIIODAEeiWLVYep79eKiZj6Bx1fybhOE9VT3jLct LPcA== X-Gm-Message-State: AOJu0YyM7nbDFt7NVIEI8+IZHt08kgKzJP75FHiV9S2MZUqmla5xq0m/ PnMPx5aecq4iZcZiFe8LDbSNkXpj4CI= X-Received: by 2002:a05:6a00:2da8:b0:6d9:b082:b8f0 with SMTP id fb40-20020a056a002da800b006d9b082b8f0mr13682409pfb.66.1704054265881; Sun, 31 Dec 2023 12:24:25 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e27-20020a056a0000db00b006d9bf71461asm11403874pfj.86.2023.12.31.12.24.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 12:24:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Dec 2023 17:24:45 -0300 Message-ID: <20231231202445.2023-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231231202445.2023-1-jamrial@gmail.com> References: <20231231202445.2023-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/d3d12va_mpeg2: change the type for the ID3D12Resource_Map input data argument 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: AyH3rBWRj2UT Fixes -Wincompatible-pointer-types warnings. Signed-off-by: James Almer --- 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 = {