From patchwork Mon May 8 12:43:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3615 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp828986vsd; Mon, 8 May 2017 05:43:26 -0700 (PDT) X-Received: by 10.223.162.158 with SMTP id s30mr36731502wra.34.1494247406092; Mon, 08 May 2017 05:43:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494247406; cv=none; d=google.com; s=arc-20160816; b=bfoM7Q2rQ027Lr7snW5Wt9TOfPV0O5tX/QlBg9bvyx0/wmYlqk3vVFIxrKmCTM6UbH +UXmWs1LrPNEBgW0AdrJPJgU2Ha5hHEA8jJUf86xhP7X0vF9BKyMYznyM/+pJ25l3GiC YE7hPPBbfJOM6NXQuVUBDduTzqBJ/sWqHLrRz03sVFD934fxwgDbPZ+W+e2PH6IQYWqZ vAA+WyvTN3jZ3q7n+9o6YKDVgSa7lyx7aOt5RDxIaI6+R7lOHJaFu+L2+iWmxOfh5Gbd Ere5P1pzMiE4buzHgKnvAHq3Y3Nf5htvcijdBX8Nf0C1auPq0ck2nun/Ao/FJB5luime hxHA== 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: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=cYpzpa3RPEQzlk6QBqrdM5q1Rl0AZM1xtgCLWdYnHJE=; b=cq+XUNJPZqnkuW2J4VhSb4/QlwqWyOpiMf8RHlPCAWrR9QSZFQTOfEB8ZJaZVmk0NY XGVrf93qDRVxsfOaXJRwfDcB5vZNAIICp6oVgFWtSOO7QdsbhLuYm1BDq+2HflCoNyhZ 10CFh0zUXC3SJfHb8bL7fzZK1BpTlTbKnqTzH5A0r9a/E9BKP3ttEgNM6sbiWNoffIT7 L4Co3ZDp92Adsysv1cmMId116uChVRo8vw5HPSSj3UaYTxaZ+GOZr2sAeH1JoJfNzXmW GZcasZr78XNhpClGs+w56eH71kLiyVTzDvdvMRPMvb7tD47Z30HAMDM4chVImFNWVGsh DgRA== 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 b7si15758842wrd.314.2017.05.08.05.43.25; Mon, 08 May 2017 05:43:26 -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; 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 77F716882A2; Mon, 8 May 2017 15:43:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E90DC688293 for ; Mon, 8 May 2017 15:43:04 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1d7i0M-0003Ba-I3 for ffmpeg-devel@ffmpeg.org; Mon, 08 May 2017 14:43:10 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Hoj51v01H0S5wYM01oj6A8; Mon, 08 May 2017 14:43:06 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 8 May 2017 14:43:02 +0200 Message-Id: <20170508124303.12267-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170508124303.12267-1-michael@niedermayer.cc> References: <20170508124303.12267-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/webp: Factor update_canvas_size() out 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/webp.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index a4fd295250..21e3bcfa0a 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1099,6 +1099,21 @@ static int apply_color_indexing_transform(WebPContext *s) return 0; } +static void update_canvas_size(AVCodecContext *avctx, int w, int h) +{ + WebPContext *s = avctx->priv_data; + if (s->width && s->width != w) { + av_log(avctx, AV_LOG_WARNING, "Width mismatch. %d != %d\n", + s->width, w); + } + s->width = w; + if (s->height && s->height != h) { + av_log(avctx, AV_LOG_WARNING, "Height mismatch. %d != %d\n", + s->height, h); + } + s->height = h; +} + static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p, int *got_frame, uint8_t *data_start, unsigned int data_size, int is_alpha_chunk) @@ -1123,16 +1138,8 @@ static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p, w = get_bits(&s->gb, 14) + 1; h = get_bits(&s->gb, 14) + 1; - if (s->width && s->width != w) { - av_log(avctx, AV_LOG_WARNING, "Width mismatch. %d != %d\n", - s->width, w); - } - s->width = w; - if (s->height && s->height != h) { - av_log(avctx, AV_LOG_WARNING, "Height mismatch. %d != %d\n", - s->width, w); - } - s->height = h; + + update_canvas_size(avctx, w, h); ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0)