From patchwork Thu Apr 2 17:17:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18580 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 BD13E449727 for ; Thu, 2 Apr 2020 20:19:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A31C668A3AF; Thu, 2 Apr 2020 20:19:12 +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 03F4A68A176 for ; Thu, 2 Apr 2020 20:19:07 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id 91so3236586wri.10 for ; Thu, 02 Apr 2020 10:19:06 -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=1M2OkkH7FGyd/p+PFTq9QDJnV2xabAoxFUDINMXApvk=; b=uDfwr/+Lxso6cdkCg1AYckzBLTVS0tcM4OrQvmQVwlbUpr7+IaqFk1IOsMkhGprP8F CNTsjPrnYGlKvfpT8fBoZ1yYIqh7bMQNPxwPOPg676/0jaIi9/+NjaloDZttLLTABdmG GBir3Y+uhuCcs3a5TUAUxDMHHRGtHQGxg5ITt1FCakgatouv5fAVclUa4zN5iYDJidGT ZSWB04iTV+PGZCrebUneN6OhXgoc8uy4aiZ4vX84apy30K7CIHP6JpiAvMyrIqXFDeED xvR3p40bKgmfABuui0BRuoBBCZVUmHeIvCmD0cyGXGDazUfNfkhWFrBe9Es4XlUuycsM UHdQ== 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=1M2OkkH7FGyd/p+PFTq9QDJnV2xabAoxFUDINMXApvk=; b=X7KixkUxynz9Xc7kGEw4CMGhf37Zw55nf25wi/8eWtyz6EUHYfpSgnIORgYDUwKj15 M1RlUbWVYQDrxBmf3eC3jmJCy8TGhD2gtg9k4AUZLiT/sb219ZxVu+7yuf0t0sD/jb0Z KICzvAe8W0qrIwZTbLkw5heC6FhBtIsSmKPxWRY98PecP/thbha1GdGaQIYrqmqeZgpQ /6FLyNGg6cIsG8WnB1MoLVeW+Fajfca2TiiItiNvtlN8bE2m/u+vtuDaijTsNbdTrUwE wL+eG0RecPec7WHgeFCC6EUH2cLx5LsP2bIJb7vnMPk2ppWhOt5YYvmih9FoXp/KKUGS l5PQ== X-Gm-Message-State: AGi0PuYJT6uq12iUcl6/xw6t68iLAO7HKUvD1X9r33a4qeO5A9OAHrJJ xtorplEr6L/5jFBPoU58xrtjQJPZ X-Google-Smtp-Source: APiQypKqadpEXctQ9QqDIYBLzrpHk89ephv87Khc43tZNlXINtHd25REbLN4Vl6Y/v6i2oQvNLQZZw== X-Received: by 2002:adf:fc08:: with SMTP id i8mr4598882wrr.109.1585847945910; Thu, 02 Apr 2020 10:19:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 10:19:05 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Apr 2020 19:17:39 +0200 Message-Id: <20200402171740.19121-2-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 2/3] avformat/mpc: Simplify cleanup 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" Currently Musepack allocates an array that needs to be freed later in the demuxer's read_close-function; it is the sole reason for said function's existence. But it is unnecessary, because one can store this array in the stream's priv_data pointer, so that it will be freed generically. Signed-off-by: Andreas Rheinhardt --- libavformat/mpc.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 85036cd118..6a94b5d1d0 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -57,6 +57,7 @@ static int mpc_read_header(AVFormatContext *s) { MPCContext *c = s->priv_data; AVStream *st; + int ret; if(avio_rl24(s->pb) != MKTAG('M', 'P', '+', 0)){ av_log(s, AV_LOG_ERROR, "Not a Musepack file\n"); @@ -72,15 +73,6 @@ static int mpc_read_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Too many frames, seeking is not possible\n"); return AVERROR_INVALIDDATA; } - if(c->fcount){ - c->frames = av_malloc(c->fcount * sizeof(MPCFrame)); - if(!c->frames){ - av_log(s, AV_LOG_ERROR, "Cannot allocate seektable\n"); - return AVERROR(ENOMEM); - } - }else{ - av_log(s, AV_LOG_WARNING, "Container reports no frames\n"); - } c->curframe = 0; c->lastframe = -1; c->curbits = 8; @@ -88,15 +80,27 @@ static int mpc_read_header(AVFormatContext *s) st = avformat_new_stream(s, NULL); if (!st) - goto mem_error; + return AVERROR(ENOMEM); + + if (c->fcount) { + c->frames = av_malloc(c->fcount * sizeof(MPCFrame)); + if (!c->frames) { + av_log(s, AV_LOG_ERROR, "Cannot allocate seektable\n"); + return AVERROR(ENOMEM); + } + st->priv_data = c->frames; + } else { + av_log(s, AV_LOG_WARNING, "Container reports no frames\n"); + } + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_MUSEPACK7; st->codecpar->channels = 2; st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; st->codecpar->bits_per_coded_sample = 16; - if (ff_get_extradata(s, st->codecpar, s->pb, 16) < 0) - goto mem_error; + if ((ret = ff_get_extradata(s, st->codecpar, s->pb, 16)) < 0) + return ret; st->codecpar->sample_rate = mpc_rate[st->codecpar->extradata[2] & 3]; avpriv_set_pts_info(st, 32, MPC_FRAMESIZE, st->codecpar->sample_rate); /* scan for seekpoints */ @@ -113,9 +117,6 @@ static int mpc_read_header(AVFormatContext *s) } return 0; -mem_error: - av_freep(&c->frames); - return AVERROR(ENOMEM); } static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -176,14 +177,6 @@ static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -static int mpc_read_close(AVFormatContext *s) -{ - MPCContext *c = s->priv_data; - - av_freep(&c->frames); - return 0; -} - /** * Seek to the given position * If position is unknown but is within the limits of file @@ -232,7 +225,6 @@ AVInputFormat ff_mpc_demuxer = { .read_probe = mpc_probe, .read_header = mpc_read_header, .read_packet = mpc_read_packet, - .read_close = mpc_read_close, .read_seek = mpc_read_seek, .extensions = "mpc", };