From patchwork Mon Dec 16 05:01:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16826 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 07D5E44920A for ; Mon, 16 Dec 2019 08:05:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7AD168ABE9; Mon, 16 Dec 2019 08:05:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E64C68ABCC for ; Mon, 16 Dec 2019 08:05:08 +0200 (EET) Received: by mail-io1-f67.google.com with SMTP id z8so3834160ioh.0 for ; Sun, 15 Dec 2019 22:05:08 -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:in-reply-to:references; bh=XAC/4Nsh4ETh4Hq+1bOqn8DukDYAh0JGsKFo+Cs/OQY=; b=eTy9A6svXElt7Gtr0oh46mJW6tW+aTYbFdN3Mrt+ojqLPFRkqjVLRMlOh3H2c0RVUS waDOQWRhR5P027rMs0RDnGHQXKznPaSx0NiuuOxg6J3uRXKLktvnMsHl/2HINlfUANic /nXZ9vPMPeFzkyAMAeCtpPmXp7tTdBkrBe4lGYs7QDQdOW9LLwWZ+YbhIw3dP0I8tSIJ rSZ/IbnmoyqV02D8FOOqPSXsz/lUjG/DIxLkacx1EU/dgVBARCxaZeSvhi3Qn64oT4Is soNjDlPjCw+r5zHUX7HmYco4JNTdCAbKpw9YbomW1TnROg2Fmmj6FbwhvlySp8sOkm0r W96Q== 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:in-reply-to :references; bh=XAC/4Nsh4ETh4Hq+1bOqn8DukDYAh0JGsKFo+Cs/OQY=; b=HPVksSO/o+ImsQEpI+LDjYhQvzIDVHUKv4V+pxEto5RMZBCrHshdviEAVkj6exT8vy lgPcGxi7TYrM9/9d70bGHhUtjLk+F80CvWqsgYJx1gP1OiWVAf/J0nHTw3kzYki+/Yce bzJKg1VzJYI/ry1H1hLoTQYWzG9wXG1YZ8VfYUyQF2W08LHqBM0f5pa1m0IaRKNNlGXE 9AkKFNfKEe3m85Sa6aOlfxqI1h7B0zOtvQsjv2frwWBsmse6y15O+KucEaPc2rrutDve X9DhRKb/8Wdth8HALXkXMnMz3JE1Cg3dg96BYHthG3CINCXPuZvt0+EvMkw0R+KqmHGR 8GQw== X-Gm-Message-State: APjAAAWn+sh6sZbB/oJjGhps7Xk68RcsP61z7v8yNvgiJ2gja116SOCA 3DXSRK7St4gqdod7wKNsnh+dOxa2 X-Google-Smtp-Source: APXvYqwR5vJ/B1oogYpnAuSxM8bhznr2/IOp4jSYGwp4tfJ0+0IQCQoeBVB8QNuGlLFd/03/pAvbPQ== X-Received: by 2002:a63:89c2:: with SMTP id v185mr15686927pgd.135.1576472609270; Sun, 15 Dec 2019 21:03:29 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id o10sm19803021pgq.68.2019.12.15.21.03.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Dec 2019 21:03:28 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 13:01:49 +0800 Message-Id: <20191216050149.2235-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191214150310.19734-1-lance.lmwang@gmail.com> References: <20191214150310.19734-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avcodec/bsf: replace ctx->internal-> with bsfi-> for better readability 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/bsf.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index c1653cd..c6dce93 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -82,6 +82,7 @@ const AVClass *av_bsf_get_class(void) int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx) { AVBSFContext *ctx; + AVBSFInternal *bsfi; int ret; ctx = av_mallocz(sizeof(*ctx)); @@ -98,14 +99,15 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx) goto fail; } - ctx->internal = av_mallocz(sizeof(*ctx->internal)); - if (!ctx->internal) { + bsfi = av_mallocz(sizeof(*bsfi)); + if (!bsfi) { ret = AVERROR(ENOMEM); goto fail; } + ctx->internal = bsfi; - ctx->internal->buffer_pkt = av_packet_alloc(); - if (!ctx->internal->buffer_pkt) { + bsfi->buffer_pkt = av_packet_alloc(); + if (!bsfi->buffer_pkt) { ret = AVERROR(ENOMEM); goto fail; } @@ -175,9 +177,11 @@ int av_bsf_init(AVBSFContext *ctx) void av_bsf_flush(AVBSFContext *ctx) { - ctx->internal->eof = 0; + AVBSFInternal *bsfi = ctx->internal; - av_packet_unref(ctx->internal->buffer_pkt); + bsfi->eof = 0; + + av_packet_unref(bsfi->buffer_pkt); if (ctx->filter->flush) ctx->filter->flush(ctx); @@ -185,26 +189,27 @@ void av_bsf_flush(AVBSFContext *ctx) int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) { + AVBSFInternal *bsfi = ctx->internal; int ret; if (!pkt || (!pkt->data && !pkt->side_data_elems)) { - ctx->internal->eof = 1; + bsfi->eof = 1; return 0; } - if (ctx->internal->eof) { + if (bsfi->eof) { av_log(ctx, AV_LOG_ERROR, "A non-NULL packet sent after an EOF.\n"); return AVERROR(EINVAL); } - if (ctx->internal->buffer_pkt->data || - ctx->internal->buffer_pkt->side_data_elems) + if (bsfi->buffer_pkt->data || + bsfi->buffer_pkt->side_data_elems) return AVERROR(EAGAIN); ret = av_packet_make_refcounted(pkt); if (ret < 0) return ret; - av_packet_move_ref(ctx->internal->buffer_pkt, pkt); + av_packet_move_ref(bsfi->buffer_pkt, pkt); return 0; } @@ -216,38 +221,38 @@ int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt) int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt) { - AVBSFInternal *in = ctx->internal; + AVBSFInternal *bsfi = ctx->internal; AVPacket *tmp_pkt; - if (in->eof) + if (bsfi->eof) return AVERROR_EOF; - if (!ctx->internal->buffer_pkt->data && - !ctx->internal->buffer_pkt->side_data_elems) + if (!bsfi->buffer_pkt->data && + !bsfi->buffer_pkt->side_data_elems) return AVERROR(EAGAIN); tmp_pkt = av_packet_alloc(); if (!tmp_pkt) return AVERROR(ENOMEM); - *pkt = ctx->internal->buffer_pkt; - ctx->internal->buffer_pkt = tmp_pkt; + *pkt = bsfi->buffer_pkt; + bsfi->buffer_pkt = tmp_pkt; return 0; } int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt) { - AVBSFInternal *in = ctx->internal; + AVBSFInternal *bsfi = ctx->internal; - if (in->eof) + if (bsfi->eof) return AVERROR_EOF; - if (!ctx->internal->buffer_pkt->data && - !ctx->internal->buffer_pkt->side_data_elems) + if (!bsfi->buffer_pkt->data && + !bsfi->buffer_pkt->side_data_elems) return AVERROR(EAGAIN); - av_packet_move_ref(pkt, ctx->internal->buffer_pkt); + av_packet_move_ref(pkt, bsfi->buffer_pkt); return 0; }