From patchwork Sun May 24 00:25:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19819 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 D6F9444BC3C for ; Sun, 24 May 2020 03:26:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9B7E688121; Sun, 24 May 2020 03:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75A9F687F22 for ; Sun, 24 May 2020 03:26:08 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id x14so8514246wrp.2 for ; Sat, 23 May 2020 17:26:08 -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=ETFhddBUjpCbsawTP8tz85IVilABk+gjgMhOWvzUaIk=; b=rj//HcuIw1aRrMt7ZaB9ZO1fKG1pt519vNaHea7RiiiAsFO/CqRcvHBBBLGxGa36sK BluvDD/5B0J9JSMkKVp85c7wgbC889TtgL7KrJwNDp8dBWkM1QXykyrHG/ROwOX8Zm+p Z4gaquPL9PSlAjkVHZr4TFewa7j7Ga69XJLUmpW4k6vY7m2BOfEf5d1r/z7P6UpNiSpM 6EC9E97ja5hPj71CZBxVe1HD1W347HiRoVqGWqHcNvEk2KQjJlRapBstk/mtyXKg2aV2 BWX2/+z3785OmThlv4TfH/bSYgRM7zp3+HNjXrMVsEUVtkEMrgwUU2Eq8xPhgHeLECy2 Z67g== 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=ETFhddBUjpCbsawTP8tz85IVilABk+gjgMhOWvzUaIk=; b=ZmtqmCKLQQqeN0PSvWvUvt/cwrfxYMiE3bmrTS675wj30xjDg9GUX6Yn9cu/FeUe9t YFNc35/5L7ZI25n/iDLAUis7wTeD0KBchkDh9UeUkBOs7YBephsjyy0GzWh+j0uNISgx pXrdK2rCoI0uJlvYNWxmFxtLxT8emB3VCRk/pjurm0EFmGz5dvBAnYK1jJ7Heau3RPxT cfE7n/wTxVQXEbZzA5OOAoF+k2FwAEZW7jBAfjtb/xGycBEjZlSYm2podO0rz+X8NZSP 6tRnOpq2ecZSg3Drw0iWML1Dm9Xx/8OAaDeTbqEosgZ643/qgXqrdPHz9N16dpkXBq7C eh8Q== X-Gm-Message-State: AOAM532GSxmG/pRD3wq017QwWH1vfA5oKFzZV8i8Odm1t3dMJRzzTyO+ B893cCD7KCBlu8F+vKjFBSksVMVe X-Google-Smtp-Source: ABdhPJzLGjVEDQ/CyTh8mwlTnQC3E7kh6aQzfKSUFq1Vqo8M3MBvt12sTl4R6Obd6k/c/0iCRCvuMw== X-Received: by 2002:adf:e545:: with SMTP id z5mr3293930wrm.89.1590279967580; Sat, 23 May 2020 17:26:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm3722158wmf.19.2020.05.23.17.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:51 +0200 Message-Id: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/flvdec: Avoid duplicating extradata when adding side-data 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/flvdec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 7c3e5b06c6..957acedf39 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1283,12 +1283,11 @@ retry_duration: pkt->stream_index = st->index; pkt->pos = pos; if (flv->new_extradata[stream_type]) { - uint8_t *side = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, - flv->new_extradata_size[stream_type]); - if (side) { - memcpy(side, flv->new_extradata[stream_type], - flv->new_extradata_size[stream_type]); - av_freep(&flv->new_extradata[stream_type]); + int ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + flv->new_extradata[stream_type], + flv->new_extradata_size[stream_type]); + if (ret >= 0) { + flv->new_extradata[stream_type] = NULL; flv->new_extradata_size[stream_type] = 0; } } From patchwork Sun May 24 00:25:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19820 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 9BA5644BC3C for ; Sun, 24 May 2020 03:26:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88DCA6898BD; Sun, 24 May 2020 03:26:32 +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 BEBE3688158 for ; Sun, 24 May 2020 03:26:25 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id l11so13938076wru.0 for ; Sat, 23 May 2020 17:26:25 -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=Kp9ez65eWhQMI1fQtgassWBcXaG9e77aiqunfo+C7Tg=; b=GdF1lC13CD9TBA8sY08GqvQY+KtOffHoh4OiroXI9AB8ls/90XIqMbFeSN0fI3+rqb AlzmOK3986PURcoZAaGgWXTiM/aEL0uRMlc2jfanyDi1GU9jKwfirtoMR6H9t/7ut62J yYZZwYs/MC8hnhTFL5bH8rOMbAZ3s6IVysEDx5tp3PQVdccJCcYhvBcZDHhx9mxqMtoY QzaTrvDRzOjrKm+6MvOxF6luXQSqiS+bv29dYljY+hswcwLnuLnTi7W8J7XQgfnOC7F1 DTzH/RrekEgmrU9YrmKTExpJfITPS5Om9UvLlk4LfuWCKIAAKyrc57WHHnndK2CfwqyE CJmw== 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=Kp9ez65eWhQMI1fQtgassWBcXaG9e77aiqunfo+C7Tg=; b=GUWhPoCS2EduZo/A8RRGd+yt58NjOF+zZSAJrhJ8LZ4w7ICWKg+WTG3tDZpAM41vQg 7WsXa+BQRIXNUVrcqqdRry4f4OpFoiUBEIhbcVuyClxIdRTVMu6tHWFH1VmNNEwQYsdL PD+VbsoLOh5iUy1tMl9tRDZNUwURXMpWnwKMnBku2UpOo5fx0llsuTG0d+Cs/bvx85pW MVUlGh7R+or872Qnc7UBuDlP415qbOw1XkEy7tcc8rEWyDQwkt7M3hbmo50DPGodeM/a Kc7kBLS6T99naHncEtvqzXh/a/OORgBlOuWOBq/1n1z0qFqgx7kYlh5k2AXbu3DbmKVn ioXA== X-Gm-Message-State: AOAM532BJriv3B568S6+wKBWIW2ytXCZc04Ugmlzstc7GVqPh2mB6nZl mD8zjwe/1pOXxuovbIOE10Uq3wWt X-Google-Smtp-Source: ABdhPJzu1aV8c039pi3sVO8m2RgNdnnBEDm0314Ub0jBuzz2NcQTrL5YnrMuatEEQX/0378ynhBbtA== X-Received: by 2002:adf:ab1b:: with SMTP id q27mr1853296wrc.268.1590279984709; Sat, 23 May 2020 17:26:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm3722158wmf.19.2020.05.23.17.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:52 +0200 Message-Id: <20200524002554.28064-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> References: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/concatdec: Avoid duplicating buffer when adding side-data 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 --- The resulting side-data in this and the next two patches won't be padded anymore. But the documentation doesn't require it and av_packet_unpack_dictionary() doesn't rely on this anyway. libavformat/concatdec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 2173911ce4..4b56b61404 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -626,17 +626,16 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); if (cat->cur_file->metadata) { - uint8_t* metadata; int metadata_len; char* packed_metadata = av_packet_pack_dictionary(cat->cur_file->metadata, &metadata_len); if (!packed_metadata) return AVERROR(ENOMEM); - if (!(metadata = av_packet_new_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, metadata_len))) { + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, + packed_metadata, metadata_len); + if (ret < 0) { av_freep(&packed_metadata); - return AVERROR(ENOMEM); + return ret; } - memcpy(metadata, packed_metadata, metadata_len); - av_freep(&packed_metadata); } if (cat->cur_file->duration == AV_NOPTS_VALUE && st->cur_dts != AV_NOPTS_VALUE) { @@ -647,7 +646,7 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) } pkt->stream_index = cs->out_stream_index; - return ret; + return 0; } static void rescale_interval(AVRational tb_in, AVRational tb_out, From patchwork Sun May 24 00:25:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19821 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 BD99644BC3C for ; Sun, 24 May 2020 03:26:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A395668A5E5; Sun, 24 May 2020 03:26:34 +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 B75C768A285 for ; Sun, 24 May 2020 03:26:26 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id h17so13861820wrc.8 for ; Sat, 23 May 2020 17:26:26 -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=FIdVeA8uMCc55kqIm0oebtGWL8UETm7HS3IPMdvXdO4=; b=XnMDVtjsFpKhNOXk0xvYG2g7uGvoH5ejzKD+dCTXsq6fqKekIpo2G6bxK30fzlL4Lt ojQ++bkNgKjX+GQGiurlR9CqTeRJ3eMyC46gQN5U1sJr43CgbV2e1H8aCdlHqSwD/OYz W4tnzrtOHuXNjyewtsI9Ha43RU8y5Gx5IXVupIQjmUPNweAhuU67LQjrhKyBBXJR5WVA 6B7jqa/bUXsWxmRTQd2jWjoSc3cgLUBn8Gw+HsAiSipvYPBtQIcwUOskT3UCtmJuiFs1 EZWsGzggaviKfx2zGNf173ugsmsQROgReemApqSsnszA0cBbL2KzSaPFyoPOsGtfxX4r OgQQ== 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=FIdVeA8uMCc55kqIm0oebtGWL8UETm7HS3IPMdvXdO4=; b=ZOe5McdsVq25y8Drot4RYIqOMyt9oyj85M1svPBhx3tUTdws4oji23/vVLG/3ms5Z6 /lhnJF4Z9Av7B2TozBncu499JjpnlsWPm585Bc0YyROh8KyvKRGRvcXkAWeB/xbnJ9Mv eusfovcFlAgJVUNyqmlEta4ohTgnEMzKpMEkRgJD4RYgpEzCfcoPnuy5S1wyR48VhAJ9 88PF/sJpOyEHHhDnoVMVP13OCtREgS4xhzPuasTVO+Ynp7wvIetJo/fhtbd2rdT9pKDj Kmmou09gS6DAfMtx0tAVBIkCc9UQx4QmeQDdlWAkiLlyVdkwRENQRHTE7PUiN+8qXF9P VDAA== X-Gm-Message-State: AOAM532veoZDx+QIG2JDYdTfZUhvkg9fchE+LhYFcefDU8YU1C4MkAOi CHRnwjheEXxGzML9j8sHXzcuGY4Y X-Google-Smtp-Source: ABdhPJwdNxMeQnwtrFzR45b6pfTw0eAvNVQ9XXEXMJnmOAujNvhi97wW4AZCHtM984VuKLV/Mziv8w== X-Received: by 2002:a5d:548c:: with SMTP id h12mr3817112wrv.120.1590279985754; Sat, 23 May 2020 17:26:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm3722158wmf.19.2020.05.23.17.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:53 +0200 Message-Id: <20200524002554.28064-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> References: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/img2dec: Avoid duplicating buffer when adding side-data 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/img2dec.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 40f3e3d499..ee7ceed08f 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -379,8 +379,7 @@ int ff_img_read_header(AVFormatContext *s1) * as a dictionary, so it can be used by filters like 'drawtext'. */ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) { - uint8_t* metadata; - int metadata_len; + int metadata_len, ret; AVDictionary *d = NULL; char *packed_metadata = NULL; @@ -391,13 +390,12 @@ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) { av_dict_free(&d); if (!packed_metadata) return AVERROR(ENOMEM); - if (!(metadata = av_packet_new_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, metadata_len))) { + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, + packed_metadata, metadata_len); + if (ret < 0) { av_freep(&packed_metadata); - return AVERROR(ENOMEM); + return ret; } - memcpy(metadata, packed_metadata, metadata_len); - av_freep(&packed_metadata); - return 0; } From patchwork Sun May 24 00:25:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19822 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 3B62644BC3C for ; Sun, 24 May 2020 03:26:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26A8268A303; Sun, 24 May 2020 03:26:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17098687FA0 for ; Sun, 24 May 2020 03:26:28 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id j16so1453718wrb.7 for ; Sat, 23 May 2020 17:26:28 -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=0QwdOCwW7anCSbqp4tn/7E3tGtsJ8h+dkHeBotJF7AY=; b=qA3LDDLkqWkj4L3fOTS558cZ1pFX2Q3NYBEd9YSoE0wFK5emYbOp3H6d4hzPy0HiXg gPMM41ZVputyi8ZmADr8qoF+kt12CBD0yDKGk4dE6gggSHhVTY2PgswhkMn3lsn4mRBR vU96JbbVW6fFTwVO8rywAqMDmLhuDqLC99dyx4Isp/bhGEEWyw9tx3s/en+3DU0XkFJU MK26n9/Rk6Yj85+CcqJul77g/I3EALbVOxL/JSdTtjateodHRRdUH0HkxPcNjO3XJ5Y0 r1v6bLkZtnmKoGJVW/HDTP4RlD2U4id/gFhpGRtkdHutReoV+mHFTtxETnpyYV4f2nee SbRA== 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=0QwdOCwW7anCSbqp4tn/7E3tGtsJ8h+dkHeBotJF7AY=; b=WnvFnHKY9uOzWvVyTc8/3Fk4TqZTTsahO2lyB6tj9jWz6T/AQdDyEhLdMgUSf6bVi0 Y3pROdX7bkgHCrYtqKVg5s/ykFCGuDazvkB9VfeqkIvds5GjwNFt1dDryDcZb+M3D50u d0h8eieM19CWcg7/OMz0fwMcHcrEHV4UYEnssvUZ9piZfw2AWSqOp+T47vuW/SSUp8Va tu6X5jwar2wR0STwy42E/juK13RlOU1FkFLLTp3WqnIO45K3ykuPPf5rT2/d4jIPnE5X z5lu7gY0vqL/JFB3zjbqYsj7yueXahwcZVJWo+/vroxOg3SB9xYvbeS5dXhsIXfTcJkU pu5w== X-Gm-Message-State: AOAM532H8RHXeqYCCIN1PjcJzLMPF2vyEs0QMaiRE1+NOBb80SsU+zIl 8tHCMl9F6e1JrINL6IsYCwek8+Il X-Google-Smtp-Source: ABdhPJx2BTaZDIzRohyhI8a8uXpK2g1KteVnKp5I1PRWDxhAnOJqSzf1MGcDuXo5hDaxgajHhUtbuA== X-Received: by 2002:adf:b34e:: with SMTP id k14mr9175582wrd.109.1590279987287; Sat, 23 May 2020 17:26:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm3722158wmf.19.2020.05.23.17.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:54 +0200 Message-Id: <20200524002554.28064-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> References: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/oggdec: Avoid duplicating buffer when adding side-data 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/oggdec.c | 12 +++++------- libavformat/oggparsevorbis.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 1a3acbb55e..b4ba00df61 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -877,14 +877,12 @@ retry: } if (os->new_metadata) { - uint8_t *side_data = av_packet_new_side_data(pkt, - AV_PKT_DATA_METADATA_UPDATE, - os->new_metadata_size); - if(!side_data) - return AVERROR(ENOMEM); + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE, + os->new_metadata, os->new_metadata_size); + if (ret < 0) + return ret; - memcpy(side_data, os->new_metadata, os->new_metadata_size); - av_freep(&os->new_metadata); + os->new_metadata = NULL; os->new_metadata_size = 0; } diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 27d2c686b6..f09d54488b 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -287,7 +287,7 @@ static int vorbis_update_metadata(AVFormatContext *s, int idx) os->new_metadata = av_packet_pack_dictionary(st->metadata, &os->new_metadata_size); /* Send an empty dictionary to indicate that metadata has been cleared. */ } else { - os->new_metadata = av_malloc(1); + os->new_metadata = av_mallocz(1); os->new_metadata_size = 0; }