From patchwork Tue Mar 2 14:53:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26063 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 EBE8E44B9C5 for ; Tue, 2 Mar 2021 16:54:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF92968AAFB; Tue, 2 Mar 2021 16:54:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 092AA68AAEB for ; Tue, 2 Mar 2021 16:54:10 +0200 (EET) Received: by mail-ed1-f47.google.com with SMTP id h10so25475889edl.6 for ; Tue, 02 Mar 2021 06:54:10 -0800 (PST) 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=Xlavmv1etUQhhspVdh2MFYUtCSwGS/pMq1fuoCq2z70=; b=Q42FWfvDzgQThw268iXX8Yrb71GOWKYp2lVGtibO2Hqo6McIck12eEIXezWpQwmU8D CEUaGpKTZTYascFcLL4Fg4f2cWggIKYAHnXg7p5LNiT23db4/lq8ClyzQX8PfB4SzsOF EojVYsQFLG7rH478zbsZXpoOrn55rUDMqMO9w4OTf6KSPKzEjhHtteLMdITOzlC58uNz wth5c8pOQQVuZ/inrp8XRGHergMwivw9cWRrLiwvAqFU2feaERq1/oR+Ba9Pbfggj15R aZ9dn8zcpE34rW4Qp8lPKDu+3ZQnfukSq3l8AohmKxLEt4BnC0kZgWgOm9T+hGlAb5tv 7sWA== 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=Xlavmv1etUQhhspVdh2MFYUtCSwGS/pMq1fuoCq2z70=; b=rm0LUXB0pAOMlREXAjzJkgjcVTdnFRWERcJbGVXkqVwVVYqIsb7Qh6FRST4EjJoefU TU5JQ3TNRbCetDhML5/PWBwLBzzecaeaQbyrj82LbPoW3bm+oLuOs3GDggPUJpN++bbh vpv/WtRB0S+UdmsWHHelzEmdF8e39wURJa7TycvswBNQBfTqBbPh4SX0GtuD9DDk5/P2 94Sp6Q8lG5REFyo/IVeXPB6POprt8O6Z/KGpdcU6sKagBA0yrYSEhe4lVS+ZlnIoCv6G vB6c1qW7NXoWQQq+KXgSqFsabHQqfRLmKfhjHkhrEC6Rfz6O2M6g1hWkyDdMF0v28Pyq ZHxg== X-Gm-Message-State: AOAM532v5DDLKzjEjUyBobAUEbdsaQ4uxizpmYwOxadvkK18K9dLxqQO HfZhYbOaXfPZkrfFIHqTGw7JNpNyZ+0= X-Google-Smtp-Source: ABdhPJygTd1ZRGmj7/kTm3m8oETypMW2mY+wt1x5TUY59j7Yrz/bZTDruPlySRQfRkH0GIR82J2H4Q== X-Received: by 2002:a50:fa42:: with SMTP id c2mr2618688edq.159.1614696849290; Tue, 02 Mar 2021 06:54:09 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id dm20sm18557873edb.59.2021.03.02.06.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 06:54:08 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Mar 2021 15:53:51 +0100 Message-Id: <20210302145351.514945-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dashdec: Don't needlessly strdup metadata 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 --- Using separate lists for audio, video and subtitles leads to lots of code duplication in this demuxer; the only place where one gains a bit is in refresh_manifest (which is already buggy in itself because it leaks upon error...). Is it really worth it? libavformat/dashdec.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 947b42f816..6f3f28dcc7 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -2039,6 +2039,14 @@ static int copy_init_section(struct representation *rep_dest, struct representat static int dash_close(AVFormatContext *s); +static void move_metadata(AVStream *st, const char *key, char **value) +{ + if (*value) { + av_dict_set(&st->metadata, key, *value, AV_DICT_DONT_STRDUP_VAL); + *value = NULL; + } +} + static int dash_read_header(AVFormatContext *s) { DASHContext *c = s->priv_data; @@ -2137,8 +2145,7 @@ static int dash_read_header(AVFormatContext *s) rep->assoc_stream = s->streams[rep->stream_index]; if (rep->bandwidth > 0) av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0); - if (rep->id) - av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); + move_metadata(rep->assoc_stream, "id", &rep->id); } for (i = 0; i < c->n_audios; i++) { rep = c->audios[i]; @@ -2146,23 +2153,15 @@ static int dash_read_header(AVFormatContext *s) rep->assoc_stream = s->streams[rep->stream_index]; if (rep->bandwidth > 0) av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0); - if (rep->id) - av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); - if (rep->lang) { - av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0); - av_freep(&rep->lang); - } + move_metadata(rep->assoc_stream, "id", &rep->id); + move_metadata(rep->assoc_stream, "language", &rep->lang); } for (i = 0; i < c->n_subtitles; i++) { rep = c->subtitles[i]; av_program_add_stream_index(s, 0, rep->stream_index); rep->assoc_stream = s->streams[rep->stream_index]; - if (rep->id) - av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); - if (rep->lang) { - av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0); - av_freep(&rep->lang); - } + move_metadata(rep->assoc_stream, "id", &rep->id); + move_metadata(rep->assoc_stream, "language", &rep->lang); } return 0;