From patchwork Sat Mar 21 06:31:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18316 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 2315A449B21 for ; Sat, 21 Mar 2020 08:32:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C70368B7D6; Sat, 21 Mar 2020 08:32:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F00CB68B7A1 for ; Sat, 21 Mar 2020 08:31:53 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id a9so5581706wmj.4 for ; Fri, 20 Mar 2020 23:31:53 -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=5oqkpAQTfr0l2QZr1Jn9QhxmzuXR+Yp+yKm4SMXy/Kw=; b=S3D9rSJX7u7owg4gBEWOb5QZaG2sTEd40E/gWH/J8MumcmVpl1xyL3CBX/xwHsA+3V WSJ81i2nKuu7txu4JMursowHeOBo6kouO5rRyGJBv2uU7sge26XVsbkr9nCfg7ewFQe2 hasFJAm3xWoiR3Y0C9RjAq7q/A2b5Tpy2OQO+cdSNu3WNqdw+cYk0+kjFIGPQFQGWRMt rSmeu9lF8Hp9mBaTjqU7Oy2XuB7XLu3THKyy4mgnwOBQm8ZbRwvlPSNdp1loKYdw97t3 V6dDHlnkaPwVdFB6hsde6wQi9Sl/wIylNw4WgZmo+maKWn5RUkh8mdKOig8qN3ZVNixR cbGg== 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=5oqkpAQTfr0l2QZr1Jn9QhxmzuXR+Yp+yKm4SMXy/Kw=; b=fWdGV4Id/GTUFQoWeJTdEu50fcNCPJscPzqbv7F1dhNZiS8IIXy37b8Mc3MH+jTaAH AZUISEiiBTLcS4MvdtBFRuvDd0nSMnff+KjmyIEALonF1LAttw2DXn9aRf4BiqNy3gTp E8I6BabAqZ6DZ8MoU4Q+M22Xb9+h2ZGPZ4utC9dknt/S7geff35Wcg2bu3OByk1Mj1kM fvRYrRaufHJ+CVS4zV7ArDAUe7dteFVsD5pRvW47aVdhHssGB+NcAI3ikLjiMAQKqCG1 0s6LNCNLMbdIUVd3T3rmcHGSU7dL+j0oo2q5RLMBqco7qFv+V8QSobGaT5TMSlAt00Ih ICQw== X-Gm-Message-State: ANhLgQ0U8v50tihzWXOdV6QO8omlvnMDx0jJpIeiCZ/AsdQxDf+/HEov ydQg27NOpoou1T8lMc9qyn6Gp+OL X-Google-Smtp-Source: ADFU+vt4rbYRMwHpEb32B3aRjbjrEzW8hO2JSBoAAABJ8phIPe//qFEtHLjUyiX5IvjemHretiAp/Q== X-Received: by 2002:a7b:c4d6:: with SMTP id g22mr14739967wmk.79.1584772313105; Fri, 20 Mar 2020 23:31:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k3sm11281487wro.59.2020.03.20.23.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 23:31:52 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Mar 2020 07:31:18 +0100 Message-Id: <20200321063118.6790-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200321063118.6790-1-andreas.rheinhardt@gmail.com> References: <20200321063118.6790-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hnm: Only keep and parse 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" The hnm demuxer's context struct contained lots of fields that are write-only variables or that are not used outside of parsing the header and that can therefore be replaced by local variables of hnm_read_header(). This commit removes all of these from the context; the second type has been replaced by local variables. An AVPacket (that was initialized when reading the header and for which dead code to unreference it existed in hnm_read_close()) is among the removed things. Removing it allowed to remove hnm_read_close() altogether and also removes another instance of usage of sizeof(AVPacket). Signed-off-by: Andreas Rheinhardt --- libavformat/hnm.c | 63 +++++++++-------------------------------------- 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/libavformat/hnm.c b/libavformat/hnm.c index 31221553a4..f06add5cf8 100644 --- a/libavformat/hnm.c +++ b/libavformat/hnm.c @@ -37,19 +37,9 @@ #define HNM4_CHUNK_ID_SD 17491 typedef struct Hnm4DemuxContext { - uint8_t version; - uint16_t width; - uint16_t height; - uint32_t filesize; uint32_t frames; - uint32_t taboffset; - uint16_t bits; - uint16_t channels; - uint32_t framesize; uint32_t currentframe; - int64_t pts; uint32_t superchunk_remaining; - AVPacket vpkt; } Hnm4DemuxContext; static int hnm_probe(const AVProbeData *p) @@ -69,55 +59,37 @@ static int hnm_read_header(AVFormatContext *s) { Hnm4DemuxContext *hnm = s->priv_data; AVIOContext *pb = s->pb; + unsigned width, height; AVStream *vst; int ret; - /* default context members */ - hnm->pts = 0; - av_init_packet(&hnm->vpkt); - hnm->vpkt.data = NULL; - hnm->vpkt.size = 0; - - hnm->superchunk_remaining = 0; - avio_skip(pb, 8); - hnm->width = avio_rl16(pb); - hnm->height = avio_rl16(pb); - hnm->filesize = avio_rl32(pb); + width = avio_rl16(pb); + height = avio_rl16(pb); + avio_rl32(pb); // filesize hnm->frames = avio_rl32(pb); - hnm->taboffset = avio_rl32(pb); - hnm->bits = avio_rl16(pb); - hnm->channels = avio_rl16(pb); - hnm->framesize = avio_rl32(pb); - avio_skip(pb, 32); + avio_skip(pb, 44); - hnm->currentframe = 0; - - if (hnm->width < 256 || hnm->width > 640 || - hnm->height < 150 || hnm->height > 480) { + if (width < 256 || width > 640 || + height < 150 || height > 480) { av_log(s, AV_LOG_ERROR, - "invalid resolution: %ux%u\n", hnm->width, hnm->height); + "invalid resolution: %ux%u\n", width, height); return AVERROR_INVALIDDATA; } - // TODO: find a better way to detect HNM4A - if (hnm->width == 640) - hnm->version = 0x4a; - else - hnm->version = 0x40; - if (!(vst = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; vst->codecpar->codec_id = AV_CODEC_ID_HNM4_VIDEO; vst->codecpar->codec_tag = 0; - vst->codecpar->width = hnm->width; - vst->codecpar->height = hnm->height; + vst->codecpar->width = width; + vst->codecpar->height = height; if ((ret = ff_alloc_extradata(vst->codecpar, 1)) < 0) return ret; - vst->codecpar->extradata[0] = hnm->version; + // TODO: find a better way to detect HNM4A + vst->codecpar->extradata[0] = width == 640 ? 0x4a : 0x40; vst->start_time = 0; @@ -186,16 +158,6 @@ static int hnm_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } -static int hnm_read_close(AVFormatContext *s) -{ - Hnm4DemuxContext *hnm = s->priv_data; - - if (hnm->vpkt.size > 0) - av_packet_unref(&hnm->vpkt); - - return 0; -} - AVInputFormat ff_hnm_demuxer = { .name = "hnm", .long_name = NULL_IF_CONFIG_SMALL("Cryo HNM v4"), @@ -203,6 +165,5 @@ AVInputFormat ff_hnm_demuxer = { .read_probe = hnm_probe, .read_header = hnm_read_header, .read_packet = hnm_read_packet, - .read_close = hnm_read_close, .flags = AVFMT_NO_BYTE_SEEK | AVFMT_NOGENSEARCH | AVFMT_NOBINSEARCH };