From patchwork Thu Apr 2 17:17:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18581 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 82ABF449727 for ; Thu, 2 Apr 2020 20:19:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B0BB689DC8; Thu, 2 Apr 2020 20:19:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 076DB68A484 for ; Thu, 2 Apr 2020 20:19:08 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id t7so5132467wrw.12 for ; Thu, 02 Apr 2020 10:19: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=YCQ7e93xE7xka8D8x/FHjjdMwaOtkvx+z5kScWPdtLQ=; b=bu3UDtWf2Bh+B1115Sb5XN3xCeCfj/mSLszH3oS7vej41fd4J8gUbNtWL8RxXx8rk/ fopp+tw3j7HgagqeZvdDrgO1gP4SbLQY4k9f7RRiKOwr48e8f+xQ4izyNYfCZ/6gx3R7 jBHlWwT6ezyNPxH05hnp01fjpxpC9nfw47vdNnxe4WGVWgtdB+aHf79b10+yKPvpZHeo LOw4NZX+Unp5OUIGUsrJrIvg6flKp2953W5tBkiabBf15ewTNCFCncXIJ4Ad3JktLunO qWtG+HlOA3QJHQVnW7++9spFvfJMoHAcnMUpusLxa2k3ciCrGonDHpF+r79DL8LGup1S wYtg== 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=YCQ7e93xE7xka8D8x/FHjjdMwaOtkvx+z5kScWPdtLQ=; b=R6oKaqwkIcXN3VgeaV1RVer84l9u9FjYhr4kG5kngKa35pjeNfqrJPZ5gXJ/X8WQkc mGc1jEFAHSAgr8LL2tu7t66z80Gp2cZNVo0FGJhDYkNtcXcifmTgo3QJKiHmHd4COTsk 46ewFOlNnNBXeZdbjAGrMDC9JaLmOQlYHteC54pKNeoqMcJ5jcWQpr4ab1LV4An/qZ0w d4diVzADDqSAEeLzx4U0v9GmKKSYKkJ88+N7i7sAhxSMuAioHDtrjf88Xv1wW3pFqe3f syayZ6/CMq74z3T+TsoY1RBL9bbqxEJrQsC8cB/6qkpDO1j/N0DYtGypgHpcf/TuUD1t olJQ== X-Gm-Message-State: AGi0PuYtb48Ovd6miONBEwMzVPIUAW2cKvJrIQ3DJ+ubxNXMqVuVmjA2 4rPtdp8YlSwY70WgJz5mCzHy7JNq X-Google-Smtp-Source: APiQypIg3sjHKivmMTNQ+/1a4Tdj6Cw/WC38hX0h+OFrp6sqmXChKGuCruzWXRMEpdh1oxknVYT+bg== X-Received: by 2002:adf:dd10:: with SMTP id a16mr4468238wrm.26.1585847947082; Thu, 02 Apr 2020 10:19:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id 9sm7645173wmm.6.2020.04.02.10.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 10:19:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Apr 2020 19:17:40 +0200 Message-Id: <20200402171740.19121-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200402171740.19121-1-andreas.rheinhardt@gmail.com> References: <20200402171740.19121-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/dss: Remove unnecessary allocation 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" Put a buffer with a known fixed size into the demuxer's context instead of allocating it separately. This also allows to remove the demuxer's read_close()-function. Signed-off-by: Andreas Rheinhardt --- libavformat/dss.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index ae7a259526..0585049130 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -50,7 +50,7 @@ typedef struct DSSDemuxContext { int counter; int swap; int dss_sp_swap_byte; - int8_t *dss_sp_buf; + int8_t dss_sp_buf[DSS_FRAME_SIZE + 1]; int packet_size; int dss_header_size; @@ -168,10 +168,6 @@ static int dss_read_header(AVFormatContext *s) ctx->counter = 0; ctx->swap = 0; - ctx->dss_sp_buf = av_malloc(DSS_FRAME_SIZE + 1); - if (!ctx->dss_sp_buf) - return AVERROR(ENOMEM); - return 0; } @@ -327,15 +323,6 @@ static int dss_read_packet(AVFormatContext *s, AVPacket *pkt) return dss_723_1_read_packet(s, pkt); } -static int dss_read_close(AVFormatContext *s) -{ - DSSDemuxContext *ctx = s->priv_data; - - av_freep(&ctx->dss_sp_buf); - - return 0; -} - static int dss_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { @@ -382,7 +369,6 @@ AVInputFormat ff_dss_demuxer = { .read_probe = dss_probe, .read_header = dss_read_header, .read_packet = dss_read_packet, - .read_close = dss_read_close, .read_seek = dss_read_seek, .extensions = "dss" };