From patchwork Wed Jun 24 13:47:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20583 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 D9D4344B3C4 for ; Wed, 24 Jun 2020 16:54:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C434468B64A; Wed, 24 Jun 2020 16:54:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FC1C68B5CC for ; Wed, 24 Jun 2020 16:53:51 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id a6so4574087wmm.0 for ; Wed, 24 Jun 2020 06:53:51 -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 :mime-version:content-transfer-encoding; bh=LP1kmcFH29TADsIZmgcgyFWeL44jM4EyRvPtKjghyNQ=; b=XHO2JeIw9uESL1zWmkcqsvLznIFx5wRfZrq89N7ABCJuGlUFN/+nyBGBzHtOi5GPs3 xMavgvf44DLSEjbyC7OCl7IgkCJw+fydsLWfr716dYgZzeCy5YfEfSyNOfnoK4HMuFPV HzhXP1vxgFDE8FqVAkT23IiQK1YUrcCqB9gvBL3sK0yTVJCC00WxTxVyf3CMi2kEBiFB rU8HT7vIGatkL41my0xMalukDnJW6ntoWtpASW+HobllKhZYeEdAMYuQv4Utk/ZY3GyR F8cGwi5KneyICMPzyJs+Iud5qYaoi91skb+bHMGBYGWYEob2whGfCYQBFlWAnvLKowWl NMcw== 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:mime-version:content-transfer-encoding; bh=LP1kmcFH29TADsIZmgcgyFWeL44jM4EyRvPtKjghyNQ=; b=CbVjbTUKlJB64+LWHxlwMSMoTH9FJ/G6gg51Q+wlT2slbCQcSQsV9dQEQ6lOVBTMio P0cDBaYWfcbequqpANQf2x2Yhqx6+G0eBxLugP7c3d/rsvVJVjRYnnYDKHNj7NLzrbfB 0dGcBRD7Za6HwStj1Fjg11q2GtwI45ZmtMsNaMimRpjdS2JLh1Rh0TfAwFTUn2RNZHqS rFEl9TxK0gUMV8oVS7SRobavEvmiHlV7b1X/lYm2/YTiV6niOX5g34oeErospPMLsyxs Ot0vQzk+lgJFi0ukv6QqkRtyZj3xFypngnRsvRSSwZq7NMki99rGkLvRjBQ2EdQQpmAq A3Ow== X-Gm-Message-State: AOAM530PmpH9zyvPmdeOFfNIATEfFUOc+0S5MjlKoweb7ocYoEZu0uP0 PjbToSBmiqJKFqo7/iB3Z0urkRQu X-Google-Smtp-Source: ABdhPJygJrCUvaGwJmi3I1uiWL5evye+TorKjaLy1OFWX1AK66J7Ow0uQVOGOMtRaxWbVIr11143zw== X-Received: by 2002:a1c:620a:: with SMTP id w10mr10728943wmb.39.1593006830724; Wed, 24 Jun 2020 06:53:50 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id y25sm8172390wma.19.2020.06.24.06.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 06:53:49 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jun 2020 15:47:05 +0200 Message-Id: <20200624134705.14833-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200624134705.14833-1-andreas.rheinhardt@gmail.com> References: <20200624134705.14833-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 9/9] avformat/smacker: Cosmetics 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Mainly reindentation. Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 60 +++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 2e4a499a13..0ca5a87b8f 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -50,14 +50,14 @@ typedef struct SmackerContext { /* internal variables */ int64_t next_frame_pos; int cur_frame; + int videoindex; + int indexes[7]; /* current frame for demuxing */ uint32_t frame_size; int flags; int next_audio_index; int new_palette; uint8_t pal[768]; - int indexes[7]; - int videoindex; int64_t aud_pts[7]; } SmackerContext; @@ -226,7 +226,6 @@ static int smacker_read_header(AVFormatContext *s) return 0; } - static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) { SmackerContext *smk = s->priv_data; @@ -243,7 +242,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) flags = smk->frm_flags[smk->cur_frame]; smk->flags = flags >> 1; /* handle palette change event */ - if(flags & SMACKER_PAL){ + if (flags & SMACKER_PAL) { int size, sz, t, off, j, pos; uint8_t *pal = smk->pal; uint8_t oldpal[768]; @@ -258,12 +257,12 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) smk->frame_size -= size--; sz = 0; pos = avio_tell(s->pb) + size; - while(sz < 256){ + while (sz < 256) { t = avio_r8(s->pb); - if(t & 0x80){ /* skip palette entries */ - sz += (t & 0x7F) + 1; + if (t & 0x80) { /* skip palette entries */ + sz += (t & 0x7F) + 1; pal += ((t & 0x7F) + 1) * 3; - } else if(t & 0x40){ /* copy with offset */ + } else if (t & 0x40) { /* copy with offset */ off = avio_r8(s->pb); j = (t & 0x3F) + 1; if (off + j > 0x100) { @@ -274,7 +273,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) goto next_frame; } off *= 3; - while(j-- && sz < 256) { + while (j-- && sz < 256) { *pal++ = oldpal[off + 0]; *pal++ = oldpal[off + 1]; *pal++ = oldpal[off + 2]; @@ -295,16 +294,16 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) for (int i = smk->next_audio_index; i < 7; i++) { if (smk->flags & (1 << i)) { - uint32_t size; + uint32_t size; - size = avio_rl32(s->pb); + size = avio_rl32(s->pb); if ((int)size < 8 || size > smk->frame_size) { - av_log(s, AV_LOG_ERROR, "Invalid audio part size\n"); - ret = AVERROR_INVALIDDATA; - goto next_frame; - } + av_log(s, AV_LOG_ERROR, "Invalid audio part size\n"); + ret = AVERROR_INVALIDDATA; + goto next_frame; + } smk->frame_size -= size; - size -= 4; + size -= 4; if (smk->indexes[i] < 0) { avio_skip(s->pb, size); @@ -312,36 +311,35 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } if ((ret = av_get_packet(s->pb, pkt, size)) != size) { ret = ret < 0 ? ret : AVERROR_INVALIDDATA; - goto next_frame; - } + goto next_frame; + } pkt->stream_index = smk->indexes[i]; pkt->pts = smk->aud_pts[i]; smk->aud_pts[i] += AV_RL32(pkt->data); smk->next_audio_index = i + 1; return 0; - } } + } if (smk->frame_size >= INT_MAX/2) { - ret = AVERROR_INVALIDDATA; - goto next_frame; - } + ret = AVERROR_INVALIDDATA; + goto next_frame; + } if ((ret = av_new_packet(pkt, smk->frame_size + 769)) < 0) - goto next_frame; + goto next_frame; flags = smk->new_palette; - if(smk->frm_size[smk->cur_frame] & 1) + if (smk->frm_size[smk->cur_frame] & 1) flags |= 2; pkt->data[0] = flags; - memcpy(pkt->data + 1, smk->pal, 768); + memcpy(pkt->data + 1, smk->pal, 768); ret = ffio_read_size(s->pb, pkt->data + 769, smk->frame_size); - if (ret < 0) - goto next_frame; - pkt->stream_index = smk->videoindex; - pkt->pts = smk->cur_frame; - pkt->size = ret + 769; + if (ret < 0) + goto next_frame; + pkt->stream_index = smk->videoindex; + pkt->pts = smk->cur_frame; smk->next_audio_index = 0; smk->new_palette = 0; - smk->cur_frame++; + smk->cur_frame++; return 0; next_frame: