From patchwork Tue Dec 3 02:41:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 16544 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 94D6644AF07 for ; Tue, 3 Dec 2019 04:41:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8057568AFBB; Tue, 3 Dec 2019 04:41:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m964.mail.126.com (mail-m964.mail.126.com [123.126.96.4]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42F8B68AF06 for ; Tue, 3 Dec 2019 04:41:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=mGlPrKV8TKByHeKHXV 3gOYzecRRhMO+03UOQifYtDNY=; b=qAqNYt25AQGXjrnwLUNfafHhLXFlKEh9XB 6jkOZvVZcnxoq07o5l/kxrLrRB9QlVzQPdzVlJp8zUStTwceVIoVfQWtNy7IdGyR YAjfry0CGJav1PMv4mxkGboaULKb3BvqyHCO8j50I7DLnLumg1aZt6+8UnZx92gI 4aDeY4YPg= Received: from localhost.localdomain (unknown [27.38.17.122]) by smtp9 (Coremail) with SMTP id NeRpCgB3CspYy+VdkJ8vAA--.302S5; Tue, 03 Dec 2019 10:41:31 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 10:41:24 +0800 Message-Id: <1575340886-29065-3-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1575340886-29065-1-git-send-email-hwrenx@126.com> References: <20191202125032.GA9290@sunshine.barsnick.net> <1575340886-29065-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: NeRpCgB3CspYy+VdkJ8vAA--.302S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar47tw1fZFWxZw43KF1fXrb_yoW8uFWrpF 17Wr9Igr1UtF1rAa4kJr1Fqw15ArWjg3W8K3yvyw1vvaySvr90qr129rW0kasrXa95ta1U JF4DtFyj9w17K37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jUWrXUUUUU= X-Originating-IP: [27.38.17.122] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZxuA6V16cbMUBQAAsh Subject: [FFmpeg-devel] [PATCH v2 3/5] lavc/libxavs2.c: fix code style - spaces 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: hwren --- libavcodec/libxavs2.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index 0e525ee..0aa4d31 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -59,7 +59,7 @@ typedef struct XAVS2EContext { static av_cold int xavs2_init(AVCodecContext *avctx) { - XAVS2EContext *cae= avctx->priv_data; + XAVS2EContext *cae = avctx->priv_data; int bit_depth, code; bit_depth = avctx->pix_fmt == AV_PIX_FMT_YUV420P ? 8 : 10; @@ -115,15 +115,13 @@ static av_cold int xavs2_init(AVCodecContext *avctx) xavs2_opt_set2("InitialQP", "%d", cae->qp); } - ff_mpeg12_find_best_frame_rate(avctx->framerate, &code, NULL, NULL, 0); - xavs2_opt_set2("FrameRate", "%d", code); cae->encoder = cae->api->encoder_create(cae->param); if (!cae->encoder) { - av_log(avctx,AV_LOG_ERROR, "Can not create encoder. Null pointer returned\n"); + av_log(avctx, AV_LOG_ERROR, "Can not create encoder. Null pointer returned\n"); return AVERROR(EINVAL); } @@ -182,7 +180,7 @@ static int xavs2_encode_frame(AVCodecContext *avctx, AVPacket *pkt, /* create the XAVS2 video encoder */ /* read frame data and send to the XAVS2 video encoder */ if (cae->api->encoder_get_buffer(cae->encoder, &pic) < 0) { - av_log(avctx,AV_LOG_ERROR, "failed to get frame buffer\n"); + av_log(avctx, AV_LOG_ERROR, "failed to get frame buffer\n"); return AVERROR_EXTERNAL; } if (frame) { @@ -221,9 +219,8 @@ static int xavs2_encode_frame(AVCodecContext *avctx, AVPacket *pkt, cae->api->encoder_encode(cae->encoder, NULL, &cae->packet); } - if ((cae->packet.len) && (cae->packet.state != XAVS2_STATE_FLUSH_END)){ - - if (av_new_packet(pkt, cae->packet.len) < 0){ + if ((cae->packet.len) && (cae->packet.state != XAVS2_STATE_FLUSH_END)) { + if (av_new_packet(pkt, cae->packet.len) < 0) { av_log(avctx, AV_LOG_ERROR, "packet alloc failed\n"); cae->api->encoder_packet_unref(cae->encoder, &cae->packet); return AVERROR(ENOMEM);