From patchwork Fri Sep 17 13:49:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc-Antoine ARNAUD X-Patchwork-Id: 30309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2219331iov; Fri, 17 Sep 2021 06:49:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG/dg6wiUmdepntA9dB6sLNYn7JmtgAywa0raWgiA3wpGkWtMyUKO6xJUaJ0YADuL2yQ2R X-Received: by 2002:a17:906:3ed2:: with SMTP id d18mr12750256ejj.311.1631886561698; Fri, 17 Sep 2021 06:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631886561; cv=none; d=google.com; s=arc-20160816; b=Y7FxvkQ5+Cbezo5pWPBr6oQjIsKQQQQS7+sy+19PCG6oEf74aY+nivcblE9mSX5afr V7PMxH3vAgy36qP/LWI4KqURw35FT/x6TmIm9Qa/E0iw5+SUOmCORnwmC1N4OdEGngo9 bZ5nbxrL4hLX/JzcP1Q7yG8GunAveXAGzAyAVuZX1/XTq+YK1xUc25GzJiyr5XXtL4zq QIYyIo34ILDjdqSrxaYVjNQ+o1bTj6q7leF0TAp5o+xnHdLrfqofjcFOlA+lw3HEx5Gk 55/s1oxgi/C6FL2+jm2m6hpGSBkp3ixQ79X83dLEc4NKArE42UenbudBReKZ5dNaw6m4 UDCA== 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 :dkim-signature:delivered-to; bh=vGl/FtKv6PI4LfQbSlQ3KLCzpSSxoJ6GvRr7waMAF0E=; b=LkBDO96iqO578f+MGVNmNAxRSBW72ivbB8xarXoeWhhuzS5zsBoUnJy/N8Uv998S3B etI/eGzpjDwPSRHqHSU7p8nQZV7IanU+ALvXzKGNXr7eJhG+keFiesacKjYMrtgxZLQl 7kA8hnaImBhn6oXwdpEHMmlECZ+aKtcA7fMCAgAo7aNxZezP0Sik8PmaKQGoDSEJ7qFw Sle7Ah08uPBPY7HAevtDxzVVWnA579AbpP9nMA4aeatZ+Botj7IEOIL2at0R1Wdq1IVq Gl1WwIg3n7zohUS7kpySYLEP6An8MrYx8zrs10cDGHSynsOp5MZKffmOj8emW86JHvrR e/4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@luminvent-com.20210112.gappssmtp.com header.s=20210112 header.b=ArIoQjD2; 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 r1si7168083edp.24.2021.09.17.06.49.19; Fri, 17 Sep 2021 06:49:21 -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; dkim=neutral (body hash did not verify) header.i=@luminvent-com.20210112.gappssmtp.com header.s=20210112 header.b=ArIoQjD2; 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 5BA7B68AEA4; Fri, 17 Sep 2021 16:49:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE34A68AA7F for ; Fri, 17 Sep 2021 16:49:08 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 192-20020a1c04c9000000b002f7a4ab0a49so7623216wme.0 for ; Fri, 17 Sep 2021 06:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=luminvent-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OITK9jfmTCMBOKszcbSkoObKJR9pyXnwcGODcMonG1c=; b=ArIoQjD2D24Ou2FJu3MlN/7HrdbYtaXgiiAPXt5gNF78qW4Refr3hVMhymapYLWP7t KomJc1o5YKznbdI57wh7rJWjDEJrzLLUc4CVvETGv782hzRAM1crMF0Mh+vw5W+TLcw6 fmjoSIQap5xeiSuwHPo0mxzG45BQyJcwVGE8RlAKHOhMxgKWb489Tudv0yhA/pj8y3+7 Mr3KquPGOviOlcNaDOyl/3OknOGJwjamHXA4s34Fz77iUWchxaix9LNbmcs2L1b0OPJZ INQp00ccgO64fqDI5X1CA4avUYzB/5dKFB2j6mrOb5RwOqRIQqU7ThEo+GfQj9ZPsYUq quIA== 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:mime-version :content-transfer-encoding; bh=OITK9jfmTCMBOKszcbSkoObKJR9pyXnwcGODcMonG1c=; b=aq44jUqrvJBkWH2K2/rBNqns1LV71WtPazD/tD1y4/BNukFd5Tx+MA55UwJcQ4xwV2 bymDhXCsi4u848nyjU3nmCQdJ6g5cgpwfHdO14SVCyCMtOZz/PcS22PffsGvxvmA9jsN KnmAyJnDOb2gOcDu9ks9yFXkcTNwRsc+SE+NvqBWgRScUDM9tRmWSKAiXWIUf2ZHft0M dV2xRQA2hX3kYWN9+6NyJRH5S67osYy1sUUex+rG81Z4OuIqAuyaXKqLlcyPMZMntBsn JotPjhOJXnkG7+nTdQO5+3R59ThJn7CmwzwHbuBS3JYQgGrovjDW+Qi2Sggc79n772Gh XjKQ== X-Gm-Message-State: AOAM533kmiWV0jZlmUyVyrWMkjsLzqS26xZwDsqBmcOnTgjRoOWUgkVB n2GFjexWrOSPtvBFlYjZs2U7lq4d5gfM1w== X-Received: by 2002:a1c:2141:: with SMTP id h62mr15733219wmh.117.1631886547499; Fri, 17 Sep 2021 06:49:07 -0700 (PDT) Received: from localhost.localdomain ([188.65.168.123]) by smtp.gmail.com with ESMTPSA id z13sm8097852wrs.90.2021.09.17.06.49.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Sep 2021 06:49:07 -0700 (PDT) From: Marc-Antoine Arnaud To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Sep 2021 15:49:02 +0200 Message-Id: <20210917134903.89543-1-marc-antoine.arnaud@luminvent.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mxf: rename sub_descriptors as file_descriptors 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: Marc-Antoine Arnaud Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: x+Z0O51zxVMq --- libavformat/mxfdec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 34cbd2cd77..c28549f6a9 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -203,8 +203,8 @@ typedef struct MXFDescriptor { unsigned int color_range; unsigned int horiz_subsampling; unsigned int vert_subsampling; - UID *sub_descriptors_refs; - int sub_descriptors_count; + UID *file_descriptors_refs; + int file_descriptors_count; int linked_track_id; uint8_t *extradata; int extradata_size; @@ -342,7 +342,7 @@ static void mxf_free_metadataset(MXFMetadataSet **ctx, int freectx) av_freep(&((MXFDescriptor *)*ctx)->extradata); av_freep(&((MXFDescriptor *)*ctx)->mastering); av_freep(&((MXFDescriptor *)*ctx)->coll); - av_freep(&((MXFDescriptor *)*ctx)->sub_descriptors_refs); + av_freep(&((MXFDescriptor *)*ctx)->file_descriptors_refs); break; case Sequence: av_freep(&((MXFSequence *)*ctx)->structural_components_refs); @@ -1194,8 +1194,8 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int switch(tag) { case 0x3F01: - return mxf_read_strong_ref_array(pb, &descriptor->sub_descriptors_refs, - &descriptor->sub_descriptors_count); + return mxf_read_strong_ref_array(pb, &descriptor->file_descriptors_refs, + &descriptor->file_descriptors_count); case 0x3002: /* ContainerDuration */ descriptor->duration = avio_rb64(pb); break; @@ -2066,22 +2066,22 @@ static MXFPackage* mxf_resolve_source_package(MXFContext *mxf, UID package_ul, U static MXFDescriptor* mxf_resolve_multidescriptor(MXFContext *mxf, MXFDescriptor *descriptor, int track_id) { - MXFDescriptor *sub_descriptor = NULL; + MXFDescriptor *file_descriptor = NULL; int i; if (!descriptor) return NULL; if (descriptor->meta.type == MultipleDescriptor) { - for (i = 0; i < descriptor->sub_descriptors_count; i++) { - sub_descriptor = mxf_resolve_strong_ref(mxf, &descriptor->sub_descriptors_refs[i], Descriptor); + for (i = 0; i < descriptor->file_descriptors_count; i++) { + file_descriptor = mxf_resolve_strong_ref(mxf, &descriptor->file_descriptors_refs[i], Descriptor); - if (!sub_descriptor) { - av_log(mxf->fc, AV_LOG_ERROR, "could not resolve sub descriptor strong ref\n"); + if (!file_descriptor) { + av_log(mxf->fc, AV_LOG_ERROR, "could not resolve file descriptor strong ref\n"); continue; } - if (sub_descriptor->linked_track_id == track_id) { - return sub_descriptor; + if (file_descriptor->linked_track_id == track_id) { + return file_descriptor; } } } else if (descriptor->meta.type == Descriptor)