From patchwork Sun Jul 3 18:15:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 36637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2357119pzh; Sun, 3 Jul 2022 11:15:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ucgcUx/NxpWqh5kbSSzcNvzvP7FnWbXAcI8COakkTkUYlAX0R+SXbY4OmQee+aLi7nO6ve X-Received: by 2002:a05:6402:1e94:b0:435:b3ca:148e with SMTP id f20-20020a0564021e9400b00435b3ca148emr33437750edf.356.1656872152803; Sun, 03 Jul 2022 11:15:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656872152; cv=none; d=google.com; s=arc-20160816; b=MYT8mznHIxNlV4yh03Wwtb7rnsI3yFgm7fJAjvHSDeDKPFa8tV0sTbiNODBf+f6aT4 otFJI8Iq6p2IJwFuwVhMdyj54SOEaCaR+c88UH7whJ9Uyv9m0vhpH9w/agqdKaS2hLsp iwh3t9HpIj7S5OkvcOigEXAMvRu42ryAQz5hMbvDsDzaxcv4aQ3frZBIiLDQ9iNV37yE hKPpeVUMraXb20FLBWX0t6GuMxrIFX8kqDgST5ujsMXsjlLP+tg90QRYBXI9H100FlsO y9LErl3pu0A3/Rl/k5IdGby/yAUcdFG34Iw4GWt5yVngOwyR0/09yGXtcar1zut59MTH ywaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=8EAdLykcJrQ0tEn7AlF//pczXtFpAKyqT7MlYQnxkEU=; b=iITo5fdnAfFNMcnJ0AFW1asxEhCnCHGxKlhLxkuuWTAdv1e1Yo22AYjRvekHx/+Ibz QbRPLOhinorB9+Z2da2+HHZt9roFhDBP3nJgQSUkZ2S5CjbsQdRUqL3zT2BfSwZ2a4IC ISDbkNJzaF1qQfsEbAqbG7jWh5LrqoBjPgCtlQWfP+WpnQOcJ1i9/w+hIXrODJk68tky jDB0YTMHmGe77H90y1TxekO6FJZ+FJF0wx8nV/mnKfBW5ZJVdSbrK6gZaXawFyQPf2S+ JTZ+T2/DZkObvFN3h+GNsxx2+3ezFCYV739p06K7ez9iPU6+UTSGJ2v7iactBu2i1zb8 fTyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sd29-20020a1709076e1d00b0072ab7bc38eesi4153785ejc.950.2022.07.03.11.15.52; Sun, 03 Jul 2022 11:15:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 689E368B985; Sun, 3 Jul 2022 21:15:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C02068B960 for ; Sun, 3 Jul 2022 21:15:41 +0300 (EEST) Received: by mail-pg1-f182.google.com with SMTP id 68so6986050pgb.10 for ; Sun, 03 Jul 2022 11:15:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EVBaJj2TM0mUHjn3UbJpeUWzu7eFU1NTW3rc4wMSC4M=; b=SSDATjhGzKNbT02E51H+zySbVoJQBEyN6sW+4YEw1qz3AxPWt0uBdt90/xWaGe8uAT vZ64VEatJJD6BmrVvN9Key/rpSmSSsaVuvVvQvNsOQFd/728wfGyQ+GyI/MJyybvoKpc Bv0aeRK/CG2529Atqzv994iDWjvkUI+gLpq/fUSebeKZPn19ivYh8r+Zdz/ukuQsELbk D1DIPFYHvhO9xQzogD00enxwwNKH6aHshqJbBcq1ut2cpcZJq6c0bFVaVN6muKmIC351 ml+n7nkXspOWtQ8l88aMymKie6yohxbvmm6XgY+zcPktzUz4VaOanBK7HFgCSY1HsXeU cd3g== X-Gm-Message-State: AJIora+tey6YIyJrAsl/IMLFV/2q7wPQg47izBOhhQy5zGripCOIL96X 5ZR0y4vTbK0C3dvLHaEY8zAj9bH0PaZVWA== X-Received: by 2002:a05:6a00:179c:b0:525:6823:2972 with SMTP id s28-20020a056a00179c00b0052568232972mr32310509pfg.60.1656872139302; Sun, 03 Jul 2022 11:15:39 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id mt17-20020a17090b231100b001ef85d2c865sm798787pjb.55.2022.07.03.11.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 11:15:38 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Sun, 03 Jul 2022 11:15:35 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Jul 2022 11:15:25 -0700 Message-Id: <20220703181525.6488-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] avformat/imfdec: preserve stream information X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mXeTZtA/D8SN From: Pierre-Anthony Lemieux As discussed at https://trac.ffmpeg.org/ticket/9818, the IMF demuxer does not currently preserve stream information such as language in the case of audio streams. This patch is modeled on copy_stream_props() at avformat/concatdec.c. --- libavformat/imfdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 71dfb26958..7aa66a06bf 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -580,11 +580,16 @@ static int set_context_streams_from_tracks(AVFormatContext *s) return AVERROR(ENOMEM); } asset_stream->id = i; + asset_stream->r_frame_rate = first_resource_stream->r_frame_rate; + asset_stream->avg_frame_rate = first_resource_stream->avg_frame_rate; + asset_stream->sample_aspect_ratio = first_resource_stream->sample_aspect_ratio; ret = avcodec_parameters_copy(asset_stream->codecpar, first_resource_stream->codecpar); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not copy stream parameters\n"); return ret; } + av_dict_copy(&asset_stream->metadata, first_resource_stream->metadata, 0); + ff_stream_side_data_copy(asset_stream, first_resource_stream); avpriv_set_pts_info(asset_stream, first_resource_stream->pts_wrap_bits, first_resource_stream->time_base.num,