From patchwork Thu Sep 2 10:22:28 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: 29951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp140023iov; Thu, 2 Sep 2021 03:22:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyz4hl3gd3EG+YvXXqRvLR+uVD+QPFtQ1jXnu5Q/MhT8uXeSR5vN0CN1K8Dwtl+bkxn134q X-Received: by 2002:aa7:c685:: with SMTP id n5mr2780031edq.27.1630578165898; Thu, 02 Sep 2021 03:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630578165; cv=none; d=google.com; s=arc-20160816; b=vPqExQ/m7LiXi/IexSJTMJR2hVGUwVWlJ835coSGkArc6abQirt36kx70CuYdAeZji JK/1QBns1vSDDzA10gt2NrJXWX09fiuIRp19wVGPkZ6piV1ycBBlIB0PSLWg5Vk8jwVy NJHe11uSLnAdD1KzwhFYHosvCn9pFZefVT8nUmRNYeXriAUTJ5IIC1GsvkbwJRNjIbry /N8KpKGxL9IGW6LCjFXk+8itiDaxiydcNKmWqnuqj4en2axpBQS6oVx0PzbPPIeGR03j 09JpwOgS4O205oFyBcTpxn9zFRtVmmTbYOy2BL/NcND3RqFIbwZhoShoy+Em4RX62LSP KnUA== 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=0MaxEpy8awLkg7Ho5i+ql1Es5bBex72Y4hldyaBT5FX56mTK/4orzDmbmXHWEQFCxm AYGjeF1aHOzoznMeZb8N7xw64ZVzlQVxAm001DiAF3OUWTIl3ekBGR5+3vAq2/9mobwW CMbPFlhXvZrEq9wdNwGW+kOehl+olUcNVueArodipTQfonPfvrmQl6QBCFJDnYENS55B 11sXgbU/5Bu577WG+xQRCL87EkAhcdigMpq4GPrZ8Zud2GdNEP6ycJ0p5Khn4L9btUTs 2BBwTmZ0cXQHrfNAM8O7/Rxvcbf8INRbxG5RDfLOK5VjzP5lOP6fyo20tPiY9XUZEBGh eADg== 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=WrxdmPiA; 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 r19si1568175edd.599.2021.09.02.03.22.44; Thu, 02 Sep 2021 03:22:45 -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=WrxdmPiA; 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 31CEA68A1BB; Thu, 2 Sep 2021 13:22:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0DDE68A1BB for ; Thu, 2 Sep 2021 13:22:33 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id b6so2050675wrh.10 for ; Thu, 02 Sep 2021 03:22:33 -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=WrxdmPiAdZg1C2ETrcmFyryxoEcPyR/SRDE7l0zAq9ujDQpjCNT5rZFZXvsCNr0uhE UmV1LuexvXpnftkgZ+X4v+t5MR76AdLxMSzEKfSsH2TbMDxJ+ncVp8Vy45DHhZU5JjSq 9et8LyQjAFFCK1Bxkjq/jZ/Rm3mmknzFHZ4lgN/FhnSK01B0diqbJ3bqpqZr7GEE70YK KnaGHO5R32lJnv2fffxzYVtR2CM8UDYX2gFWt1Ja5ozLw9N34EY+hf4ZAFxcB97WrE+/ LL19jSpSTf61ZLPzFIaVjcQnT8PnIDfF+9eRZvcgl+ewqKTdGsX5dePPYiytLtwhO6S0 1bDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OITK9jfmTCMBOKszcbSkoObKJR9pyXnwcGODcMonG1c=; b=A67V4Yvzk1jEIQ6q+uyl3d0wrE0CbEpkoyF4uYoLjYlt1ZwxDEU8ABfhKohf6CQNaa MVmN0Mk+dW2ZdIRHB9qUWkvRtQ5wf+cXdo5YLjG9hg6I9daHn462ByuFWQY8xNgHv/SO 65WOMz4+Zz4H0WMLzX+1Guu8yLeKOY5XxDCZHEGX1HoaX68QdfQ1ILalbbsT59QX8wrb 9sTb1GU0vV0/sat+LFrdW09nz/tY0UPahtzqS9uUlTpwFaHjDlF23StBWvObPaTbV4uO f1bcCjuW+JyraP9pn1cxc+4GAca4cIdvvlVxf8F7b7yjyYhMPscfJ4y8QThfeg/MuL6U Zk7w== X-Gm-Message-State: AOAM5325HOy5z5VeAEY0pKOJy93AGkfdYNVuiPgeUhd3XvOIwOAy6Ew+ mza90cOMl6LYMOojSedAMJNz6EhPzy9wJw== X-Received: by 2002:a5d:456d:: with SMTP id a13mr2809812wrc.364.1630578152755; Thu, 02 Sep 2021 03:22:32 -0700 (PDT) Received: from localhost.localdomain ([188.65.168.123]) by smtp.gmail.com with ESMTPSA id j207sm1350264wmj.40.2021.09.02.03.22.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Sep 2021 03:22:32 -0700 (PDT) From: Marc-Antoine Arnaud To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 12:22:28 +0200 Message-Id: <20210902102229.82950-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: wHno4fsPTvDe --- 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)