From patchwork Sat Aug 6 23:35:20 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: 37167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1016487pzg; Sat, 6 Aug 2022 16:36:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/nWeHI5a/vTuetB/oRHAPSpuYZ3fgPKnx2tGz/FjdKL7jBJWNIdBacvt8GjOpDh/pcEGO X-Received: by 2002:a05:6402:b84:b0:43d:962d:7db1 with SMTP id cf4-20020a0564020b8400b0043d962d7db1mr11840294edb.270.1659828967746; Sat, 06 Aug 2022 16:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659828967; cv=none; d=google.com; s=arc-20160816; b=WoS+p7ntooHAZj0LqtnD3sZVbgb9HiINu1Hm+51lYCr4MNxNsXGsvJo661hX2tNSOd JMs9bTJF1b5PBFI4G8IJx4MMt1AZRh77l3hK6joUL01NkHjljMsS5zxLuIjrAfwCQqi/ qvKp4nS9YJVxDLeMq3n2AdWhoRHWaZZ7WkCoWX5akhDy+mbsIpRgQEZEFq4vDY1GfRxn q1Mdh+4vBBOnxQMquCK/1tGpCP3mvc8tocvhq9+r1BnWqOzDg/0Ms/pQBPOOsNi2Ucpm rAOvHH64lppXXJT33UBlMxpLgxqvgn3/vELaXY1DLVAUFVSzcgzZU48zSjLhSAUucajA nKxQ== 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=gqWf5WkyJPn4MCfZAnFS75nTXeKP7XYlmIjUn81Z866ijO+HSySY0lwGsgyytZ7ieU aSxdeY6YwPDkQ8bi+b0vmGn4A+rr3+uaQ4BvJd1FempvQkSTF/VjpypcyL5Xdq6M9n6D Cc8CQKfDCUUXpADYZdAZngv+Kwiw2y+KU6A9errHTfnre9RDDb8qVWvhAlIas6u/RpT4 +oSTt3937u4tBbGarCTWsS+yyopViVfpp9oh5bXJd0ugoQc4ZuETlUgUSi0AFIEkrVIZ BjOS/MGAZq4YnwyYhOvj1sprQCrjTpNoEttx3f9VYqaY+6Yc4Bxd+E4TB5N4I39mATnw Y4Xw== 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 c10-20020a50f60a000000b0043d556dd041si2805708edn.446.2022.08.06.16.36.07; Sat, 06 Aug 2022 16:36:07 -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 8499F68B710; Sun, 7 Aug 2022 02:35:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5223B68B6F9 for ; Sun, 7 Aug 2022 02:35:51 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id o3so5641288ple.5 for ; Sat, 06 Aug 2022 16:35:51 -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=sCDqAbja44v699NdAOVmRq58mhhqXRDw0JrSkKKc/+nXzfX86wr7Zzt+W/grrwziRj kSoFHY5chO7hQu8/+PdmFjwD6BgaNP1pKPlMlA/PSllkddK4yB1Gt/lfaVq6CkwZUK5V T1puH/2mMoGtGRRDUFtEF0NxbPI9VZ3eF4OrcNyBGDsqqtSepg5fUl/1nl7+MmLvqr6N hK1LgSOcMch/P5JvVDpjkjqwKQuP/bmvCU7R3w5Nzq2fYwH3WuL1S0iFXYcRPU9cS7Cu iroV8V9DmafQOi8wirjMLOhHyFwhqieDyUA6OzEO2XRCAzAH8Ai/CCUPVB1GYxH4rJ54 2SNA== X-Gm-Message-State: ACgBeo3Gc4uc90hrUqOf6e8i8DskdXaWtvWFu/pMV01ZWSOXJouMrSOp +gTm/buzKL+uP9SeCCJYbI2E0kKRkkY= X-Received: by 2002:a17:902:6b0b:b0:16c:e69c:bb11 with SMTP id o11-20020a1709026b0b00b0016ce69cbb11mr12622705plk.147.1659828949119; Sat, 06 Aug 2022 16:35:49 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id w18-20020a170902e89200b0016dcbdf9492sm5627856plg.92.2022.08.06.16.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 16:35:48 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Sat, 06 Aug 2022 16:35:26 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 16:35:20 -0700 Message-Id: <20220806233520.1154-2-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220806233520.1154-1-pal@sandflow.com> References: <20220806233520.1154-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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: +B47VwSVCF4x 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,