From patchwork Sat Feb 17 21:45:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 7633 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2205910jai; Sat, 17 Feb 2018 13:46:17 -0800 (PST) X-Google-Smtp-Source: AH8x225+RzmPvYp/bb3XzHzEhx8w3rM44bjI0SHoIjTfnRPSHiiImVzreOmRISaQiNCIRtui/Mbi X-Received: by 10.223.208.141 with SMTP id y13mr8941453wrh.13.1518903977115; Sat, 17 Feb 2018 13:46:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518903977; cv=none; d=google.com; s=arc-20160816; b=VdBUlec4H8wyDfdMmjVsAn0JmXt8r6Fn+YYjCdy9o+kiYtOxz6cnXmBSd0ZAb2azRc qsxCm0A6rlFgZADDk1c8LP+MFfO+HXrZjl3Ztl+wtBKu5UkI/yngPUaaNri3lPNloqg+ RVhxCMDveDETb77BjF7xezbnxLZnbc6UXYxeNZyCcdQCxSqlp88/ZI3O/8sBkMxzePc3 70VE2Ig5jW7btwRc13ViSyWwpJx1XsVLr5KJzdEOGaoNezpQEiOH2kjNkbkJM6oEFpjU AGt7fkNnB57RPIicBym0Q0RHYyCv47QgZDeq+DdZB5E0ogyqud6JFamrIdXzJVKfRI0W zXkA== 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=DRqBQ0GkB083X5CuYL5j06lGIzmXKBKKf/82WFgwitw=; b=cCohcNl1gyjq2e/bdjmtkKdF2C9fbBrJ+P5GJzOASBxqGWhXKEqiVgbEkZamBo4Ozi eskpL62hTCgnytm8KBL8wcQTc1t8Nh3+ePHShMDKd/DM6GwUKwmG422mYJB4HMWkadlW uHufT9WZXO1sWrhkYZGZbr8aO1HsDapKN70PpqNqX0sh9tFZxLJ8BKL7O0cFH/vCabG0 rtWhvs+iKq/e+gJXCBFAhxoZNVSnZFI+rTac1q+6XSUZWJUUV477pR0oKhwWKG5ri+Gq RN1HFD1iz4nITHNQrV6A6x7adhb57WZGUgjRa0I4j3pg9qfn29RysluTapULV8e3BgeE 8nkQ== 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 16si11837465wmm.46.2018.02.17.13.46.16; Sat, 17 Feb 2018 13:46:17 -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 F2D86689E35; Sat, 17 Feb 2018 23:45:55 +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 44667689C75 for ; Sat, 17 Feb 2018 23:45:48 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 3C877E194E; Sat, 17 Feb 2018 22:45:48 +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 PPJSGOBtOSt6; Sat, 17 Feb 2018 22:45:47 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 8893EE1964; Sat, 17 Feb 2018 22:45:47 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2018 22:45:32 +0100 Message-Id: <20180217214538.24255-4-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 04/10] avformat/mxfdec: use full UMID to resolve source package 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" Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 43a0220c87..4c3f2a64cb 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1681,7 +1681,7 @@ static MXFTimecodeComponent* mxf_resolve_timecode_component(MXFContext *mxf, UID return NULL; } -static MXFPackage* mxf_resolve_source_package(MXFContext *mxf, UID package_uid) +static MXFPackage* mxf_resolve_source_package(MXFContext *mxf, UID package_ul, UID package_uid) { MXFPackage *package = NULL; int i; @@ -1691,7 +1691,7 @@ static MXFPackage* mxf_resolve_source_package(MXFContext *mxf, UID package_uid) if (!package) continue; - if (!memcmp(package->package_uid, package_uid, 16)) + if (!memcmp(package->package_ul, package_ul, 16) && !memcmp(package->package_uid, package_uid, 16)) return package; } return NULL; @@ -1740,7 +1740,7 @@ static MXFStructuralComponent* mxf_resolve_essence_group_choice(MXFContext *mxf, if (!component) continue; - if (!(package = mxf_resolve_source_package(mxf, component->source_package_uid))) + if (!(package = mxf_resolve_source_package(mxf, component->source_package_ul, component->source_package_uid))) continue; descriptor = mxf_resolve_strong_ref(mxf, &package->descriptor_ref, Descriptor); @@ -1806,7 +1806,7 @@ static int mxf_parse_physical_source_package(MXFContext *mxf, MXFTrack *source_t if (!sourceclip) continue; - if (!(physical_package = mxf_resolve_source_package(mxf, sourceclip->source_package_uid))) + if (!(physical_package = mxf_resolve_source_package(mxf, sourceclip->source_package_ul, sourceclip->source_package_uid))) break; mxf_add_umid_metadata(&st->metadata, "reel_umid", physical_package); @@ -1976,7 +1976,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (!component) continue; - source_package = mxf_resolve_source_package(mxf, component->source_package_uid); + source_package = mxf_resolve_source_package(mxf, component->source_package_ul, component->source_package_uid); if (!source_package) { av_log(mxf->fc, AV_LOG_TRACE, "material track %d: no corresponding source package found\n", material_track->track_id); continue;