From patchwork Tue Nov 30 09:22:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 31835 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7382499iob; Tue, 30 Nov 2021 01:22:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSJHK0jm0MGgfg5KkMZyPrHXF9ohbGAsGlYIUA4LrFaKHpFafYtslz2+IrXuMba44E8dJf X-Received: by 2002:a05:6402:34cf:: with SMTP id w15mr80075133edc.63.1638264154662; Tue, 30 Nov 2021 01:22:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638264154; cv=none; d=google.com; s=arc-20160816; b=A87vRIuHeQX/yyB9aFOdNlANDgsQX7RlPPUKMAJ9w8w/eOPFBoqHqc9BAJdDv9c1c/ UCrI+AqJ/A06wmXMm4CI7DeuUiD6+jEqTBHwiSMl0Itb/p7sPzeV4UstHiUjplGsDLRl 66zq2AroUebVm5vPUAEL44YZ59mgUciiIiDqNUJQ8X16jHTdMM8Us2jIMvgPBAH/7NXb sxwfFUZSzqO4FvuaorVbC4KzcPTG40PYXTXu1pq7X/Qc2bWDMe1e29tgdhrGr27R2WR7 0eQ2kpoog7NOo9e/eX8utNEs9slRgnJ7YNpveXy1l//U25vIdJ2dQfOeLy4f7vkcA99v 9BrA== 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 :delivered-to; bh=EBu5GlEFIwobM9L7skXDq5zEkeLMncagnjS1L4ftYB0=; b=da872P0jKYtC/L/p2ia8RNKHTu/oEVQ6o44zE2td6K9S7+ZN3VdwVLpUItUI2eD8Ch ueCyKAjmQBA6ewwRKaoPmY84WWg0nAVZzcuKkVI7KXSSdqArTC/cwJ7BW4NM6opsF+5m 52NpxW6mR5JgK/9XBkYpyHAqxB33WIPQxtkmvqnYyY+6wei7CGWN+Gs27JS8UK3kZTnA HzbXInJDN/9VyvWhbM6tIk7SOc8u+XL48OHBVlsZYtF/n09wnhMGvFCwd1svYAQ4Rmdc GVBoU8s9HdArgyAyT6zFmphP0gya6SY4SwrK70aH/Th7f97JXRP/QcXfBaSs8QhbDxs8 +DiQ== 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 z12si31844509edd.598.2021.11.30.01.22.33; Tue, 30 Nov 2021 01:22:34 -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 9E59968AE4D; Tue, 30 Nov 2021 11:22:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-1.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 871A668819D for ; Tue, 30 Nov 2021 11:22:24 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-1.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id E00BE2814E; Tue, 30 Nov 2021 09:22:22 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 10:22:20 +0100 Message-Id: <20211130092220.1307-1-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.34.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfenc: fix DNxHD GC ULs 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0piKe6wlSZs8 Fix GC container ul. Fix GC element type both for the generic case and for OPAtom. Thanks to Philip de Nier for checking the values, especially for OPAtom. --- libavformat/mxfenc.c | 8 ++++++-- tests/ref/lavf/mxf_opatom | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index fcd9afda2a..38de3d1ab5 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -32,6 +32,7 @@ * SMPTE 379M MXF Generic Container * SMPTE 381M Mapping MPEG Streams into the MXF Generic Container * SMPTE 422M Mapping JPEG 2000 Codestreams into the MXF Generic Container + * SMPTE ST2019-4 Mapping VC-3 Coding Units into the MXF Generic Container * SMPTE RP210: SMPTE Metadata Dictionary * SMPTE RP224: Registry of SMPTE Universal Labels */ @@ -181,8 +182,8 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x00,0x00,0x00 }, mxf_write_cdci_desc }, // DNxHD - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, - { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x0C,0x00 }, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 }, mxf_write_cdci_desc }, // JPEG2000 @@ -2674,6 +2675,9 @@ static int mxf_init(AVFormatContext *s) memcpy(sc->track_essence_element_key, mxf_essence_container_uls[sc->index].element_ul, 15); sc->track_essence_element_key[15] = present[sc->index]; + if (s->oformat == &ff_mxf_opatom_muxer && st->codecpar->codec_id == AV_CODEC_ID_DNXHD) { + sc->track_essence_element_key[14] = 0x06; + } PRINT_KEY(s, "track essence element key", sc->track_essence_element_key); if (!present[sc->index]) diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index 61e755550b..e34cf2559e 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -5d235c127ace64b1f4fe6c79a7ca8be6 *tests/data/lavf/lavf.mxf_opatom +aab6397829bd90f0c77a3f9fde53bb9c *tests/data/lavf/lavf.mxf_opatom 4717625 tests/data/lavf/lavf.mxf_opatom tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a