From patchwork Sun Mar 29 11:13:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18487 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 0D24244927C for ; Sun, 29 Mar 2020 14:14:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFEE668B5AB; Sun, 29 Mar 2020 14:14:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC6F768B50A for ; Sun, 29 Mar 2020 14:14:09 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id f74so6950083wmf.0 for ; Sun, 29 Mar 2020 04:14:09 -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=gnt1D1Nx3pRs5xwn7Ny7Gb/1M9XmdEIeIVHXA38Zf1s=; b=uSWN0LEtiE92q/p0pu7Q9SKpHE3P7f4LnbJNhd0RB13/gGjbNQXy4OGZC/WK0qBTwE szDCncg6LOxF+yxRMOt6DwyR1CEXBq0BY7ircgcWbpQ19uEaS+QmeN7iuFYYShnuiwBi mfYChtvs5Nna/Ih80I1pQpeHdHT2edXIWoFUMnwqLwXdWdCiQ+H9kP+ZRaZ7iJmovlLC x/qwznPouRm/ElXl74muMQNIAmN7Hk/zzSG7dhgYZiGngmDxcJ2tjURpMyimYY3U46Iq oeGd++v9hpsjosTVGfHhar6vjrReg9rloVWj5dLHkHP6+0iljwMWq438OvRWjvL7ej85 /F8w== 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=gnt1D1Nx3pRs5xwn7Ny7Gb/1M9XmdEIeIVHXA38Zf1s=; b=tvf4cUA6UhdNeIdQoF0tXUUujrbMX1efajHPgv4edaNdok7T5MbqAYBM/ado8xdxpA PrzNy3MJGqZo55LypZTG3UHjmYeWofiTp2U+Kji3SOs1bNxb/SEupahz/sfYl6UrVLsP 6NSYQ8TaeBf257SiA+PXYYnAmtMS5WXaILuNAvLq7LwXh+ziCiYS3BRg7YlilVJHbtNt Mppxav6VHiW2CSHwUQWNVu+xDnlSz8W85SAJod+82i6ZtriyK0J5/oVz9jeQJURtjEYv DJvio/nqbPYlvSi6WYHE8KsdB2hIndBbLqRToWFe4oPefYt2iM0wxXl1pB1CMNQHXuYL c64A== X-Gm-Message-State: ANhLgQ3mvaJWCYnT345E92orVtthwHXrUomND+nuj3CT9MVh+0D33tMF 93ZVIXNyIUC2HCw4YWN/JWTpnu+K X-Google-Smtp-Source: ADFU+vsxJbu6ZDA6IHiAyEnPJEaMl1Qb2XfuX+jqrP6l/yTVS9AeseB0MsIe5NGb7ORC8hgu5XDV7g== X-Received: by 2002:a1c:9693:: with SMTP id y141mr7902492wmd.23.1585480448784; Sun, 29 Mar 2020 04:14:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id f12sm16122672wmh.4.2020.03.29.04.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 04:14:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Mar 2020 13:13:25 +0200 Message-Id: <20200329111325.2686-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200329111325.2686-1-andreas.rheinhardt@gmail.com> References: <20200329111325.2686-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] 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" This is mainly about improving legibility of the code and getting rid of overlong lines by using variables for st->codecpar instead of accessing the codec parameters via st->codecpar->. Also, some code has been moved to better fitting places. Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 75 +++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index c934615c54..8b1e185817 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -91,6 +91,7 @@ static int smacker_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; SmackerContext *smk = s->priv_data; AVStream *st; + AVCodecParameters *par; uint32_t magic, width, height, flags, treesize; int i, ret, pts_inc; int tbase; @@ -129,6 +130,7 @@ static int smacker_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); + smk->videoindex = st->index; /* Smacker uses 100000 as internal timebase */ if (pts_inc < 0) pts_inc = -pts_inc; @@ -137,23 +139,28 @@ static int smacker_read_header(AVFormatContext *s) tbase = 100000; av_reduce(&tbase, &pts_inc, tbase, pts_inc, (1UL << 31) - 1); avpriv_set_pts_info(st, 33, pts_inc, tbase); + st->duration = smk->frames; /* init video codec */ - st->codecpar->width = width; - st->codecpar->height = height; - st->codecpar->codec_tag = magic; - - if ((ret = ff_alloc_extradata(st->codecpar, treesize + 16)) < 0) { + par = st->codecpar; + par->width = width; + par->height = height; + par->format = AV_PIX_FMT_PAL8; + par->codec_type = AVMEDIA_TYPE_VIDEO; + par->codec_id = AV_CODEC_ID_SMACKVIDEO; + par->codec_tag = magic; + + if ((ret = ff_alloc_extradata(par, treesize + 16)) < 0) { av_log(s, AV_LOG_ERROR, "Cannot allocate %"PRIu32" bytes of extradata\n", treesize + 16); return ret; } - if ((ret = ffio_read_size(pb, st->codecpar->extradata, 16)) < 0) + if ((ret = ffio_read_size(pb, par->extradata, 16)) < 0) return ret; /* handle possible audio streams */ - for(i = 0; i < 7; i++) { + for (i = 0; i < 7; i++) { uint32_t rate = avio_rl24(pb); uint8_t aflag = avio_r8(pb); @@ -161,40 +168,44 @@ static int smacker_read_header(AVFormatContext *s) if (rate) { AVStream *ast = avformat_new_stream(s, NULL); + AVCodecParameters *par; if (!ast) return AVERROR(ENOMEM); smk->indexes[i] = ast->index; - ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + par = ast->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; if (aflag & SMK_AUD_BINKAUD) { - ast->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_RDFT; + par->codec_id = AV_CODEC_ID_BINKAUDIO_RDFT; } else if (aflag & SMK_AUD_USEDCT) { - ast->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_DCT; + par->codec_id = AV_CODEC_ID_BINKAUDIO_DCT; } else if (aflag & SMK_AUD_PACKED) { - ast->codecpar->codec_id = AV_CODEC_ID_SMACKAUDIO; - ast->codecpar->codec_tag = MKTAG('S', 'M', 'K', 'A'); + par->codec_id = AV_CODEC_ID_SMACKAUDIO; + par->codec_tag = MKTAG('S', 'M', 'K', 'A'); } else { - ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8; + par->codec_id = AV_CODEC_ID_PCM_U8; } if (aflag & SMK_AUD_STEREO) { - ast->codecpar->channels = 2; - ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + par->channels = 2; + par->channel_layout = AV_CH_LAYOUT_STEREO; } else { - ast->codecpar->channels = 1; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + par->channels = 1; + par->channel_layout = AV_CH_LAYOUT_MONO; } - ast->codecpar->sample_rate = rate; - ast->codecpar->bits_per_coded_sample = (aflag & SMK_AUD_16BITS) ? 16 : 8; - if (ast->codecpar->bits_per_coded_sample == 16 && - ast->codecpar->codec_id == AV_CODEC_ID_PCM_U8) - ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; - avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate - * ast->codecpar->channels * ast->codecpar->bits_per_coded_sample / 8); + par->sample_rate = rate; + par->bits_per_coded_sample = (aflag & SMK_AUD_16BITS) ? 16 : 8; + if (par->bits_per_coded_sample == 16 && + par->codec_id == AV_CODEC_ID_PCM_U8) + par->codec_id = AV_CODEC_ID_PCM_S16LE; + avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->channels + * par->bits_per_coded_sample / 8); } } + avio_rl32(pb); /* padding */ + /* setup data */ - smk->frm_size = av_malloc_array(smk->frames, sizeof(*smk->frm_size)); + smk->frm_size = av_malloc_array(smk->frames, sizeof(*smk->frm_size)); smk->frm_flags = av_malloc(smk->frames); if (!smk->frm_size || !smk->frm_flags) { av_freep(&smk->frm_size); @@ -203,22 +214,16 @@ static int smacker_read_header(AVFormatContext *s) } /* read frame info */ - for(i = 0; i < smk->frames; i++) { + for (i = 0; i < smk->frames; i++) { smk->frm_size[i] = avio_rl32(pb); } - for(i = 0; i < smk->frames; i++) { + for (i = 0; i < smk->frames; i++) { smk->frm_flags[i] = avio_r8(pb); } - smk->videoindex = st->index; - st->codecpar->format = AV_PIX_FMT_PAL8; - st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - st->codecpar->codec_id = AV_CODEC_ID_SMACKVIDEO; - st->duration = smk->frames; - /* load trees to extradata, they will be unpacked by decoder */ - ret = avio_read(pb, st->codecpar->extradata + 16, st->codecpar->extradata_size - 16); - if(ret != st->codecpar->extradata_size - 16){ + ret = avio_read(pb, par->extradata + 16, par->extradata_size - 16); + if (ret != par->extradata_size - 16) { av_freep(&smk->frm_size); av_freep(&smk->frm_flags); return AVERROR(EIO);