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 EF2D34AD17 for ; Mon, 20 May 2024 02:05:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AD9268D128; Mon, 20 May 2024 05:05:51 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29C5268D109 for ; Mon, 20 May 2024 05:05:43 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716170749; x=1747706749; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CMw1A6uP58ZPXlJ44wXYwFmVQzSOLwDX+uCpiA0mhNk=; b=js37kQXSIlWnePJbsgDp8CtwPPD0cOUyFhV/0U0pZYsEhmEqkGPIz1hk X5YiBOIbQo9X2g2dArhJeo8nZxp57Cb+uLhpGTHQGOl69QwJmmAkklWTC NKpa90iNSnoZGq4GcXJfNRkxIXqrVF0QjLf/UBO/uYtaIGl7FS3GoJMQR B2ztHejN5WXcS0MBaUn6AWS9ew3Mt92N+9H4gG2X5fXujsh4bB4OfhvjI r0Il6yXJpqz3UEWpyUk7k2jcJEvHBDDuD+gYx0nEALNXsZqA9XVxGWDZB qI5L8NkXDYiOXOhPLBWQtGUpadQzbtilDaWR4a6DdHLcKtZex9EHHDxVa Q==; X-CSE-ConnectionGUID: pu3d1F2oRPmed3ow3/YEng== X-CSE-MsgGUID: DJgbzyXKQAi/woceLM4w4g== X-IronPort-AV: E=McAfee;i="6600,9927,11077"; a="23421779" X-IronPort-AV: E=Sophos;i="6.08,174,1712646000"; d="scan'208";a="23421779" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2024 19:05:36 -0700 X-CSE-ConnectionGUID: ILXqUZu2T9SdELEqA0EG5A== X-CSE-MsgGUID: ALNTh2qCR4eZQ99NERJutw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,174,1712646000"; d="scan'208";a="32939288" Received: from unknown (HELO t-dg2.sh.intel.com) ([10.239.159.57]) by orviesa008.jf.intel.com with ESMTP; 19 May 2024 19:05:36 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 May 2024 10:05:53 +0800 Message-Id: <20240520020553.1155143-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240520020553.1155143-1-fei.w.wang@intel.com> References: <20240520020553.1155143-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 2/2] lavc/qsvdec: Use coded_w/h for frame resolution when use system memory 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: fei.w.wang@intel.com 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: Fei Wang Fix output mismatch when decode clip with crop(conf_win_*offset in syntax) info by using system memory: $ ffmpeg -c:v hevc_qsv -i conf_win_offet.bit -y out.yuv Signed-off-by: Fei Wang --- libavcodec/qsvdec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 12cf630593..6b0492899a 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -133,26 +133,26 @@ static int qsv_get_continuous_buffer(AVCodecContext *avctx, AVFrame *frame, if (ret < 0) return ret; - frame->width = avctx->width; - frame->height = avctx->height; + frame->width = avctx->coded_width; + frame->height = avctx->coded_height; switch (avctx->pix_fmt) { case AV_PIX_FMT_NV12: - frame->linesize[0] = FFALIGN(avctx->width, 128); + frame->linesize[0] = FFALIGN(avctx->coded_width, 128); break; case AV_PIX_FMT_P010: case AV_PIX_FMT_P012: case AV_PIX_FMT_YUYV422: - frame->linesize[0] = 2 * FFALIGN(avctx->width, 128); + frame->linesize[0] = 2 * FFALIGN(avctx->coded_width, 128); break; case AV_PIX_FMT_Y210: case AV_PIX_FMT_VUYX: case AV_PIX_FMT_XV30: case AV_PIX_FMT_Y212: - frame->linesize[0] = 4 * FFALIGN(avctx->width, 128); + frame->linesize[0] = 4 * FFALIGN(avctx->coded_width, 128); break; case AV_PIX_FMT_XV36: - frame->linesize[0] = 8 * FFALIGN(avctx->width, 128); + frame->linesize[0] = 8 * FFALIGN(avctx->coded_width, 128); break; default: av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format.\n"); @@ -169,7 +169,7 @@ static int qsv_get_continuous_buffer(AVCodecContext *avctx, AVFrame *frame, avctx->pix_fmt == AV_PIX_FMT_P012) { frame->linesize[1] = frame->linesize[0]; frame->data[1] = frame->data[0] + - frame->linesize[0] * FFALIGN(avctx->height, 64); + frame->linesize[0] * FFALIGN(avctx->coded_height, 64); } ret = ff_attach_decode_data(frame); @@ -380,7 +380,7 @@ static int qsv_decode_init_context(AVCodecContext *avctx, QSVContext *q, mfxVide q->frame_info = param->mfx.FrameInfo; if (!avctx->hw_frames_ctx) { - ret = av_image_get_buffer_size(avctx->pix_fmt, FFALIGN(avctx->width, 128), FFALIGN(avctx->height, 64), 1); + ret = av_image_get_buffer_size(avctx->pix_fmt, FFALIGN(avctx->coded_width, 128), FFALIGN(avctx->coded_height, 64), 1); if (ret < 0) return ret; q->pool = av_buffer_pool_init(ret, av_buffer_allocz); -- 2.25.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".