From patchwork Mon Oct 10 15:19:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 38649 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp231239pzb; Mon, 10 Oct 2022 00:19:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4lY5LOFdh7+kiQkha6XO1o+Wxue7Hv/YFqN694V+hPSl/GU3v0JjD657Bvcn4/rOuQ30dH X-Received: by 2002:a05:6402:3481:b0:459:50a9:5ab2 with SMTP id v1-20020a056402348100b0045950a95ab2mr16237634edc.279.1665386356823; Mon, 10 Oct 2022 00:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665386356; cv=none; d=google.com; s=arc-20160816; b=J78ch9RbQBjqserWtQ8ZYQ9AhP4lqR8UILvcNi6n5dO37JITOZk5xbg3fNqRzdwzJX xT1ziIZaeEoW/CzHXX7E4QSNo/DMqTrvCYaYkq+c2N2EYYMW+mUdKFm0l4r13tPYkPiu 8jhuMpFyYl8p7ZACQjW0Hwqb5tqIU9Ac9OQC64z1YIqNavvSDKRpPXwZh/IM+ikILxkF lQNO/ELCAKbitU18f2+3BVnWx5Sncfc9eq1432zaaXThTnRUaFQjR0nn7OqOj9sa8ir7 x8RAK4/31YjLFHmWkNG1CXgpewIxdvpAc+iP+paf+tV1P6HFQfAFBJJ0Pr1wBWn1ho1U rAeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=9fqsUNTcGRYKSZ9USRpuhFM77tQOYVzDEGlSIUGc69Q=; b=YFJyjV4ZjIHkNGgdGdPgKzKuZrN4oqXmemoAhrgoqRlBrBW+HdI5MA2wDYU80RZtTL RDqSC8SWOldY5fQQXKOEV0O/6apEHM5M6By7CJHutg3YS0YsF8N4Wi+/bShyZ+5UbpbB XF3jl4yhVh7JHbsnyhJVVfkw+XXtNyX+UFd5nsUB+aSx9pmEZEo4x5hGkRoSq+rg0I4x afM9ejseooriG6gjfyfH/1T49J84JsHwx3qUEADoC5cjxzpaeg7PHOZVM3FHEL/9hDZU l2o84ERvcgDSn+dXxhUHe5hXGqAUDinPasca7/YvfuOZGnwCPHMkhfuIu4DheR8MTWpB Fh8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=BQ7bl8D1; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t12-20020aa7db0c000000b0045919a1a07esi8986819eds.126.2022.10.10.00.19.16; Mon, 10 Oct 2022 00:19:16 -0700 (PDT) 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=@foxmail.com header.s=s201512 header.b=BQ7bl8D1; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6139568BC9B; Mon, 10 Oct 2022 10:19:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C1A768BB48 for ; Mon, 10 Oct 2022 10:19:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1665386341; bh=Nk/ftF6Tg45G3EcdxHwzL07iX1oSf/CXMOpYtfIGhM8=; h=From:To:Cc:Subject:Date; b=BQ7bl8D1u0ZZzy/WF53D6eTHp2ZB4SFiaYazfTsmEWlGAETS8G76lZqakRv3tai1g JVTVUgMzvO0VnkaYdKW9lU+t/7BigEqS1YCDQfFfYwfbkVSLl8BqDcslegzv54fIow EgGeH3uuty+k3ScYy+kgUNi5g5GrCL3AOX92SXd8= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszc13.qq.com (NewEsmtp) with SMTP id 4BB8A213; Mon, 10 Oct 2022 15:18:59 +0800 X-QQ-mid: xmsmtpt1665386339tk38zysha Message-ID: X-QQ-XMAILINFO: M5WvXNp9ZPrQQuEItrGQZ/ZlNn/YiKA4cekgRm2ffZ1TLGZ/V8vUFP6dW4/jNl 86hjty7splxZdytQzFDMHUCGjRQb7GHIOO8UtqQQiWnjaCEzrptAJl4Ju413/iSj5EmMnQaCL1Re XV2kyE2GFvnopAdP+TGn5xLWDJNX8zEkEEpctcZ4T6wk2zxpZhSyCWqlSkSBITJNWLpRK4L46QjU 1Kpd0KA26wGgCfzXXtmKsiZQv2O7ZhplKcHPwgBiqKTY0iYyHOVmZU8+fyk3Euc0dGbX0/QM42fi TJL1rXCFOqfRZJM6xIJbuPg5KlEd8Hu8InGsuJXt68N7vHmbWS3hWkb5pwwzX5phiRRXS88XzkzY eIvJw9+98RYqJxLlH/dn26dqz/S4YdLbqObkElT0V0/GDAPNjYii5FeeYmzS/kfcn4bplr6X8RZx 7kGkkZyGLoyvZT8vXGLqYST8p4GHvwNWty3CL3TePl3DgX1d/SbAUSbWHiEZ6JuNIT6j1EyX2TRs p2O+xZrx1+WfFQ2ZQHphb39GyJkGe3dogrvlY/anbTBVT/41gB13acKmu8KVDyaug6hQ5Qk8/j1m yhW4Lv2zibsOAaBuRaU5I6dhxYJWST8s1GRGDRXFrA8dVHKS+cchjmIRr+WfVSKpWGnTjQURnSeF UiPIbmVtV2lmfn1HK6IqpJbY0i2JIsYUHttvew3p9ziukCgUGlXGwXO7B7Y0zuYVID5DoSZzKxtD Ca4a6GqiCqif6lWW5d9f/IjD0whiG5ghCyw7ONCug7zV2iHJ7SHe2SdLZZPI+7Wbn4XwNN+yz+q+ HCgSpcLKg9dOuxpI9Q2tGQz0/I7Ubj8poCSkQAY60xUqwovVkXDG/H4UPbhns+WpeXobk2QpE2Vm j0VAS6XZ8Vx6H/N83oqtgojXeHn4fiPj8UyIsR7heojSxMSE9YHkMtB1+Ut+eIIMwj64t2J6YzPW 6fIZ2PbptdeWV9OtK3IA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 23:19:02 +0800 X-OQ-MSGID: <20221010151902.601618-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gk3As3dwocAS From: Zhao Zhili The crop info is optional, but used unconditionally. Signed-off-by: Zhao Zhili --- libavcodec/mediacodecdec_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index 2a605e7f5b..c1cbb28488 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -487,6 +487,11 @@ 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); + if (s->crop_bottom == 0 || s->crop_right == 0) { + s->crop_top = s->crop_left = 0; + s->crop_right = s->width - 1; + s->crop_bottom = s->height - 1; + } width = s->crop_right + 1 - s->crop_left; height = s->crop_bottom + 1 - s->crop_top;