From patchwork Sat Mar 21 03:30:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18312 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 E9D6D44B05E for ; Sat, 21 Mar 2020 05:30:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C15BB68B7A4; Sat, 21 Mar 2020 05:30:40 +0200 (EET) 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 AFEC468B4B1 for ; Sat, 21 Mar 2020 05:30:34 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id d198so2759561wmd.0 for ; Fri, 20 Mar 2020 20:30:34 -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=Rtc4VCLNcOtbYRt+kstCnNgCdd4gkHIxZIrMSbKfdjs=; b=AIThT0kXVG9s9MWi6KEPHNr6iNUsJ5Sa7bbCcsNuvj6jz82oGyahpVFhNrMZbjZTXH 6Ti74QPzQZzi9mxEccuE6BjO/7pl6T3lZ2LiISLJ8P4rVLNzertYJ6EDiGSkZqeXpbB+ yMc1OavZgO4Xf7tp6DR0CmrY5TgwIbbAshhiz9CNDLeLJ/wQ7PCfaMb3q+7vqRumnRat AcEUbn/NZGM6s3UtPDB1DerdZv0G6gK+b0JumIEJrmCCcxJFA/cy01JI1nVjRoySc2AR bPAZsoWBreTg3U7+jxnCpcw6HRl57UQITP+ycUBJhY0cNrLpYf55EyIpgS0PAx1iu3ro VzYg== 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=Rtc4VCLNcOtbYRt+kstCnNgCdd4gkHIxZIrMSbKfdjs=; b=LgMfec9E3g5NhRmg5+EpSKTlHSAGTkWwgLbK8PXkDCCkSkE3afe3ql3dPiQnp5YtCx tZVK/WVMCMLtieJdzXdLxT+jDKft1eQH0FuOzu3AyBBt7yo8WJqurDx9yXauxe829/Yt FOGudK471d1YCRJ4MQV3UwrJtx/2XXVGbiM9B7pp4y28A+fxEZdfHzFAxBYcp/OQno6H WL4hiicZX4gKC176vZN8ovWaEod8pn3JpSp0+Lr6GyrVoWwkHGmDQDqvp44H+ey8iKbU lrTyUjikTXloKnL7yusdpYyuIBMJ5wnEn5WMGLqr8AKOH9odaNvkA6GeMLisKdhzTBal 4CiA== X-Gm-Message-State: ANhLgQ3pbFkQBdZAj6RnpQ6tf5X+vQBUSvypeELffnHkLXmIK9lGQdUj vbZpsWh8wNPbYJIKi3vPSQl7mwZr X-Google-Smtp-Source: ADFU+vtUbkZGeCTW7cybM6Dy342zenpOsWzp5xh1iS2u2S2AbQfM4p9UHtCwwZB4j4ZjKkhUlX1rrg== X-Received: by 2002:a7b:c542:: with SMTP id j2mr13861186wmk.39.1584761433823; Fri, 20 Mar 2020 20:30:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id x24sm10391966wmc.36.2020.03.20.20.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 20:30:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Mar 2020 04:30:27 +0100 Message-Id: <20200321033027.17668-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200321025732.7614-1-andreas.rheinhardt@gmail.com> References: <20200321025732.7614-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/bethsoftvid: Avoid allocations and frees for palettes 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" by putting the palette in the demuxer's context. This also allows to remove this demuxer's read_close-function. Signed-off-by: Andreas Rheinhardt --- libavformat/bethsoftvid.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 4aefb04f14..2d5171a01c 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -49,7 +49,8 @@ typedef struct BVID_DemuxContext int bethsoft_global_delay; int video_index; /**< video stream index */ int audio_index; /**< audio stream index */ - uint8_t *palette; + int has_palette; + uint8_t palette[BVID_PALETTE_SIZE]; int is_finished; @@ -188,7 +189,7 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, pkt->flags |= AV_PKT_FLAG_KEY; /* if there is a new palette available, add it to packet side data */ - if (vid->palette) { + if (vid->has_palette) { uint8_t *pdata = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, BVID_PALETTE_SIZE); if (!pdata) { @@ -197,8 +198,7 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, goto fail; } memcpy(pdata, vid->palette, BVID_PALETTE_SIZE); - - av_freep(&vid->palette); + vid->has_palette = 0; } vid->nframes--; // used to check if all the frames were read @@ -222,17 +222,14 @@ static int vid_read_packet(AVFormatContext *s, block_type = avio_r8(pb); switch(block_type){ case PALETTE_BLOCK: - if (vid->palette) { + if (vid->has_palette) { av_log(s, AV_LOG_WARNING, "discarding unused palette\n"); - av_freep(&vid->palette); + vid->has_palette = 0; } - vid->palette = av_malloc(BVID_PALETTE_SIZE); - if (!vid->palette) - return AVERROR(ENOMEM); if (avio_read(pb, vid->palette, BVID_PALETTE_SIZE) != BVID_PALETTE_SIZE) { - av_freep(&vid->palette); return AVERROR(EIO); } + vid->has_palette = 1; return vid_read_packet(s, pkt); case FIRST_AUDIO_BLOCK: @@ -284,13 +281,6 @@ static int vid_read_packet(AVFormatContext *s, } } -static int vid_read_close(AVFormatContext *s) -{ - BVID_DemuxContext *vid = s->priv_data; - av_freep(&vid->palette); - return 0; -} - AVInputFormat ff_bethsoftvid_demuxer = { .name = "bethsoftvid", .long_name = NULL_IF_CONFIG_SMALL("Bethesda Softworks VID"), @@ -298,5 +288,4 @@ AVInputFormat ff_bethsoftvid_demuxer = { .read_probe = vid_probe, .read_header = vid_read_header, .read_packet = vid_read_packet, - .read_close = vid_read_close, };