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 041B642470 for ; Sun, 20 Nov 2022 06:50:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A34B968BAF5; Sun, 20 Nov 2022 08:50:42 +0200 (EET) Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D1D868BA72 for ; Sun, 20 Nov 2022 08:50:36 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1668927033; bh=gMPJd4nShKvekB/U9PZ8WWZUq1hKF/yD4qApol1L39s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U9CRNTfT3KwK8TCTfjqtwk+V2pdXNFwkoMiEhU67cB/d7bTdUsc5YlRLCti2yi7Z8 qbcKwTLnz2Mejm05cbWtO3FPTgu/bN9M7YSH0Te4GiqxGJo6rbnAu+Go4dxP/xCR5P a9W4ncF94C8cNboYIqNtNO6W0yzTAhqdAtSLUiwI= Received: from localhost.localdomain ([14.153.77.200]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id C8F0626E; Sun, 20 Nov 2022 14:50:15 +0800 X-QQ-mid: xmsmtpt1668927016thzo3ddli Message-ID: X-QQ-XMAILINFO: N4CzT1PKe+qFMaIHKUpjcVNbdC9VIGUctlFQx483VMxmftBd2640L/8/BqU7FD 7TZCt+Zn0V4p8QzvqTpq7mr5QTu790uZalMb4PLeIj3oq/w74iIQARBfeIDdXfH9Lt97e4p5bffm Vqzt+cnx+85ZKKywwI9ebNkcRpHXg+jULp6uAkGnerEPCYRUT4UdfAskEOLGk7rin1WS4fviFqXj j9Hm1ubFgcxhB/gr/AdmSticUxWAiQIIJYUpywLZMZwsF52Usl9lArcbNsf2mI6cK31Y1/6ec4hj rXQLWFAu93j8I+fkKyQg9c4YjmotThU4e9v0Wj+6o8uOohPD7qh6Y1Zw/8zG2kujIcWwnymgCVSI Chj2g58vKxUcMOzDe/TN+QLOZbPA1o+Se1pbyMrLWowaCeh++cY4/+HXE8BkyKV8Ajrg+BkSW9nc OJMyetkb8HiRl0Wsja4KEyW57jKJTbajCE+Gy+G79g1F0nMmrEGl7P8sH0iCGBWyrOIdRjdQDJ+l RYsUUEVmbGKHGz28dP2q0sDgZ3HR5cImmUFT7NjT/CiOpzeQ8rfuzhplS1d1PcfSD10Fsm67bp8O xSVtx1tMHMysSF9OXZCizrsktPcoTJRpv8QFzOp5bt4L5HrOWXGPnWUR8f66CgY/zwQOkxA/DzHd P/+kHpTC3DSJ+cBdK0rG4NevFT0wThZsD5+3x5pleyJ6yXUb8zGVoAbt1gXcEtWh2fJeSXcWpw1d kDoYPcDliVxY5epcmmqZxywtDjUpu/JRLi0pm1gRmJ3RcIc7SfEYu3syzkd5U1uX9/HaQImf84j4 iN5wnkcKrRexPQVfKwIJ47skFMhNNFiTU9A2AgMp5hn3kt8fz1QCsseDnGH9GFE/CEpNHw4hrvaT yvd4RJKa86KzK4b7efT7eYFoN3wm44h9r6uYfOuOjeiKX2qjL0V3Bw0+TeW2gx/P+a7mQ7NdRkGQ ZViKHlKe/INwnuKMiMJ5USIcZLOM1kHz3TIE/pnQs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Nov 2022 14:49:36 +0800 X-OQ-MSGID: <20221120064947.94540-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120064947.94540-1-quinkblack@foxmail.com> References: <20221120064947.94540-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 01/12] avcodec/mediacodec: fix incorrect crop info 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: matthieu.bouron@stupeflix.com, Aman Karmani , Zhao Zhili , aman@tmm1.net 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: Zhao Zhili The crop info is optional, but used unconditionally. Co-authored-by: Aman Karmani Signed-off-by: Zhao Zhili --- libavcodec/mediacodecdec_common.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index 2a605e7f5b..f430cfed31 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -487,8 +487,20 @@ static int mediacodec_dec_parse_format(AVCodecContext *avctx, MediaCodecDecConte AMEDIAFORMAT_GET_INT32(s->crop_left, "crop-left", 0); AMEDIAFORMAT_GET_INT32(s->crop_right, "crop-right", 0); - width = s->crop_right + 1 - s->crop_left; - height = s->crop_bottom + 1 - s->crop_top; + if (s->crop_right && s->crop_bottom) { + width = s->crop_right + 1 - s->crop_left; + height = s->crop_bottom + 1 - s->crop_top; + } else { + /* TODO: NDK MediaFormat should try getRect() first. + * Try crop-width/crop-height, it works on NVIDIA Shield. + */ + AMEDIAFORMAT_GET_INT32(width, "crop-width", 0); + AMEDIAFORMAT_GET_INT32(height, "crop-height", 0); + } + if (!width || !height) { + width = s->width; + height = s->height; + } AMEDIAFORMAT_GET_INT32(s->display_width, "display-width", 0); AMEDIAFORMAT_GET_INT32(s->display_height, "display-height", 0); -- 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".