From patchwork Wed Sep 15 10:14:39 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: 30256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp133371iov; Wed, 15 Sep 2021 03:15:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5Ao0ZiXESkUq2IfnwAF+nA7V2sJlzHInoeKByugMJyLVdgozbWKwZaFktfb5no4fIm/vv X-Received: by 2002:a05:6402:1ca4:: with SMTP id cz4mr6108481edb.205.1631700919992; Wed, 15 Sep 2021 03:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631700919; cv=none; d=google.com; s=arc-20160816; b=K9aVw2usmDm8FXcpl78wBzcwfQZwYhaSSNJ/GCq9vSvVUAXHR9gvwQxWSukCIZ2woW fvwRXcPKGx3COqPSxdjDNA4A5Jx5tWeW73VhMcj0kBCLC5XOcr15h20M2ZajJELOytUH sRMUJlBfMeZp/6PGQfHJt5i/75N/CMTPvE237Wup90PIrTPJGBIxiBXuNvZrB+iE5iY/ JLuJc/RqP/Ub9pO27bzfYBgphvTvTFj4CZK6ZE44fWgQKic88lZ4O4ZxqyGUn+6l/94x fPJSFCjH9dftwhmPBhAch7eD2A2tKanZQOGy5LeIww/uXj64yoZrXaIegcySzTbfPQxr UBMQ== 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=bL/xmM2/ZwpDaKOBTvU9cGp1kl2tgdzhn1NihmRu1z80+IQQkDyMFecPPBkSIjFp/e O3ScXV4P7+Wn+76+ZRjJkMwGj5btBlf5AFx00M6KKu+5NU0QuV9619sKw+edkaOzJ56Z /3eG2GKPy5Dfbuvr7cdc6CjorWJKpaTNRMIb0UPEvIU4k176fCo4DzwP7crWL5sJQ8Kp JSVrQ9huT6TQqcb/zzqv+zPYJpHKqUjvzn0OQvldKG9e6oRsVV4WyWqS+yZkAACHlMD1 cuAzP3mMlTevnOvAJWLUbQyvnsdiDnDrgcmQKU9Kuz2mo/mGBMVPHUf28Bi5JEx06CGE 9dGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@luminvent-com.20150623.gappssmtp.com header.s=20150623 header.b=TDRs40Wp; 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 w16si12204766ejk.681.2021.09.15.03.14.56; Wed, 15 Sep 2021 03:15:19 -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.20150623.gappssmtp.com header.s=20150623 header.b=TDRs40Wp; 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 5C21368AF8A; Wed, 15 Sep 2021 13:14:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97C8D68AE98 for ; Wed, 15 Sep 2021 13:14:44 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id m9so3038825wrb.1 for ; Wed, 15 Sep 2021 03:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=luminvent-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OITK9jfmTCMBOKszcbSkoObKJR9pyXnwcGODcMonG1c=; b=TDRs40Wp3mfUrvJxflcvfbAVR0wqIdclWAWI3Fpqm9l27c2mrBCWBj2zNwPLcPYmZH rFuB4Nb+Pv50yAKiVymd3r36BwDuKmI6K6RCVBeYbwi2fytDgt51NDuVkYn0UyRzuoK/ 0/Y3HnjkBtJ+8JVU+nXzXCGUqSz+6tyq7tXxvj1ctvgbtiWePg3tML9cpOR9wnMlsnma BKfoLlJHkWBQzGnqfer87f8g472Lhg3tF0YVS9xKZbQAdHRA/OXhTxmPsiw56forpno3 pqd5vPiGq2Ll8e7XxfmfHGbgKffjcZzcTo3MjkL5mZVAHe5cKNBITlsDyeVSin0RiGkk m1vg== 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=22KQmU9jonavCt5ADBJwtrtP/bMhuous8x1zUM5G92tqPWTplRRFibw4dVZwSS1MoE AXeN0vLRqNY6wyrAc1wHxGNiPrfpwFGUWDPVDQavcLW19TmzxQfsvDGPoWc4/BEFkkwb WqDM6DkiUE6fjbyqlug54G2CjEjD8tVM9p0HzC1a69kYKWxbC3iKBf1wsJn/QA9aryEa WkU/jkIbws8tmeBMAuu7aRHNeyfRPsmNAxrArqfci+6HFBbORhF3oQDzkJkmv6aEi3+g qZfrTZI+zyMslJqdKgfUs/wou/zbx+W2+Gy9VNsHPVJUBc5OvFtLY+Pm4PUcHXELfb2d ClUA== X-Gm-Message-State: AOAM533riavxUbfJ0iHNJEZAVNwaI8WHdBwLKpathNYjghpHUXFES4/0 aVBoMz5aBQZEZUV7Uz0XSU8STEqgLCoQXg== X-Received: by 2002:adf:e387:: with SMTP id e7mr4179640wrm.199.1631700883531; Wed, 15 Sep 2021 03:14:43 -0700 (PDT) Received: from localhost.localdomain ([188.65.168.123]) by smtp.gmail.com with ESMTPSA id v8sm11594623wrt.12.2021.09.15.03.14.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Sep 2021 03:14:43 -0700 (PDT) From: Marc-Antoine Arnaud To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Sep 2021 12:14:39 +0200 Message-Id: <20210915101440.45445-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: 2XWYa+xW2zmn --- 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)