From patchwork Wed Jan 3 12:17:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 7103 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp15831756jad; Wed, 3 Jan 2018 04:23:14 -0800 (PST) X-Google-Smtp-Source: ACJfBoviFUKLqxKb9smRpukwMknq3IJxhwNX7gy+BANcu8dakNo4Wv1QO3RYadO3PThewXXxsWqo X-Received: by 10.223.132.35 with SMTP id 32mr1463309wrf.248.1514982194549; Wed, 03 Jan 2018 04:23:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514982194; cv=none; d=google.com; s=arc-20160816; b=Qd3vcNxdwD5DXZVCH/4k+wp4ta6ScHrc5ZtY6nFdY5hsXA4KBEeDxUjmc3beRXehuT lpq3rz/F/J2ZWZ2m/3d+lRA3Wya8qIEgpezlz+Y43WQ5rlqodP/Ge7++Vw/uPYxexokm 2PWbIvh3Ps8c8aIAIKJsYkslD9oKT5/hVrVui5iR2HyVuRvBMK8eCIbG4ev6A0o/v0gg KKI8RczAAat3oy43dnfK6Z8BvEXmIkkfAwZRcqHOu590z3dCl9hXTbIeBR2ImQiHl3vC bSYymNp+xPO1WrrD7F9ZUCcFKkQHMi7I8mNNRZ/RabsJQ7ao3Ai1gSBZxYjuyDnS9G0g Ryww== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ebaPQkaLr+RvxNyu93oMyWTTsyQM1+LoEB/H0HtK+KE=; b=R5O9fuHkJt9r0Fz4QY3u2G4uUnSM8kS3rH3OdzqVlwRd0SPDDBhme+t/v2brt7AN+I IV/m8iwHcQe1/tpp0GmY4k+jmMp2bMudEbYjN2E1A7YCdxzEYWEIDV3mJBtZKfVOeQbQ +qT6VMKgZCpQ3TXiDbWNnXwI99Gld+YqakM0V+py/AghrSa6V98ivntpvNeMQs0Xe89Q FB23OokXqEBW++qfrLHjENz/LqQMyOxtT12WldacGcGdugxsfn2HPjE4fOhsTT5PjXn3 ovKHhiqElqUiCoNgFBbwTUff3a0jPRgznqOCCLdUgtZTDbsTTHZ/gbIB5D7w1p5GsPcF jl8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rQTNpc7A; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r14si790667wrr.238.2018.01.03.04.23.13; Wed, 03 Jan 2018 04:23:14 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rQTNpc7A; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FA6C688347; Wed, 3 Jan 2018 14:22:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0D7A687EAF for ; Wed, 3 Jan 2018 14:22:48 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id w68so1371831wrc.10 for ; Wed, 03 Jan 2018 04:23:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wW76i0VYLGIL8lDP5f6ZTQtIucZJ4vGZOL3Z6HI2h3U=; b=rQTNpc7AwYLx1GYxZ8CQ8xW+t+SkXJtQ+U1TsMabJDB6QthTFnjP7FJM9LX05Yfp0D ks5IYF3Tb/2cebngRzWsULZ6QMzDdzX1oZ4Y1+Tz3ladAwZv41HQy057QTB5HAq5irZK Bbo2LrzNg+PA/MGJkLE0+EblhawK/hKG2pvZrVyqrihDCnocC136Zit/bSlKcCC0NTOJ DtiYKXfd5qatARBqH69nWluyygiVoMdl1Oi6v+mta8eKjXsG5Tjj4Bjb44CSBx/wEC5z jUzv6vvVZFpIaUBzcIR4t6cZPpnwtNzoW23ILFrMOZLwr9H0mdeZY1ZmhdKPnZs1287e LQfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wW76i0VYLGIL8lDP5f6ZTQtIucZJ4vGZOL3Z6HI2h3U=; b=Hre08nJAvez1N6iAXy28kPD7SjiDebGt/zWhsld0XPOaxcrWNvGmVwdR2zt+gf+ja6 KqBVin2ccr0saE1+WO4aAJGwwsTMsDqMXomQZsUtmp9qTd9FU5gBWk1RlG3KMZjJEV6R JjnMQCf7l7caFA+7qwiWc+/r/Mh3IossoS2kQQ4bq0pfC902nDHsG8GqygIP9Ybarhff qaFmeP5rDNjpLW1BdmaNJjXNQSw/NwZfjW99v+MqLiY/Rs9FnJFTbMNUgZ6TyqLu6d45 oAiAKwu16QvaB2erKQigWDV+bgCqAlzmNPStILtcD75hRGwlY+if+B6BwlbC9A3OTENI nGcA== X-Gm-Message-State: AKGB3mIXE0nJiltGbB8ohSpA+pLC6GoSRVNHsjlpJelbsb4eW9qzP3eQ Spn4LoLZxG9Md94H/D2ya3GrUQ== X-Received: by 10.223.142.98 with SMTP id n89mr1360787wrb.120.1514981844429; Wed, 03 Jan 2018 04:17:24 -0800 (PST) Received: from kusa.lan (AMontsouris-653-1-231-218.w86-212.abo.wanadoo.fr. [86.212.90.218]) by smtp.gmail.com with ESMTPSA id o18sm586979wrg.59.2018.01.03.04.17.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 04:17:23 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Jan 2018 13:17:12 +0100 Message-Id: <20180103121712.5019-1-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] lavc/mediacodecdec: remove mediacodec_process_data() indirection 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: Matthieu Bouron MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mediacodecdec.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index b698ceaef9..c0e91c9429 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -415,15 +415,6 @@ done: return ret; } - -static int mediacodec_process_data(AVCodecContext *avctx, AVFrame *frame, - int *got_frame, AVPacket *pkt) -{ - MediaCodecH264DecContext *s = avctx->priv_data; - - return ff_mediacodec_dec_decode(avctx, s->ctx, frame, got_frame, pkt); -} - static int mediacodec_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { @@ -489,7 +480,7 @@ static int mediacodec_decode_frame(AVCodecContext *avctx, void *data, av_fifo_generic_read(s->fifo, &s->buffered_pkt, sizeof(s->buffered_pkt), NULL); } - ret = mediacodec_process_data(avctx, frame, got_frame, &s->buffered_pkt); + ret = ff_mediacodec_dec_decode(avctx, s->ctx, frame, got_frame, &s->buffered_pkt); if (ret < 0) return ret;