From patchwork Tue Mar 24 11:05:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18381 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 1B79344A57E for ; Tue, 24 Mar 2020 13:36:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E604B68B844; Tue, 24 Mar 2020 13:36:04 +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 2FF7768B839 for ; Tue, 24 Mar 2020 13:35:58 +0200 (EET) Received: by mail-io1-f67.google.com with SMTP id q128so17689280iof.9 for ; Tue, 24 Mar 2020 04:35:58 -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; bh=WXRZDyb+HGhpuQK1K+cfDi+gMuHeLG9N/8mVSPwxZz4=; b=u7pCssVzIbnG3WvQzW3ThBhXMNWS4JlXnXxzuAzhfxxBOcUYMkG84n9uKI9JMhQNAU +tRpkHAU8DTOxDgMzpz0VHex/Sb5VsD6sckWw4LGrKkhAdE9v5Qbuy3vd4UTf8WVr0VF qNTxGXwrwMIWs2JIuf1kR50v9yT4qQv+292tPhwXOQq/4AIAptjLveGUDdjyANYSm6Xo GAMvSQE93QTRSC8c0H1fXZ9yuK1y0wtkBdOxcSnMnXasN3iQ6w5rg1pBPIwLIMsjIWlJ 7Z0Hi3xtULL2MUVlFVdytthJw3WriqebZ0Xw7cp4F6lrUmuJ8HJhxi8anICfW11uc6qS 30FA== 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=WXRZDyb+HGhpuQK1K+cfDi+gMuHeLG9N/8mVSPwxZz4=; b=mhF5ilTLhmBWnpV2jFymkJ/D/dfj/XT++J8kHV0nWiFFjX8ygv2rTEaOrR0b+lRQDb pBEOJD8ct2cHm4CZQzAybnCPL6BkNhVya4OSpsWv+68tkkdzWDkk2jfvR46D3g7/ssMh rh/5MrTtsRji+1Gb6lBfK0ma9xAW3PB9gsdsoUPlpLL0N878D0cTfHx1zREPmdVfqRHW HsgCw9ad1Kz5cj9lMaea6u1s6CQLxydA8XW4/jfBqgltyYPBZ+MZl6qkWiD0+LPBYqZE H6U8gNOtinmz4GbHDKZYbO9nn/0ZQZUt5iiGeo7ilADkp9Qvs3IPpzg7jrOorSmseR58 AfRQ== X-Gm-Message-State: ANhLgQ0VvjbEuH7OC27mfG5zZagZL8HtvxmJY7kh9DHakK0mOFbU8KRz y5AlJ4PpXI19mk01/F9sHNHbIWCU X-Google-Smtp-Source: ADFU+vvHU2nK/0t4Pk4b54sRABne1Ioy5No5Wl6GmtmlJgU7uzSYEQ/b293IT+2OUT6UhqmLCIDfXw== X-Received: by 2002:a63:f54d:: with SMTP id e13mr23737199pgk.157.1585047924369; Tue, 24 Mar 2020 04:05:24 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j17sm15803936pfd.175.2020.03.24.04.05.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2020 04:05:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Mar 2020 19:05:16 +0800 Message-Id: <20200324110519.15266-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/4] avcodec/xsubdec: 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/xsubdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 05c4a64ee5..c1c6e11dc3 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -46,7 +46,7 @@ static int64_t parse_timecode(const uint8_t *buf, int64_t packet_time) { return ms - packet_time; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, +static int decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -169,7 +169,7 @@ FF_ENABLE_DEPRECATION_WARNINGS bitmap += w; align_get_bits(&gb); } - *data_size = 1; + *got_sub_ptr = 1; return buf_size; } 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; } From patchwork Tue Mar 24 11:05:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18379 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 1903B448FCC for ; Tue, 24 Mar 2020 13:11:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7DEE68B836; Tue, 24 Mar 2020 13:11:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D37768B813 for ; Tue, 24 Mar 2020 13:11:52 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id u12so8849457pgb.10 for ; Tue, 24 Mar 2020 04:11:52 -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=eN8QubietUwNr29S5Z0+etm61ofzUZRsB14Gf7L1sQs=; b=ry+xHJQ3626KnpcDIArPP92JrsOUP9eP6IYnvpfxfJLxoU1faCYjyjBmM3OROc30zf BDuQhqVJwTbAVbqeXOgDV5eeBQHn/2U5pz4r6e1gQvSVZa/JaOI1bcubHEhUODvorW8M ePW9FeiJQDNYuWHIxZT8Xe97Ml90MJDgyCDU5qB0HW68grVgsBrTEiQwFIjrSuOgyo0N O83ith1Dq3yPFAGZOf9V2QDzSuouIQOco1wj4HvilH6ZuoAZ+ahR2ld9YAnh364muWUx edrVlUPSOVQUgkkwe6IYGxkJSrT48228bFrvY5YblADqFq18VeMfbaTutdxDUdHgyBiB 0sig== 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=eN8QubietUwNr29S5Z0+etm61ofzUZRsB14Gf7L1sQs=; b=S+DlU4neTO3U87wer940oW82/a+gz/pw1BEKqrCg9aN9faL5DIUknO0/hjmR19GRM1 CMTmxULC9wATP3tkmnJTZMvNjL9XtjokPxBKPeaxYJB/wuZWh8CWNo2vOAq+R8mNVcuI 3oo5Nw0AEhrReANd3TXZM+2fNh855O1rIA7VnVdZx7HCwsh4DfewrT+cvAo5j3N00erM IGb6XMHN+TMzmyiNxrxGtT8gEpJrz7bs/d6LHfjXFTu9XcFMgXZOcYgPexbe6xPEe5E9 HbBoefQ1IZrMH/EZDkHMfcKqP/b1MktYkhON3Rx3Zmi8qMimbdmZRO710vzMM6HlY08Q V3mg== X-Gm-Message-State: ANhLgQ09s1XytVbFnAjZ4B1mvXHi9TRaxQg5UB7/KaOsxOhG/ncdmToz gvwqAC0q05uf0WUKZUZYh4LqBjRH X-Google-Smtp-Source: ADFU+vvRk44f5uJMH2A4Juc6RMyEIV9WDEaefyaYaSXuYx0OZ9XXt6yHSnbQ//qt2M5c0k42n0LE5Q== X-Received: by 2002:a63:195a:: with SMTP id 26mr24923794pgz.400.1585047927107; Tue, 24 Mar 2020 04:05:27 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j17sm15803936pfd.175.2020.03.24.04.05.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2020 04:05:26 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Mar 2020 19:05:18 +0800 Message-Id: <20200324110519.15266-3-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 3/4] avcodec/libzvbi-teletextdec: 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/libzvbi-teletextdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index fe6504ff8a..8031b02286 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -636,7 +636,7 @@ static int slice_to_vbi_lines(TeletextContext *ctx, uint8_t* buf, int size) return lines; } -static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *pkt) +static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, AVPacket *pkt) { TeletextContext *ctx = avctx->priv_data; AVSubtitle *sub = data; @@ -724,9 +724,9 @@ FF_ENABLE_DEPRECATION_WARNINGS ctx->nb_pages--; if (ret >= 0) - *data_size = 1; + *got_sub_ptr = 1; } else - *data_size = 0; + *got_sub_ptr = 0; return ret; } 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 {