From patchwork Mon May 24 10:30:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: emcodem X-Patchwork-Id: 27935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2832603iof; Mon, 24 May 2021 03:31:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFdapJORKL8IqKpd19El+x02D+zC68camu/EyiFyj5KxoZ/mrIQr7J93tv8mxBlssMfpj0 X-Received: by 2002:a17:906:bcd6:: with SMTP id lw22mr23054756ejb.250.1621852273954; Mon, 24 May 2021 03:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621852273; cv=none; d=google.com; s=arc-20160816; b=RZKsIWy/bx+RTUKkWIZABYeSDAwjcuKSnwz+dCbGuwlC6ESablMxO/JLAwhTV/FXPp wUuBMMxt9UgVS5jMvXs4/GcdBdGdMH7Rm0gJyet1McZw2RCf6ck+jfCloX31ck4F8V9I V8aVqO3qudw3/31yUiFwfm1YERa9uCeo0m9pf89Uzv8l+JEI7FcqdruyhgPEj9vqwp+i ShahrnkVDZTofKOFI73Z9XzIKcko4yYHzQGLRizwfC6x+k0Ar1VqqQKN9gKaxdZhdB0p 005eP5JcPSyn1W8PD8G/VO/o/B9B80LbDHpk7gqNR/pMsL14piokxKeM3Nkbo6MUC7Qn 1j4g== 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=EpmzjzFrJOEtWc7RDkqDw4Z4cQJpbtUAFZds6MXO81s=; b=JIQTXx0xszmqQGeUP/3FY92vKhfuvNMKitnyxyicFGxXbec/RvojOwb7tLR0aF4YY8 eIXg+03BToJvsM9Cj62IhCoS09pc+qFFBsWSyH92tRBl4T865oKC9w5XnG2N8VvDH+yo 1VJlJRa+gVgNCwFPC+QJE7+ur+IBdq9kuTWDz2a6t3jPF6cqf6AXVq9/r/Aq/9g1wDWP cieTdnHOzK0dYMxEN/moTJ0vOc+FMg0grywch3n+nTfHngM/jqozyutjbbOPvwiVxgvJ XUqvoGp0PNTZdMVzgn5X3sLQhXyALnbsnG2iwZPeYCRdIzYu/9tWOpuAgqTxJRlvfgSA 3u0A== 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 23si12233439ejx.297.2021.05.24.03.31.13; Mon, 24 May 2021 03:31:13 -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 695F1680A7A; Mon, 24 May 2021 13:31:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mxfilter2.cpanel.guru (mxfilter2.cpanel.guru [193.93.253.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8DB76808A6 for ; Mon, 24 May 2021 13:31:02 +0300 (EEST) Received: from cloud03.cpanel.guru (cloud03.cpanel.guru [193.93.253.53]) by mxfilter2.cpanel.guru (Halon) with ESMTPS id 22328107-bc7b-11eb-8680-0050569e601f; Mon, 24 May 2021 12:31:00 +0200 (CEST) Received: from [178.115.242.98] (port=64864 helo=DESKTOP-1QU2FER.localdomain) by cloud03.cpanel.guru with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1ll7rP-00GP1u-Ia; Mon, 24 May 2021 12:30:59 +0200 From: emcodem To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 May 2021 12:30:28 +0200 Message-Id: <20210524103027.30367-1-emcodem@ffastrans.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud03.cpanel.guru X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - ffastrans.com X-Get-Message-Sender-Via: cloud03.cpanel.guru: authenticated_id: emcodem@ffastrans.com X-Authenticated-Sender: cloud03.cpanel.guru: emcodem@ffastrans.com X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH] mxfdec.c: Try TC from Footer if Header TC was < 1 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: emcodem Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cxhHtL8NoOcu Added support for reading Start Timecode from Footer (if any). Specifically targets Omneon 6.4.3.0 but also works on other Versions and Vendors, e.g. when Header is OpenIncomplete. Function mxf_resolve_strong_ref_reverse can potentially be re-used for getting other values like Duration and Origin from Footer. --- libavformat/mxfdec.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 3bf480a3a6..557e01f8ed 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1396,6 +1396,19 @@ static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid) return uls; } +static void *mxf_resolve_strong_ref_reverse(MXFContext *mxf, UID *strong_ref, enum MXFMetadataSetType type) +{ + int i; + if (!strong_ref) + return NULL; + for (i = mxf->metadata_sets_count-1; i >= 0 ; i--) { + if (!memcmp(*strong_ref, mxf->metadata_sets[i]->uid, 16) && + (type == AnyType || mxf->metadata_sets[i]->type == type)) { + return mxf->metadata_sets[i]; + } + } + return NULL; +} static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMetadataSetType type) { int i; @@ -2328,8 +2341,15 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) continue; mxf_tc = (MXFTimecodeComponent*)component; + if (mxf_tc->start_frame <= 0) { + av_log(mxf->fc, AV_LOG_TRACE, "Header Start Timecode was %d, trying reversed parsing\n",mxf_tc->start_frame); + component = mxf_resolve_strong_ref_reverse(mxf, &material_track->sequence->structural_components_refs[j], TimecodeComponent); + mxf_tc = (MXFTimecodeComponent*)component; + } + flags = mxf_tc->drop_frame == 1 ? AV_TIMECODE_FLAG_DROPFRAME : 0; if (av_timecode_init(&tc, mxf_tc->rate, flags, mxf_tc->start_frame, mxf->fc) == 0) { + av_log(mxf->fc, AV_LOG_TRACE, "Setting Start Timecode: %d \n",mxf_tc->start_frame); mxf_add_timecode_metadata(&mxf->fc->metadata, "timecode", &tc); break; }