From patchwork Fri Aug 5 15:20:32 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: 37149 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp261220pzg; Fri, 5 Aug 2022 08:21:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR7ldOl0q60O7piYo4qDm6qkA0FPT5FExNU6SXhrk2tpDejBjTsy06fc99BYv5P0Dt4DOxbh X-Received: by 2002:a17:907:6090:b0:72f:3dc3:f0c8 with SMTP id ht16-20020a170907609000b0072f3dc3f0c8mr5340274ejc.539.1659712901376; Fri, 05 Aug 2022 08:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659712901; cv=none; d=google.com; s=arc-20160816; b=WKIf5Bl2nIj2HZveYCusPbfSw+jlDM9ktiRa3I52+xPugB14DUl2dripXnd0IKXanK Zt98KE/6Lnj6WCiExixpmHI2QuM405p1/8xKEinq6IIPAFpcw2u6mkNy/lcu8ATpRRm9 /W3YD8KDsZxIv/gE35+1Lrn18+/sBqEvKP1AoAz8XUDh/wZOQ/Ck4S+NN3iwWIbkYFL9 KDwY2rxkpLNwTaxRYeDXp4d7DqGxRtieQ09C18Mz5qUCi/RHsTBsuW2yw8XaEVtkUW3M PMqCly9vSIqTFkkj6q1jpp5aRdFuqW15EoXciYrrI92PJd01yFR18ep3kAu2SzmIet8D Rt/w== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=EXoARz3OyMRxDqZzOa9UkS9XVD8W3/4w9lH4PYU7LK8=; b=SoMl2DfM4tho53+FCdkTPF5JMW4IOKawvadIkgb+KcNvpPoi94ndczK7iwFYoxDWMK SmcIIAkZeLIouSEP2n/K39TRGcDrKGbSwLnVAikNx59LmsyVNTTsdRVlkm1w4T6PIVVi 4EjpO/+bJZxLEIa9ZwGWh5IhA3dt+QJpCAca/7ssOuVenjSn4D7Xez6wVo3kCiEaoogs dYlntyrmFzIumhD9y0RmiBe0jsoX1HV6Feh+VbUVVTZ2bC6vbQHRpFT3HkHcV8cFYk1Y Bmkiq/pJxoNUyeu+EksA2YSiBaApZFmr1BbyYBI129dR2kgdyEc+tFkm30HwjWDsqgvn LJCQ== 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 r13-20020a50aacd000000b0043da8aa23adsi24899edc.474.2022.08.05.08.21.17; Fri, 05 Aug 2022 08:21:41 -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 E97DA68B60C; Fri, 5 Aug 2022 18:21:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E98F068B495 for ; Fri, 5 Aug 2022 18:21:00 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id p18so2906742plr.8 for ; Fri, 05 Aug 2022 08:21:00 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gq6jei1+J599H3II8rkEZ0Id8tdW9lHrn5Hpa2S3bRI=; b=i4tzZRcnbcBs18+KYp97+ZlvUFQjr1XoazbZgv2ozBlWRNSLi7dQ6qbaplhxaebvtb D/3XXPo4nW1YpMZN1kBmfDwv1PBiqz2a6CmFyxXQeO0SfuYryadJ5kEnPevtxW/m7xEC uAL5lhzvqwJz3qHG3qvpieUT4TmbFzfIx4isBErOnc/Wlaqc662xpZUR5GcwkPfcZQb0 Lp7WXtZgwPv81OVpREqJYxH0TURNvxVbqF0lJMRyi7PH11EbkFvLpBOYkgF6I94kMd94 QcjPldPjsG+ViNa6JkoRyGWCBjinDHjmwXH15pRELesOZK3S9cTMr50kGLDB6yGjc3Z4 PWoQ== X-Gm-Message-State: ACgBeo2n51zlyBYzKxjsHqJ5D8LN1bXvnr/nMfCUgagO1OoC894tWrOo FLb6PuBlmX7319O1Vr4lWz+Xl8hetyA= X-Received: by 2002:a17:902:ce84:b0:170:874f:f6b2 with SMTP id f4-20020a170902ce8400b00170874ff6b2mr873220plg.51.1659712858785; Fri, 05 Aug 2022 08:20:58 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id n3-20020a170902f60300b0016c574aa0fdsm3176704plg.76.2022.08.05.08.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 08:20:58 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Fri, 05 Aug 2022 08:20:36 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Aug 2022 08:20:32 -0700 Message-Id: <20220805152032.1382-2-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220805152032.1382-1-pal@sandflow.com> References: <20220805152032.1382-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 2/2] 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: nvr6mNpeXA2C From: Pierre-Anthony Lemieux --- libavformat/imfdec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 71dfb26958..5bbe7a53f8 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -573,18 +573,14 @@ static int set_context_streams_from_tracks(AVFormatContext *s) first_resource_stream = c->tracks[i]->resources[0].ctx->streams[0]; av_log(s, AV_LOG_DEBUG, "Open the first resource of track %d\n", c->tracks[i]->index); - /* Copy stream information */ - asset_stream = avformat_new_stream(s, NULL); + asset_stream = ff_stream_clone(s, first_resource_stream); if (!asset_stream) { - av_log(s, AV_LOG_ERROR, "Could not create stream\n"); + av_log(s, AV_LOG_ERROR, "Could not clone stream\n"); return AVERROR(ENOMEM); } + asset_stream->id = i; - 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; - } + asset_stream->nb_frames = 0; avpriv_set_pts_info(asset_stream, first_resource_stream->pts_wrap_bits, first_resource_stream->time_base.num,