From patchwork Sun Mar 29 11:13:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18485 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 1E8EA44927C for ; Sun, 29 Mar 2020 14:14:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09A6268B53D; Sun, 29 Mar 2020 14:14:15 +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 8F47468B302 for ; Sun, 29 Mar 2020 14:14:07 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id z14so890649wmf.0 for ; Sun, 29 Mar 2020 04:14:07 -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=0a7nOSj3Q/89AA+g4AcE6Y5en4J29ChX65zjr0c9tG4=; b=UsQQiFiVih02yx4B6yF87VISrKeXDb9Fo7UvEg//B50jnWcLB4SD4ghhowy2bUwKA3 gLWoXNHrK72UXKLbmMvkGIwvhtrOeDlXg3Cl5VQ8tczEc9vQK+IIsqDNXAScwJAlCgzq KI2Ph4CiYFE1zzHBe/6gzfdZw9wY6uZnaIB+FT/9Tpw7ELf6E46dxXi0ayKAJ3eTZBv9 NJluw5+rQxSVHLa1UbjW9aqJL0fr8bS++TdF4vyXPnqB5YzTBQrlx+/au7GYnnGtAsYq k/A0P0A95SyJkyCuRcSWlacys0+ZMiTYxCuVQfLeXnj5EPStvEBo6NJ83FSqiD6SwD9q NFRg== 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=0a7nOSj3Q/89AA+g4AcE6Y5en4J29ChX65zjr0c9tG4=; b=JMaNYec5BWoKBWHZokwB94e7J+zIcP0IjTsYUDieFiMTbX4qyopS2Yi5USW1cLuMRL s4mxG1WIwUmnovlOqoii2wCiUBwb7OFe/6l5MbAOMsaeJ+JqvKdf300AN66sAV1M3dsZ 6Wvj2lrUbB7McXjctOp6fHXrSt75VxQFzk0HK5YSmrdU32EhXa8EPq86dvYn3Lrsm8oB eryL139fIW22q51YSdLUHmoHKtQ/i0qBw/8Dh1GilRrq4XeALsdNI7sbjiQQOcTtssym vgZwWlLpRbI3+NqOjCvT+PZHSKCuMQFETlANbOEMIqQEf+Ba+LNd4ajCIRzjB90RlTu9 IvgQ== X-Gm-Message-State: ANhLgQ3D8PAb+eED5eV9cpeiTPbFAU+Av+/Nj+djZbwpUY7ND1mRSunl Sw6NKsgASGVc3AMFJRPltgu9vzFD X-Google-Smtp-Source: ADFU+vtmnm3kbIzTJDpMzLDj56S8/XbhRQmCBeblFp3FzN/G0/xBXVIPalmOBmf3vV8QRYLVsyZr/Q== X-Received: by 2002:a1c:2489:: with SMTP id k131mr8270376wmk.86.1585480446606; Sun, 29 Mar 2020 04:14:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 04:14:05 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Mar 2020 13:13:23 +0200 Message-Id: <20200329111325.2686-3-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 3/5] avformat/smacker: Only store what is needed later 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 commit removes data that is only used during smacker_read_header() from the demuxer's context and replaces the data that is used by local variables. The other data is completely dropped. Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 74 +++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index b08f7bb4e6..1e8858dd4e 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -43,22 +43,12 @@ enum SAudFlags { }; typedef struct SmackerContext { - /* Smacker file header */ - uint32_t magic; - uint32_t width, height; uint32_t frames; - int pts_inc; - uint32_t flags; - uint32_t audio[7]; - uint32_t treesize; - uint32_t pad; /* frame info */ uint32_t *frm_size; uint8_t *frm_flags; /* internal variables */ int cur_frame; - int is_ver4; - int64_t cur_pts; /* current frame for demuxing */ uint8_t pal[768]; int indexes[7]; @@ -106,34 +96,36 @@ static int smacker_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; SmackerContext *smk = s->priv_data; AVStream *st; - int i, ret; + uint32_t magic, width, height, flags, treesize; + int i, ret, pts_inc; int tbase; /* read and check header */ - smk->magic = avio_rl32(pb); - if (smk->magic != MKTAG('S', 'M', 'K', '2') && smk->magic != MKTAG('S', 'M', 'K', '4')) + magic = avio_rl32(pb); + if (magic != MKTAG('S', 'M', 'K', '2') && magic != MKTAG('S', 'M', 'K', '4')) return AVERROR_INVALIDDATA; - smk->width = avio_rl32(pb); - smk->height = avio_rl32(pb); + width = avio_rl32(pb); + height = avio_rl32(pb); smk->frames = avio_rl32(pb); - smk->pts_inc = (int32_t)avio_rl32(pb); - if (smk->pts_inc > INT_MAX / 100) { - av_log(s, AV_LOG_ERROR, "pts_inc %d is too large\n", smk->pts_inc); + pts_inc = avio_rl32(pb); + if (pts_inc > INT_MAX / 100) { + av_log(s, AV_LOG_ERROR, "pts_inc %d is too large\n", pts_inc); return AVERROR_INVALIDDATA; } - smk->flags = avio_rl32(pb); - if(smk->flags & SMACKER_FLAG_RING_FRAME) + flags = avio_rl32(pb); + if (flags & SMACKER_FLAG_RING_FRAME) smk->frames++; if (smk->frames > 0xFFFFFF) { av_log(s, AV_LOG_ERROR, "Too many frames: %"PRIu32"\n", smk->frames); return AVERROR_INVALIDDATA; } - for(i = 0; i < 7; i++) - smk->audio[i] = avio_rl32(pb); - smk->treesize = avio_rl32(pb); - if(smk->treesize >= UINT_MAX/4){ // smk->treesize + 16 must not overflow (this check is probably redundant) + avio_skip(pb, 28); /* Unused audio related data */ + + treesize = avio_rl32(pb); + if (treesize >= UINT_MAX/4) { + // treesize + 16 must not overflow (this check is probably redundant) av_log(s, AV_LOG_ERROR, "treesize too large\n"); return AVERROR_INVALIDDATA; } @@ -142,10 +134,24 @@ static int smacker_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - if ((ret = ff_alloc_extradata(st->codecpar, smk->treesize + 16)) < 0) { + /* Smacker uses 100000 as internal timebase */ + if (pts_inc < 0) + pts_inc = -pts_inc; + else + pts_inc *= 100; + tbase = 100000; + av_reduce(&tbase, &pts_inc, tbase, pts_inc, (1UL << 31) - 1); + avpriv_set_pts_info(st, 33, pts_inc, tbase); + + /* 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) { av_log(s, AV_LOG_ERROR, "Cannot allocate %"PRIu32" bytes of extradata\n", - smk->treesize + 16); + treesize + 16); return ret; } if ((ret = ffio_read_size(pb, st->codecpar->extradata, 16)) < 0) @@ -191,7 +197,7 @@ static int smacker_read_header(AVFormatContext *s) * ast->codecpar->channels * ast->codecpar->bits_per_coded_sample / 8); } } - smk->pad = avio_rl32(pb); + avio_rl32(pb); /* padding */ /* setup data */ smk->frm_size = av_malloc_array(smk->frames, sizeof(*smk->frm_size)); smk->frm_flags = av_malloc(smk->frames); @@ -201,8 +207,6 @@ static int smacker_read_header(AVFormatContext *s) return AVERROR(ENOMEM); } - smk->is_ver4 = (smk->magic != MKTAG('S', 'M', 'K', '2')); - /* read frame info */ for(i = 0; i < smk->frames; i++) { smk->frm_size[i] = avio_rl32(pb); @@ -211,22 +215,10 @@ static int smacker_read_header(AVFormatContext *s) smk->frm_flags[i] = avio_r8(pb); } - /* init video codec */ smk->videoindex = st->index; - st->codecpar->width = smk->width; - st->codecpar->height = smk->height; st->codecpar->format = AV_PIX_FMT_PAL8; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = AV_CODEC_ID_SMACKVIDEO; - st->codecpar->codec_tag = smk->magic; - /* Smacker uses 100000 as internal timebase */ - if(smk->pts_inc < 0) - smk->pts_inc = -smk->pts_inc; - else - smk->pts_inc *= 100; - tbase = 100000; - av_reduce(&tbase, &smk->pts_inc, tbase, smk->pts_inc, (1UL<<31)-1); - avpriv_set_pts_info(st, 33, smk->pts_inc, tbase); st->duration = smk->frames; /* load trees to extradata, they will be unpacked by decoder */