From patchwork Sat Mar 21 02:57:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18310 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 0EA7344AFBD for ; Sat, 21 Mar 2020 04:57:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4A7668B4C5; Sat, 21 Mar 2020 04:57:51 +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 0759068B487 for ; Sat, 21 Mar 2020 04:57:46 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id d1so8417950wmb.2 for ; Fri, 20 Mar 2020 19:57:45 -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:mime-version :content-transfer-encoding; bh=X+c2QJ37YKKs6CrXN1F8YTeJxOoutwfNBRpn9Sm0mME=; b=r8KskHxsWsUDuorntk8jM9QdDpOsm9SAs3+J1+mKnjtTWm7oh3RhqrQqwLi6KK6mEC 1C/pmCOv6Bz0BLcm/6Zpie4x8s/M8C1mqdywUVAeXNrbHIKnKQjM1yhl3rGXL6DDjMVa Yuk7hhO+rSCkbqrBAu4d55FslplPFjtskqjyg6pqTNLV4egCITGA4m+nyMhn7BH1653Q vWv4mGvWgp0lEWDoxGeEPb3ky+XgOUqboW2x29jrKS6BmSzpcdDzWosNYXG4KvxdbhfM qNcWrPOhJr78cYfzjzKgk0SSTL//yx2VNVMB4v/sZqYeyvq17sIKaxSSbHPXzwhnGQRl ciog== 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:mime-version :content-transfer-encoding; bh=X+c2QJ37YKKs6CrXN1F8YTeJxOoutwfNBRpn9Sm0mME=; b=NfmCQlUpSF73uAeSJSIiYJTRV4Bc8kYFrbI4M/D5BtemEsDGmWRysFW0DVzgEve89w IeiKHeUzmdt1HPcB5wK3LcLMDgFFor5Db3SAY+NnuJAGROP8qQlVMhsi/V9vhe9/ADb7 RcnQjFQRdNsmYD7zUiP1U15QGzKpiJvYo4rgIj5ZaOr+ago9XPmU6O0ESsmHbRGryqaD AzfPSaIc+UKZ2gx+QGEgJbUI3LXEZv7EfeoSxrHg3LREtvlzXhuJqwLGG7QuJpRBnuR5 ann2lgImDboaSizay1N7FoOG+fU4rXXafFYvjtYX1AjsUd/uUy6sMsDENwZ3XiPNdwmo NYwg== X-Gm-Message-State: ANhLgQ2DFD1RammkEsOFjsJSwx0hD4mSpAuetHrr68ERK/jH8K5Exi+T BLPTOa9ZIbs36toOGD0GYWYhnEKy X-Google-Smtp-Source: ADFU+vv0UQMxogeK4+lnTpbfa+AH6azhwfZ/P2DCodse0Z3doHQOucgNi1x+aT29B4BtYDyipznX+Q== X-Received: by 2002:a1c:99c7:: with SMTP id b190mr13247530wme.109.1584759465133; Fri, 20 Mar 2020 19:57:45 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id f17sm11756189wrj.28.2020.03.20.19.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 19:57:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Mar 2020 03:57:31 +0100 Message-Id: <20200321025732.7614-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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 | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 4aefb04f14..e52b17433c 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,6 @@ 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->nframes--; // used to check if all the frames were read @@ -222,17 +221,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 +280,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 +287,4 @@ AVInputFormat ff_bethsoftvid_demuxer = { .read_probe = vid_probe, .read_header = vid_read_header, .read_packet = vid_read_packet, - .read_close = vid_read_close, };