From patchwork Sun Jun 6 02:27:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 28107 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2380925iof; Sat, 5 Jun 2021 19:27:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/eakrzbxo8GoXWQ4Lwc73r+nBJi8dXETVb3YM4OVz6qV0U7laR4BWprip2qb/XdJS9YrX X-Received: by 2002:a17:906:c245:: with SMTP id bl5mr11201498ejb.394.1622946470895; Sat, 05 Jun 2021 19:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622946470; cv=none; d=google.com; s=arc-20160816; b=LETN5iHV/y0OD3QuF17ix4iShnHMqu2YeBNsUnB5RADEHXquR7RYdf8MmCQL1cDsvh BN+XkVEY5sBYEj9aKTXFTqTxgYXjsTniujzAZjktN8WC1dw1D/Cz864n5uYhhd4CTi7h RU1Boa7G7It0VOgXMY7a3lKf1vo/pP+RbnP39+2U0Iy2PO7NZSHXQLmeWuakbyh+aWqT epnsHJqZznT2/s3PyC+VGPMNY4kli1b00vCCUXrj5QEVLF36QWAJ+R+SGLn/OnBkxtGe zGV3peaRhb8QH0Qc8Ycwd3IKO2KU2FUcWdHtFtE0ACYWyrz8+j/NtRC3nEA5zPdSFKCl V48A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=EGt65wtnEMvPWWSCW0Qwzyk/gGgkpsYf0WfaK2ZghxM=; b=fUVIzXPsGM3HHdusVsFAj0zTo5TmKXEcrL9GoCROlqkOB35x3t0dapxFhXM3thPJ9j dLacXEms7qMynVIHC7sz8TSzfbiMzFCh+VlNtnm48l30k9TmI0/mPmx4LxR+rxQYhe0U nqrGB37BkCeLEQihvEZlYjd2MO+AXqi5O0HpMBckX8dUIkC6Po/Uol9RTf5B8xnkNAzL Xm2EB4BDTy4tf1UEDazvWPNKN4RCctv/xF22OzH0L8pzUpomhlY8m9XSCCk3nKt9fXjr SCMZavMazXn+sStMoXsdeuhpHyrQV3IjuMRbgc3vTUgfuRNPn0ld0pRaXLk/VrDeOOZQ XHlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="usz/LeO4"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n1si9037857eja.710.2021.06.05.19.27.50; Sat, 05 Jun 2021 19:27:50 -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=@gmail.com header.s=20161025 header.b="usz/LeO4"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3282668A6E7; Sun, 6 Jun 2021 05:27:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27AAD68A654 for ; Sun, 6 Jun 2021 05:27:42 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id a4so17022244ljd.5 for ; Sat, 05 Jun 2021 19:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=L0ATC0cHGK0ytapcNicKF37js3Jxfls+Qsg4fstGHPs=; b=usz/LeO4sZkvHBqM6miAZoVnf+Y4kHtc0oU/EoKRtqMDm5Idbc3+ae9gaqP1nSKLH6 W50DO9fVDPzEL+MrL2t0TQee7VOGai//5/KndrIgVcILYrsso81Em/teOz5edAxFwWjU jx3htn730XHX6vTdJ+y0lEkaVHAkvH+bbIxyrwtonZb7UK1pw47D72Tn2fnG7JmfhG5k YFS1Uy913zqpDAPZiZOLApDC7SqsBy8984vXriDXfRhsxiTi7bHP8FSzj84knIIzNYON Y5e0rKyrGykNmv9Rl4YF5RIVdlaln3uFdrMqIsqtek12+N7jKWkbTla+CCZdG0AjBGpW //6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=L0ATC0cHGK0ytapcNicKF37js3Jxfls+Qsg4fstGHPs=; b=TmvYzXAVdObzP2S1feRAPXxRdSD19M2bpLAIWuMdXQ9DMI4NkqSHjXG2vZPk+MFrn3 bK1KBW/+tNCD/W1Fb1tVom7x07hkK43JKP7qlwJsc08bqVlO7SRIs/P+TMPMag4dVCwG dGwDOoconlTmw/aFurZlyZwtKzas2ZopcASilVkCCSxdGzrDkUYzakeupgTE2XpWwRm4 DlD5j4L0I52mkE1ZHxKdKjF95G27csLQ7FOsDY0Qg3+1SiZ4q3eHZ8IAjt64XbxWjYZr 73dfxu5k1lvapoIXt/oKOyThxlTvPf3NmQoWyOcFG/YbBuUKDlR7/ya/gLMIytA9FnuK pBqA== X-Gm-Message-State: AOAM533aNzf7mNLkAcEwHloAh9n0GVSLq9NvJew4teeSU6zgV8/+ABW2 U2+/TafpcR4DKPUjvZ1it41rWxa85Z6hlw== X-Received: by 2002:a2e:a78c:: with SMTP id c12mr9253441ljf.421.1622946461190; Sat, 05 Jun 2021 19:27:41 -0700 (PDT) Received: from localhost ([109.252.91.149]) by smtp.gmail.com with ESMTPSA id y21sm1013416lfk.191.2021.06.05.19.27.40 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 05 Jun 2021 19:27:40 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Jun 2021 05:27:39 +0300 Message-Id: <20210606022739.88417-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfdec: fixed jp2k_rsiz and 170M matrix 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KUdqbXXPHheu Again. 240M matrix is different from BT.601! And 170M is the same as BT.601. It is primaries that are the same in 240M and 170M, as for jp2k_rsiz see page 17 of ST 422:2019. IT WAS THERE since 2006. This wrong jp2k_rsiz is a copy-paste of header_open_partition_key. --- libavformat/mxf.c | 2 +- libavformat/mxfdec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 85a65f8718..7c355d789b 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -132,7 +132,7 @@ const MXFCodecUL ff_mxf_color_space_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x01,0x01,0x02,0x05,0x00,0x00 }, 14, AVCOL_SPC_RGB }, /* GBR */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x01,0x01,0x02,0x06,0x00,0x00 }, 14, AVCOL_SPC_BT2020_NCL }, /* ITU-R BT.2020 Non-Constant Luminance */ /* alternate mappings for encoding */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x06,0x04,0x01,0x01,0x01,0x02,0x03,0x00,0x00 }, 14, AVCOL_SPC_SMPTE170M }, /* = AVCOL_SPC_SMPTE240M */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x02,0x01,0x00,0x00 }, 14, AVCOL_SPC_SMPTE170M }, /* = AVCOL_SPC_BT470BG */ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AVCOL_SPC_UNSPECIFIED }, }; diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 3bf480a3a6..9e92ef4175 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -330,7 +330,7 @@ static const uint8_t mxf_encrypted_triplet_key[] = { 0x06,0x0e,0x2b,0x static const uint8_t mxf_encrypted_essence_container[] = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0b,0x01,0x00 }; static const uint8_t mxf_sony_mpeg4_extradata[] = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0e,0x06,0x06,0x02,0x02,0x01,0x00,0x00 }; static const uint8_t mxf_avid_project_name[] = { 0xa5,0xfb,0x7b,0x25,0xf6,0x15,0x94,0xb9,0x62,0xfc,0x37,0x17,0x49,0x2d,0x42,0xbf }; -static const uint8_t mxf_jp2k_rsiz[] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }; +static const uint8_t mxf_jp2k_rsiz[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0a,0x04,0x01,0x06,0x03,0x01,0x00,0x00,0x00 }; static const uint8_t mxf_indirect_value_utf16le[] = { 0x4c,0x00,0x02,0x10,0x01,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 }; static const uint8_t mxf_indirect_value_utf16be[] = { 0x42,0x01,0x10,0x02,0x00,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 }; static const uint8_t mxf_apple_coll_max_cll[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x0e,0x20,0x04,0x01,0x05,0x03,0x01,0x01 };