From patchwork Tue Mar 24 11:05:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18378 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 C5FA44401FD for ; Tue, 24 Mar 2020 13:05:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1EF668B757; Tue, 24 Mar 2020 13:05:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0B6C68B753 for ; Tue, 24 Mar 2020 13:05:27 +0200 (EET) Received: by mail-pf1-f179.google.com with SMTP id d25so9094487pfn.6 for ; Tue, 24 Mar 2020 04:05:27 -0700 (PDT) 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=/6SefYa9aqCwhvqwzEZr0HkGMdeexBlhAtXIeDjSZTc=; b=XkBJXhJRXFzcRuDyt0fTidgLLDdB7ZDc+I8JFdcGi144FxKiwjlz37GJ5fwgkOjp8s tV81gunKOxO/iI0CKy2p5jMIKkCnNGLNjzpJEQ2ZWaVhLZGi+qPZli8jrIoaWf+0ALcf VkKpjlkqnQmFvSxG1QawcGChgklrQ1+iIX6I5JgmWPloWGB6ejH+ZoSb+Uc1VF2DGa12 fp5162ym3GXX0P2Gwcc10LR59F4FGxDeWL+RMSS8AkHTCWx9V8WR9gh3fX0BAlY58KWh GtsEcc2Ab6T29pIQ1bwDxYGZrvfpZykC9poDjcXbXLxuqvYutIGkCdANH7Iimc32LyGZ 7tjQ== 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=/6SefYa9aqCwhvqwzEZr0HkGMdeexBlhAtXIeDjSZTc=; b=Gm5QXr2JVkeFj3js4uG+gH6jRUUNoeT4BuPash5XEw42kt/AoSuRl8ptvYJG7ZwtEG M6Zzg5YUd1hBMH0WTDnWEJWnwEcokmCPw+6GefzAUFvvYutbAXZamH/ZF/emSQEPg9Tk g7l07je1oy8/UR2nnmMgfQojm0dzsYLuGdts6gHk1Hp8JAGALFx5Nla6t8zm8GYQZmuw uXpkwCevHwqzVgUJLgyS4duMyPq59RSsLRgm4ItRMlCc/pkC2wydwh/WueZImPV5I9t8 e3vc4+H5UrT572E3+/nkjk7Cd2nDHZJ82YQ9/NOweleXk/EblYkdUos4mr+QD+5Ctr/w XwBw== X-Gm-Message-State: ANhLgQ0Yq+Jg15q0HOjzPfjOFaP84H3HH/qZeJSd2/A7RmzmcRlj+a98 5axhV4LFU/5VJL8GmCjr03QF7MTR X-Google-Smtp-Source: ADFU+vutpSqglau8OHFoufk1M5SlsyL+AjVtGL+Nrsnt0z+UEg+BrHL+yKrL3CRJX/XQXOULru906w== X-Received: by 2002:a63:cc0d:: with SMTP id x13mr25556362pgf.388.1585047925750; Tue, 24 Mar 2020 04:05:25 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j17sm15803936pfd.175.2020.03.24.04.05.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2020 04:05:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Mar 2020 19:05:17 +0800 Message-Id: <20200324110519.15266-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200324110519.15266-1-lance.lmwang@gmail.com> References: <20200324110519.15266-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/4] avcodec/pgssubdec: replace data_size with got_sub_ptr 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/pgssubdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 7fadcb8b4b..9c59a2297f 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -614,7 +614,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return 1; } -static int decode(AVCodecContext *avctx, void *data, int *data_size, +static int decode(AVCodecContext *avctx, void *data, int *got_sub_ptr, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -636,7 +636,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, if (i & 15) ff_dlog(avctx, "\n"); - *data_size = 0; + *got_sub_ptr = 0; /* Ensure that we have received at a least a segment code and segment length */ if (buf_size < 3) @@ -676,14 +676,14 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, */ break; case DISPLAY_SEGMENT: - if (*data_size) { + if (*got_sub_ptr) { av_log(avctx, AV_LOG_ERROR, "Duplicate display segment\n"); ret = AVERROR_INVALIDDATA; break; } ret = display_end_segment(avctx, data, buf, segment_length); if (ret >= 0) - *data_size = ret; + *got_sub_ptr = ret; break; default: av_log(avctx, AV_LOG_ERROR, "Unknown subtitle segment type 0x%x, length %d\n", @@ -693,7 +693,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, } if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) { avsubtitle_free(data); - *data_size = 0; + *got_sub_ptr = 0; return ret; }