From patchwork Mon Aug 16 08:17:40 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: 29559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1824087iov; Mon, 16 Aug 2021 01:18:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmEdGP94W5xM8OYdeCx99OHWWXqP5Y89VloWP7DwCyIpNhWQO5d2DXU9MuxNd+EX+YzV18 X-Received: by 2002:a17:906:eb06:: with SMTP id mb6mr14871413ejb.50.1629101881423; Mon, 16 Aug 2021 01:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629101881; cv=none; d=google.com; s=arc-20160816; b=u4ns3dhiWjaZIjj7mqich34DMIT1vcma/IlKhuYoDm09PnToS1WKI8vcEvEXRVPQBR V26ofYg4DRsXA0lDr9uGm/obeeifjMZQYO2razVeLVkgh0U1qmE15KsAmTXbjtn+z2d0 d25fRoi8pqH1Rx2Bn6GljhMTxdywBxeN1180fpoYQiRF3gC09Sm0vl3mAKnRcpHoV4Hf YXVcRGHjD/Gsk8jn7e5jfSfqhAY39qqfpSnwoc+LSNNElABKli1pfdmvgb8TJIlBBCmo S+j49cXx/b5TRpJAW3lXjkRYomRmTsyEmhgu1SNlEeCjtqZURLdNX8dYBgS91IHr82kp CmbQ== 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=Mun6G2MW6LwE5HnBwLI7fo3CoSRr2c0rSAmx+7U/a0Q=; b=i4TrIc3hcRVRNjzBigd8ZqTT4P0wZDOHDIynwYldUecox9hABAHgaTFLw5ExkFDzgy DJPzZ/SD/wPno+CL4XAyZ7ImzIHPUVFDwh+dbvqjz95iuWqlu6HgdnKN08CgDG2tmdtG N6wL3vBldFvxB97l2gozkgKADCnYo6bqvwL2UtKHXDRlYhXashmuJb3KQb7LLLF/4I1p GzIbhLccOHenPoZYx3GMgOz4EC7OyXT73OX2mHST6GR3WLfXcJZlvpITeiXTFL58RwZ1 hhFu2TAmKCo22yPMFe+JMWt9d1wrwN/snznSkoJ8N14wcX9bOkFWz37IKsc3ucl7+2by LFSA== 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=p7eynwHD; 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 dz18si9088218edb.465.2021.08.16.01.18.00; Mon, 16 Aug 2021 01:18:01 -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=p7eynwHD; 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 6CCC8689981; Mon, 16 Aug 2021 11:17:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2A0968022E for ; Mon, 16 Aug 2021 11:17:50 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id c129-20020a1c35870000b02902e6b6135279so9600429wma.0 for ; Mon, 16 Aug 2021 01:17:50 -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=HW4zoNhzr/Il/HaVtQPtzCDkPnBW4nDN3sM5VVPM2QY=; b=p7eynwHD7kWu2HOc7fy3frRczWYFTzXPJnBSUNF4iC0KrQJGoSXtQ6U6DBcOMb6SPs sqIvZPi8KOqvmd52/PLjjkwBQKSLeKPnKrMg2/+u+6kicPuVbr+YjjI7Q2wwZZx/iX+a x2v14KC68wvs1q1ZqNwL5cjJvlBihU4qU7ghOp/+/dOpXIjFGQmJggmWWGaAF/LkVPFl vo5mWfS9cVTblLHeZrayztQiI8+B6MA4UdWyxHUUHv87x/gCE3exb0+65XKxf3+1D2pJ K0hF3hkfhbEl9YYjk/RR6rsqWPwMFCT6cxKxl6prCA+NmMj2Jos0Trvu7ezlNq2obkdn /WXw== 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=HW4zoNhzr/Il/HaVtQPtzCDkPnBW4nDN3sM5VVPM2QY=; b=iA20ctNNOzFH52SAt738beSzpk3Xhfm6Z4pJUzzyPUGqOxrVnEr2sPF8DeCOQNQT0i lduLYMSWXZBGVXd5NJgInGOcaqR84PyLnVNe8Q7pQO2U236kwQZ/PLNPCJ1Gb8V9d9a9 0Ql4xob9OAGgLTjtxen+X3gsvIuPMnk+W3h4yZsnSsk/uoHZ94kRjvoaglH3MTUZJNQo N/I92pHaKbuojgfGOjK1439CL7nrlgwp8LGiKhpSv8OlLCCAnjW4gk5jKP/04xnioFa8 ArrR1/zQS7MsznR8Stl3gvMSMuWrG4Dpw/yZNofBej6ehZG4J7aGvK+iFUbsZ9GInHKx Zkjw== X-Gm-Message-State: AOAM531BmPK8ehpY6jfQsiEduue+G7Nj2TwfHaO4PJhuuop5IS1TMkMW d0r8dLna9ozbfcux8Mu6FEEBSSePAi4bqA== X-Received: by 2002:a1c:a181:: with SMTP id k123mr13868828wme.90.1629101869860; Mon, 16 Aug 2021 01:17:49 -0700 (PDT) Received: from localhost.localdomain (pop.92-184-102-171.mobile.abo.orange.fr. [92.184.102.171]) by smtp.gmail.com with ESMTPSA id e25sm13002755wra.90.2021.08.16.01.17.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Aug 2021 01:17:49 -0700 (PDT) From: Marc-Antoine Arnaud To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 10:17:40 +0200 Message-Id: <20210816081741.95543-1-marc-antoine.arnaud@luminvent.com> X-Mailer: git-send-email 2.32.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: zg5Aed0K++S2 --- 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)