From patchwork Thu Dec 10 12:27:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Mallon X-Patchwork-Id: 24515 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7110B44BD60 for ; Thu, 10 Dec 2020 14:27:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5726968A0CD; Thu, 10 Dec 2020 14:27:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24E3B688093 for ; Thu, 10 Dec 2020 14:27:29 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id c5so1655514wrp.6 for ; Thu, 10 Dec 2020 04:27:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codex.online; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=n4h2Sd4gwW4LtBRRMNUAasSZi1fTqAcksQKDPLN7yZI=; b=ecG28OnoRORNlF9sk6wj/FXQQRdF9mKHKORIbwU2mcyHApBzrC43Poy01bOdrhN8Yw i9CNDMI4AWmBGeR5iuDT+tByBAI1KY1zsTdxcv0A+8F6RBhzoGhG28rVmzmyD0iMpika FcYjvN+xjl5ywfp9frsL8Vrkas3d/H/3/vBjc= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=n4h2Sd4gwW4LtBRRMNUAasSZi1fTqAcksQKDPLN7yZI=; b=PYXugG/AslB1yWJyUMDXYwqVxU3L/uaqTmQnzWDQK8iu35ZY06azze5QHC+6t6smYK hiFMwGOW93cIuOTje5160PVNwzTM1mYyW0j/WcOdc2XQM7A30tmuX0Oq0JvED21FN5TK Z0aGJLfTULsyrR81a8u8vXPp2+n2X13vuFclSW9esOkmAgQwyT6KRKU6bKqhR4NK8ok9 TOYoUDMya4z0M2K0wUwKp1m+6NdjKvJMZA5aIL3JXyfq42zxPEjzvwHKiXgkIxtQfVTg VCuWQihGNYoUI94+QKh8p7iUc8P/VFOzCyhR0F1EOM29vUebckxCNIP0TnucaxYjoZBZ z2ZA== X-Gm-Message-State: AOAM533v1pGX23juy7rgZdPs3I6rebe8PZgztDKbm4OPwAR3RQAv2I+c 5bvDggauRhgWTQ5ta/hPo/Az4pififnZQvl4 X-Google-Smtp-Source: ABdhPJwQWfTxFvcm9JoUaz5xpF2tutwx49BxFyNp8K0dNUgWB/eFxtGpmumRQmGcFtpXpuzPtDGeZw== X-Received: by 2002:adf:bb0e:: with SMTP id r14mr8169271wrg.159.1607603248260; Thu, 10 Dec 2020 04:27:28 -0800 (PST) Received: from localhost ([66.159.216.147]) by smtp.gmail.com with ESMTPSA id l11sm8822267wmh.46.2020.12.10.04.27.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Dec 2020 04:27:27 -0800 (PST) From: Harry Mallon To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:27:17 +0000 Message-Id: <20201210122718.74374-5-harry.mallon@codex.online> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201210122718.74374-1-harry.mallon@codex.online> References: <20201207103214.75790-1-harry.mallon@codex.online> <20201210122718.74374-1-harry.mallon@codex.online> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/6] avcodec/dpx: Read color information from DPX header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Harry Mallon --- libavcodec/dpx.c | 127 +++++++++++++++++++++++++++++++++++++-- tests/ref/fate/dpx-probe | 8 +-- 2 files changed, 127 insertions(+), 8 deletions(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 577171258a..7b18141f97 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -28,6 +28,38 @@ #include "avcodec.h" #include "internal.h" +enum DPX_TRC { + DPX_TRC_USER_DEFINED = 0, + DPX_TRC_PRINTING_DENSITY = 1, + DPX_TRC_LINEAR = 2, + DPX_TRC_LOGARITHMIC = 3, + DPX_TRC_UNSPECIFIED_VIDEO = 4, + DPX_TRC_SMPTE_274 = 5, + DPX_TRC_ITU_R_709_4 = 6, + DPX_TRC_ITU_R_601_625 = 7, + DPX_TRC_ITU_R_601_525 = 8, + DPX_TRC_SMPTE_170 = 9, + DPX_TRC_ITU_R_624_4_PAL = 10, + DPX_TRC_Z_LINEAR = 11, + DPX_TRC_Z_HOMOGENEOUS = 12, +}; + +enum DPX_COL_SPEC { + DPX_COL_SPEC_USER_DEFINED = 0, + DPX_COL_SPEC_PRINTING_DENSITY = 1, + /* 2 = N/A */ + /* 3 = N/A */ + DPX_COL_SPEC_UNSPECIFIED_VIDEO = 4, + DPX_COL_SPEC_SMPTE_274 = 5, + DPX_COL_SPEC_ITU_R_709_4 = 6, + DPX_COL_SPEC_ITU_R_601_625 = 7, + DPX_COL_SPEC_ITU_R_601_525 = 8, + DPX_COL_SPEC_SMPTE_170 = 9, + DPX_COL_SPEC_ITU_R_624_4_PAL = 10, + /* 11 = N/A */ + /* 12 = N/A */ +}; + static unsigned int read16(const uint8_t **ptr, int is_big) { unsigned int temp; @@ -134,6 +166,7 @@ static int decode_frame(AVCodecContext *avctx, int magic_num, endian; int x, y, stride, i, j, ret; int w, h, bits_per_color, descriptor, elements, packing; + int yuv, color_trc, color_spec; int encoding, need_align = 0; unsigned int rgbBuffer = 0; @@ -193,6 +226,8 @@ static int decode_frame(AVCodecContext *avctx, // Need to end in 0x320 to read the descriptor buf += 20; descriptor = buf[0]; + color_trc = buf[1]; + color_spec = buf[2]; // Need to end in 0x323 to read the bits per color buf += 3; @@ -294,18 +329,26 @@ static int decode_frame(AVCodecContext *avctx, switch (descriptor) { case 6: // Y elements = 1; + yuv = 1; + break; + case 50: // RGB + elements = 3; break; case 52: // ABGR case 51: // RGBA - case 103: // UYVA4444 elements = 4; break; - case 50: // RGB + case 100: // UYVY422 + elements = 2; + yuv = 1; + break; case 102: // UYV444 elements = 3; + yuv = 1; break; - case 100: // UYVY422 - elements = 2; + case 103: // UYVA4444 + elements = 4; + yuv = 1; break; default: avpriv_report_missing_feature(avctx, "Descriptor %d", descriptor); @@ -349,6 +392,82 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } + switch (color_trc) { + case DPX_TRC_LINEAR: + avctx->color_trc = AVCOL_TRC_LINEAR; + break; + case DPX_TRC_SMPTE_274: + case DPX_TRC_ITU_R_709_4: + avctx->color_trc = AVCOL_TRC_BT709; + break; + case DPX_TRC_ITU_R_601_625: + case DPX_TRC_ITU_R_601_525: + case DPX_TRC_SMPTE_170: + avctx->color_trc = AVCOL_TRC_SMPTE170M; + break; + case DPX_TRC_ITU_R_624_4_PAL: + avctx->color_trc = AVCOL_TRC_GAMMA28; + break; + case DPX_TRC_USER_DEFINED: + case DPX_TRC_UNSPECIFIED_VIDEO: + /* Nothing to do */ + break; + default: + av_log(avctx, AV_LOG_VERBOSE, "Cannot map DPX transfer characteristic " + "%d to color_trc.\n", color_trc); + break; + } + + switch (color_spec) { + case DPX_COL_SPEC_SMPTE_274: + case DPX_COL_SPEC_ITU_R_709_4: + avctx->color_primaries = AVCOL_PRI_BT709; + break; + case DPX_COL_SPEC_ITU_R_601_625: + case DPX_COL_SPEC_ITU_R_624_4_PAL: + avctx->color_primaries = AVCOL_PRI_BT470BG; + break; + case DPX_COL_SPEC_ITU_R_601_525: + case DPX_COL_SPEC_SMPTE_170: + avctx->color_primaries = AVCOL_PRI_SMPTE170M; + break; + case DPX_COL_SPEC_USER_DEFINED: + case DPX_COL_SPEC_UNSPECIFIED_VIDEO: + /* Nothing to do */ + break; + default: + av_log(avctx, AV_LOG_VERBOSE, "Cannot map DPX color specification " + "%d to color_primaries.\n", color_spec); + break; + } + + if (yuv) { + switch (color_spec) { + case DPX_COL_SPEC_SMPTE_274: + case DPX_COL_SPEC_ITU_R_709_4: + avctx->colorspace = AVCOL_SPC_BT709; + break; + case DPX_COL_SPEC_ITU_R_601_625: + case DPX_COL_SPEC_ITU_R_624_4_PAL: + avctx->colorspace = AVCOL_SPC_BT470BG; + break; + case DPX_COL_SPEC_ITU_R_601_525: + case DPX_COL_SPEC_SMPTE_170: + avctx->colorspace = AVCOL_SPC_SMPTE170M; + break; + case DPX_COL_SPEC_USER_DEFINED: + case DPX_COL_SPEC_UNSPECIFIED_VIDEO: + /* Nothing to do */ + break; + default: + av_log(avctx, AV_LOG_INFO, "Cannot map DPX color specification " + "%d to colorspace.\n", color_spec); + break; + } + } else { + avctx->colorspace = AVCOL_SPC_RGB; + } + // Table 3c: Runs will always break at scan line boundaries. Packing // will always break to the next 32-bit word at scan-line boundaries. // Unfortunately, the encoder produced invalid files, so attempt diff --git a/tests/ref/fate/dpx-probe b/tests/ref/fate/dpx-probe index 79fa16bd20..c4e04b2382 100644 --- a/tests/ref/fate/dpx-probe +++ b/tests/ref/fate/dpx-probe @@ -23,8 +23,8 @@ interlaced_frame=0 top_field_first=0 repeat_pict=0 color_range=pc -color_space=unknown -color_primaries=unknown +color_space=bt709 +color_primaries=bt709 color_transfer=unknown chroma_location=unspecified TAG:timecode=00:00:01:18 @@ -56,9 +56,9 @@ display_aspect_ratio=16:9 pix_fmt=gbrp10 level=-99 color_range=pc -color_space=unknown +color_space=bt709 color_transfer=unknown -color_primaries=unknown +color_primaries=bt709 chroma_location=unspecified field_order=unknown timecode=N/A