From patchwork Thu Jan 18 05:03:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 7319 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp6450640jaa; Wed, 17 Jan 2018 21:05:40 -0800 (PST) X-Google-Smtp-Source: ACJfBouPrKt8i2TUfR5X7HRRMvxlqsHE3pXBukkBrO3VLyL1acL0ym2SwyzTNcji/TeUKmKjye6z X-Received: by 10.223.134.242 with SMTP id 47mr5039809wry.227.1516251940467; Wed, 17 Jan 2018 21:05:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516251940; cv=none; d=google.com; s=arc-20160816; b=stsvL2wX9Hb0a2y2YpM9JgI0iF1n1OUZZw2acYRTCmxhTV5ugJ+0sOZSN4SN0mwa4v 2nkQcIX/27Cb6gA2+syWDXUouJ4aasZlfL9OHrjhFwIUVOYiixehNjT+P+JkIOWGpF+A IQKbWtKKAexQ6ji97mX+fU6HksuFByZxUNmORN3AUSG6JPO/uPaMNE9mfpKfSo7dfSgl VVNb7mABWaIBXEibq8zaKY7N3+3bX7ovYLB7uKOytk4GeldfJgUtH6EyIUaAJIsssslF y+uekUuL2p9eYXEtvqJvzOw3tur24NU0MkdOsxKnT7SVL9KtitoYQg118RW8Ka7tkHsF VFgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=5KBF49fU6Op9ozfckto9QzbsIiG4a7xpqDZMIa7M57o=; b=nOT6qESLRjdhYO0XUfqgfXNqDFKcCYdkeaAtudtbgbHYYwgWFqw6HcuBuwi4RWLjUN KckUe2YLIpai5Qb8mbHacQQJXTzXLOa1oSo6ptVURh8dkiQ3J4a7gZaBaLvWouIXy61q jAl6jYJvQ5RMZtq58BdmhdKDIRStnsv5u9IDNbxSPWxtrKKaxeyGuh1SqPmFiNvX/UNT KUFPlr494wCo7XD6G9luhw6jYjyJxpVGQGEnZZOYi/RNXsLOqmIkNOWhe68QHBwO6tiN PYnEr3aXH8Ipuut3gX1ZbFuL2MQCj2XWBMqxeFXzwV2b83tAm3Qa5HAOBX/Os6DpBTVc 6KYw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l24si4836177wmc.22.2018.01.17.21.05.40; Wed, 17 Jan 2018 21:05:40 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3EA468A18C; Thu, 18 Jan 2018 07:05:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 157D568A169 for ; Thu, 18 Jan 2018 07:05:26 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2018 21:05:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,376,1511856000"; d="scan'208";a="11031534" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.18]) by orsmga008.jf.intel.com with ESMTP; 17 Jan 2018 21:05:16 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jan 2018 13:03:34 +0800 Message-Id: <1516251814-6220-2-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516251814-6220-1-git-send-email-zhong.li@intel.com> References: <1516251814-6220-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH V2 2/2] Don't overwrite previously setup dimensions for all codecs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Currently a hacky way is used for some specific codecs such as H264/VP6F/DXV (and "lowres" case is broken now). Replace with a more generic way(an evolution based on a libav commit 9de9b828 but hasn't been merged since it breaks lowres). V1->V2: add "lowres" handle code Signed-off-by: Zhong Li --- libavcodec/utils.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 427f612..fdd1b46 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -684,16 +684,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code goto free_and_end; } - // only call ff_set_dimensions() for non H.264/VP6F/DXV codecs so as not to overwrite previously setup dimensions - if (!(avctx->coded_width && avctx->coded_height && avctx->width && avctx->height && - (avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_VP6F || avctx->codec_id == AV_CODEC_ID_DXV))) { - if (avctx->coded_width && avctx->coded_height) + if (avctx->coded_width && avctx->coded_height && (!avctx->width && !avctx->height || avctx->lowles)) ret = ff_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); - else if (avctx->width && avctx->height) + else if (avctx->width && avctx->height && (!avctx->coded_width && !avctx->coded_height || avctx->lowles)) ret = ff_set_dimensions(avctx, avctx->width, avctx->height); if (ret < 0) goto free_and_end; - } if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height) && ( av_image_check_size2(avctx->coded_width, avctx->coded_height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx) < 0