From patchwork Sat Feb 17 21:45:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 7627 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2206214jai; Sat, 17 Feb 2018 13:46:49 -0800 (PST) X-Google-Smtp-Source: AH8x227Wz32oDcGb39HweGSF/qp9hEhZSNrywTLfHIGPxvfE/C9krnnj2vTtusHthKGkECatkwiA X-Received: by 10.28.170.71 with SMTP id t68mr8563080wme.31.1518904009338; Sat, 17 Feb 2018 13:46:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518904009; cv=none; d=google.com; s=arc-20160816; b=EqE6AWevIes18QZ+8tDvprLJP3R3wvaA7qNWfSxPZUAO87btUqcCE1eo06EEP4OQrG 6xHcd8QJ0k1OKcxxOjxxfR5h6wvXUoYG8bNXsepdipJCHukpjxXCr5HXJJgB+oddt2I+ vzg4G7EM82z7/jLvse1ERMCwEB++PJCl9HgeXbM/siWKWl23NHGYsWPd0KFbhdvppkVY QAy1vDUTHWPcqARM4p7kYTVcCrdFTT1XK5CvF1DWdeJ3t4/ouaNPmu29LfvpQJ2JLXRS 97MjvAfY1esOEIRh04AA7d7FsBhdEH7FXYbEKncVs217ghkrWed7uAqOWDHhNuBhB7e8 C8wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=nD2MwINgYiKoCfZf2VdZ8loBwD4W84zYznfWZbxGukk=; b=0pCYwG0Utoz1RE9wVZ1WVeBs6DpjPuJWcTEzVU4rAwJaIMk24WwnHDdoSDOjO19ZM7 /wEfPYBs1GmHnVyHZ9boATJrSWymzoHvgUDgQdO06sooYyHsJadiWPqGOY2W5wtGx0NJ JTkQlvaTCHJnNdNr0sFEwUWnFKxg8ZgqehU+Aqpinklx1HBaIARF1ATP3eobbhkfucAW UqGFUUhfkryaf2UxcXwJfNe21p5CBik1CwZK1UTjI4FwmXSZYrGcBXT4WCHsfvuSxxLs Xb8t1EbIXvWmS1EgxXvZwCjvMGDa235y9UXqIs8LVlFQ97mrzOHrfTTjCuJJu1ps2vTu E8RQ== 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 x5si11439825wmx.84.2018.02.17.13.46.48; Sat, 17 Feb 2018 13:46:49 -0800 (PST) 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 29E81689F2D; Sat, 17 Feb 2018 23:46:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC021689C9F for ; Sat, 17 Feb 2018 23:45:53 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id D85C8E1643; Sat, 17 Feb 2018 22:45:53 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4ximzW4z1p8k; Sat, 17 Feb 2018 22:45:53 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 562F4E1288; Sat, 17 Feb 2018 22:45:52 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2018 22:45:35 +0100 Message-Id: <20180217214538.24255-7-cus@passwd.hu> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180217214538.24255-1-cus@passwd.hu> References: <20180217214538.24255-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 07/10] avformat/mxfdec: set index_duration from the track using the index 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also use original_duration as index_duration is in edit units. Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 7abb047117..64f607a491 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1564,14 +1564,6 @@ static int mxf_compute_index_tables(MXFContext *mxf) { int i, j, k, ret, nb_sorted_segments; MXFIndexTableSegment **sorted_segments = NULL; - AVStream *st = NULL; - - for (i = 0; i < mxf->fc->nb_streams; i++) { - if (mxf->fc->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_DATA) - continue; - st = mxf->fc->streams[i]; - break; - } if ((ret = mxf_get_sorted_table_segments(mxf, &nb_sorted_segments, &sorted_segments)) || nb_sorted_segments <= 0) { @@ -1610,6 +1602,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) { MXFIndexTable *t = &mxf->index_tables[j]; + MXFTrack *mxf_track = NULL; t->segments = av_mallocz_array(t->nb_segments, sizeof(*t->segments)); @@ -1632,6 +1625,14 @@ static int mxf_compute_index_tables(MXFContext *mxf) if ((ret = mxf_compute_ptses_fake_index(mxf, t)) < 0) goto finish_decoding_index; + for (k = 0; k < mxf->fc->nb_streams; k++) { + MXFTrack *track = mxf->fc->streams[k]->priv_data; + if (track && track->index_sid == t->index_sid) { + mxf_track = track; + break; + } + } + /* fix zero IndexDurations */ for (k = 0; k < t->nb_segments; k++) { if (t->segments[k]->index_duration) @@ -1641,7 +1642,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) av_log(mxf->fc, AV_LOG_WARNING, "IndexSID %i segment %i has zero IndexDuration and there's more than one segment\n", t->index_sid, k); - if (!st) { + if (!mxf_track) { av_log(mxf->fc, AV_LOG_WARNING, "no streams?\n"); break; } @@ -1649,7 +1650,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) /* assume the first stream's duration is reasonable * leave index_duration = 0 on further segments in case we have any (unlikely) */ - t->segments[k]->index_duration = st->duration; + t->segments[k]->index_duration = mxf_track->original_duration; break; } }