From patchwork Mon Jun 15 00:02:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20383 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 566E0448DD8 for ; Mon, 15 Jun 2020 03:02:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4281F68B6F9; Mon, 15 Jun 2020 03:02:51 +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 DE00368B6C3 for ; Mon, 15 Jun 2020 03:02:41 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id h5so15284085wrc.7 for ; Sun, 14 Jun 2020 17:02:41 -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=i08n7GSVWvpSGWL4xs83LVtQwIn+JdaEdIgvLndarxc=; b=d2bXE6chbZ7RMIBIujRvL2mHFn/u+gFU5uwkVgSv+7Sh+JzTO5zRMYY+/C55wuIg01 OsZSSFZvdJkym1jH0Qgn4vkIkwpjumVtOwDfO1hJNAo/IBK/1OeIkkOmwSMZH5fxmYuu bLdixQ0uWTS2kY2RlZR7JlApXrBypTc6iOuLdEHk8Q6RpamK0ZLJ9mMvhS1weTd4Vvp3 uqpn6xZXZM1TZ/ot/yFGlOOJp2oDcZNpfPxwbY5WuHRUC++sot1l2O4EWtqGxM1H1a30 6OO5QB7ZHnDn9Bw3JsFZHTxKPEcrUN5z6c7C/GiTDhxZ2aZbQuVbkRYDxah1Lpxv5x/9 mk3A== 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=i08n7GSVWvpSGWL4xs83LVtQwIn+JdaEdIgvLndarxc=; b=sYSn4aaBYK8q6w6srin4wnKdF3e8rROgnd/ORTMmacNjJ5sXNyPD/luFqHVAgfUICu UNVb6zlQLUEKb4K5rtDgSFsJ4dJNHM7jV5jNZAs84pimSUz0WXISQ0VyZQ42kvcW0Vfw xBTAauS1cdCJ5u/mGDtOmTyG8iQg5W7MzUavfrKglJ/42TWKjybj3/bOEDWv30MukfKD 75aoRw75IBCwtWz5X9s+TElpVQHOn2jyRuWiQJ79awtzVurPHhOJhQ+LquIUUs10nNEp d6W5OtIfHR2ln3xAc+oZGdqQhPgfOMYdbZpMpoXeJEm7eZC8q38VMMqLhuuMHH3/AVQt TK/w== X-Gm-Message-State: AOAM532mycKhjPp470LcDtbmzcF0xSQ777CYm7y67SMyZYJk+ytIStGB Ph91j+VhNqxIkANDovYF5hJoVKfO X-Google-Smtp-Source: ABdhPJxD78psfOKrYk+Dqo2Dv6dH0xHWrSkLuKQkXsn4rKAwgCEAdmsBMhvTLIDanmdJlsT7nbLwfw== X-Received: by 2002:a5d:69cb:: with SMTP id s11mr26070597wrw.91.1592179361069; Sun, 14 Jun 2020 17:02:41 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id 5sm29512167wrr.5.2020.06.14.17.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:02:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 02:02:00 +0200 Message-Id: <20200615000204.10568-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> References: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 31/35] avformat/mov: Avoid allocation when reading ddts atom 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" Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 683ad49e7a..8bc220408c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -857,27 +857,20 @@ static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - const uint32_t ddts_size = 20; +#define DDTS_SIZE 20 + uint8_t buf[DDTS_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; AVStream *st = NULL; - uint8_t *buf = NULL; uint32_t frame_duration_code = 0; uint32_t channel_layout_code = 0; GetBitContext gb; int ret; - buf = av_malloc(ddts_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!buf) { - return AVERROR(ENOMEM); - } - if ((ret = ffio_read_size(pb, buf, ddts_size)) < 0) { - av_free(buf); + if ((ret = ffio_read_size(pb, buf, DDTS_SIZE)) < 0) return ret; - } - init_get_bits(&gb, buf, 8*ddts_size); + init_get_bits(&gb, buf, 8 * DDTS_SIZE); if (c->fc->nb_streams < 1) { - av_free(buf); return 0; } st = c->fc->streams[c->fc->nb_streams-1]; @@ -885,7 +878,6 @@ static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom) st->codecpar->sample_rate = get_bits_long(&gb, 32); if (st->codecpar->sample_rate <= 0) { av_log(c->fc, AV_LOG_ERROR, "Invalid sample rate %d\n", st->codecpar->sample_rate); - av_free(buf); return AVERROR_INVALIDDATA; } skip_bits_long(&gb, 32); /* max bitrate */ @@ -913,7 +905,6 @@ static int mov_read_ddts(MOVContext *c, AVIOContext *pb, MOVAtom atom) ((channel_layout_code & 0x8) ? AV_CH_LOW_FREQUENCY : 0); st->codecpar->channels = av_get_channel_layout_nb_channels(st->codecpar->channel_layout); - av_free(buf); return 0; }