From patchwork Tue Mar 24 11:05:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18380 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 7187A449B4E for ; Tue, 24 Mar 2020 13:12:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AE1568B844; Tue, 24 Mar 2020 13:12:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB52E68B838 for ; Tue, 24 Mar 2020 13:11:56 +0200 (EET) Received: by mail-oi1-f194.google.com with SMTP id k9so5445303oia.8 for ; Tue, 24 Mar 2020 04:11:56 -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=18od/1F9VKZ0w6lL8bPxPeljmvLACUfeoSOKTWJJ0LI=; b=gqkHghnevkliT1Gl5af1raeL1YUo6Vo2STeyjWY4RtV9Jxv40EThMC5dLRECod1ddF RfywFDuVSBT1QisjsQgvEOCULOW4Fv6NPUZjTTAbRszvDGHy4365dht9Y/FroiDw09DK +S/DDO22XjztY/43p3AvCWd0Mr5CMbKcRuqdz/drP4gBPfePHVNE5EP08MoHm+3tQqKc QhINqVxZQUiOAcnwoIPkGP3tLK4zCC1qe/D5utfppzWBtJUCTw5izGwfc3dJkyWKP6+7 y424YGI5Bq7J9AUCG9MjnLtx3QqYtBY1HgEIbNV172BtdeOz+pWigBHJSvRX6Yp/PPg5 HtOw== 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=18od/1F9VKZ0w6lL8bPxPeljmvLACUfeoSOKTWJJ0LI=; b=a0+6XlA32PwPF59O+tJ3e3r+jbItoMdWnr+Foh24RyY5vjeZKWShVPFvCWT5TZuAI0 ALFjzg23QNrT9Rzz+MuMJX+XEjdbGBWOCbnIcHQTiuJithYRgYEGurzp6wbvzf3p5mNl Fn4ZzIgMxh4+Ll6FIh9w1v73y+n6o6ECIuCbL74TZcJhJCMSDiU/W3pRluv3Uqk6uR0u Np8i7megoC/Zqv7czuFlYxgJcP41cCI+oOCOYMD1pHiH36vUnH8Sdp19nePwyK+fBRlH U/o7GGiEVsk5+24JwIpIgqHxPmMg39VvOVoDRkwbr+2qVxYQXb8EdFuEmJWLvkMjdi5U QUOg== X-Gm-Message-State: ANhLgQ07+WxmSJQzJ2H+VvTuo7RXWxacXnpPZIwJQf7WPaUcX8XtDbuA xAWJvx5+3h0AbT/SDLYix4h7WyXC X-Google-Smtp-Source: ADFU+vuipCtOu4L9LH49REnCqP7yBjEQDpRMMerHX3tHyC8gnOBjO1slPLI6bLqRsRfs8OnGExrm/w== X-Received: by 2002:a17:90a:2149:: with SMTP id a67mr4799500pje.190.1585047928732; Tue, 24 Mar 2020 04:05:28 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j17sm15803936pfd.175.2020.03.24.04.05.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2020 04:05:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Mar 2020 19:05:19 +0800 Message-Id: <20200324110519.15266-4-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 4/4] avcodec/dvbsubdec: 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/dvbsubdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 6e7e13b6eb..f63a1f3bf6 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1610,7 +1610,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf, } static int dvbsub_decode(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_sub_ptr, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -1668,7 +1668,7 @@ static int dvbsub_decode(AVCodecContext *avctx, int ret = 0; switch (segment_type) { case DVBSUB_PAGE_SEGMENT: - ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, data_size); + ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, got_sub_ptr); got_segment |= 1; break; case DVBSUB_REGION_SEGMENT: @@ -1690,7 +1690,7 @@ static int dvbsub_decode(AVCodecContext *avctx, got_dds = 1; break; case DVBSUB_DISPLAY_SEGMENT: - ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, data_size); + ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, got_sub_ptr); if (got_segment == 15 && !got_dds && !avctx->width && !avctx->height) { // Default from ETSI EN 300 743 V1.3.1 (7.2.1) avctx->width = 720; @@ -1713,12 +1713,12 @@ static int dvbsub_decode(AVCodecContext *avctx, // segments then we need no further data. if (got_segment == 15) { av_log(avctx, AV_LOG_DEBUG, "Missing display_end_segment, emulating\n"); - dvbsub_display_end_segment(avctx, p, 0, sub, data_size); + dvbsub_display_end_segment(avctx, p, 0, sub, got_sub_ptr); } end: if(ret < 0) { - *data_size = 0; + *got_sub_ptr = 0; avsubtitle_free(sub); return ret; } else {