From patchwork Mon Sep 16 15:55:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15103 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 2CB97448C5D for ; Mon, 16 Sep 2019 19:03:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1769C6881AB; Mon, 16 Sep 2019 19:03:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F69A688188 for ; Mon, 16 Sep 2019 19:03:29 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id h7so38486339wrw.8 for ; Mon, 16 Sep 2019 09:03:29 -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=zX0bCSudKIVyTDAuZ/TB9wAN2lMjpPsRY/GK8oF5iZg=; b=ZjtJ70XCvIDHQVEEukeJqmfAOqY9OAAhJU0ixBYQ+f7B+hBYvQj7VZXnR92alWE7EE 2leBlaexHGx188fnJltSN8A6qXhdEVjgaQs3GRk1/Tj568LV/be2IF0leLEV7HDYdoJ+ BBrWM9Z8ib9cpAsouWl/F1Xc4/KitYBYY/3b3MSbnF2tJHgQmAiAqPPDjsLgUARbRoIE TUbwAN0uvYw9KlKDPMU+XMwjs0XP3h438rCg3Rn3evTDwV0Cg7kQGBsADlc0eoX1VmQI 8bcrvs9dPomLLKxIop5un2Z2A7qX3cke8r5mYH3i7WOh/ONYsVoun/tMlQCVvSYNvEAy C0Ww== 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=zX0bCSudKIVyTDAuZ/TB9wAN2lMjpPsRY/GK8oF5iZg=; b=EIHB4VH+ye7MiMs/Le51VER9eKYKY+QynD1uqVV6DivW/DfCCyiWhY0DmPKeoRFGEp tU4NXF0aqJ9/p03VWQp8/yZIbGvjQwxSWMHHuBSREm65JIcltNdsqkCKiV2OW1KVlhM3 UvFheQWMYSle825056bfdii0yamofz4NAQJ0HQlkWHd46/cKXuzvlrrjs1hwSJuXXM8t tm/yAvJxY59o6x1ieJRSgkjkFWLqRjiA62FbUyl0HGew6IsRTYCf9HpUkzbir6r69ADw RbzM/3endCSLEpBct/WUUg2gE4QaPJiTY27gy4wlm3RhbX10gG3vKWaIffn2789xH+Og R5aA== X-Gm-Message-State: APjAAAWOHoEbFTJ5jgkroZ5FyqpmR/udtAp8yxyz+nT6xUSRh0ng6OfN Q2PYQi1/Xgize3YBU5nYEMU19KmQADA= X-Google-Smtp-Source: APXvYqw06q3i6DVv+FzRkzBHOhT3ZIoO6oREGE9hVdyaRHclrhFGW0JxeyflZ2DuOkvuEYoJDWF96w== X-Received: by 2002:a5d:628f:: with SMTP id k15mr413294wru.124.1568649808922; Mon, 16 Sep 2019 09:03:28 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id d28sm48111628wrb.95.2019.09.16.09.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2019 09:03:28 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2019 17:55:00 +0200 Message-Id: <20190916155502.17579-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190916155502.17579-1-andreas.rheinhardt@gmail.com> References: <20190916155502.17579-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] libavformat/mov: Improve demuxing DV audio 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" The code for demuxing DV audio predates the introduction of refcounted packets and when the latter was added, changes to the former were forgotten. This meant that when avpriv_dv_produce_packet initialized the packet containing the AVBufferRef, the AVBufferRef as well as the underlying AVBuffer leaked; the actual packet data didn't leak: They were directly freed, but not via their AVBuffer's free function. Moreover, errors in avpriv_dv_produce_packet were ignored; this has been changed, too. Furthermore, in the hypothetical scenario that the track has a palette, this would leak, too, so reorder the code so that the palette code appears after the DV audio code. Signed-off-by: Andreas Rheinhardt --- Completely untested as I don't have a sample for it. I also don't think that a dv audio stream can have a palette, but better safe than sorry. libavformat/mov.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index cd3f5bffcf..885b5f2485 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7766,6 +7766,19 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) } return ret; } +#if CONFIG_DV_DEMUXER + if (mov->dv_demux && sc->dv_audio_container) { + AVBufferRef *buf = pkt->buf; + ret = avpriv_dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size, pkt->pos); + pkt->buf = buf; + av_packet_unref(pkt); + if (ret < 0) + return ret; + ret = avpriv_dv_get_packet(mov->dv_demux, pkt); + if (ret < 0) + return ret; + } +#endif if (sc->has_palette) { uint8_t *pal; @@ -7777,16 +7790,6 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) sc->has_palette = 0; } } -#if CONFIG_DV_DEMUXER - if (mov->dv_demux && sc->dv_audio_container) { - avpriv_dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size, pkt->pos); - av_freep(&pkt->data); - pkt->size = 0; - ret = avpriv_dv_get_packet(mov->dv_demux, pkt); - if (ret < 0) - return ret; - } -#endif if (st->codecpar->codec_id == AV_CODEC_ID_MP3 && !st->need_parsing && pkt->size > 4) { if (ff_mpa_check_header(AV_RB32(pkt->data)) < 0) st->need_parsing = AVSTREAM_PARSE_FULL;