From patchwork Tue Apr 18 14:30:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 3443 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1740904vsd; Tue, 18 Apr 2017 07:30:23 -0700 (PDT) X-Received: by 10.223.170.129 with SMTP id h1mr22112977wrc.140.1492525823775; Tue, 18 Apr 2017 07:30:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u36si20890650wrc.219.2017.04.18.07.30.23; Tue, 18 Apr 2017 07:30:23 -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; 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=NONE 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 E2CBD689743; Tue, 18 Apr 2017 17:30:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 987D468060B for ; Tue, 18 Apr 2017 17:30:06 +0300 (EEST) Received: by mail-wm0-f53.google.com with SMTP id o81so57776880wmb.1 for ; Tue, 18 Apr 2017 07:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=CxjheP4zhfROxlDTr998tFaLi+cSExxbrzP2VglRv5c=; b=fwpyVNETtC9HoX+drZfSUKf75vVM6Oy8qM2waeN5nEVI94FSRKJ/pS2xLcg6RDPXE0 /cqlJdSMAtWNSpOlrov95bDAx0pCgRFD5DA2GJ5jbxy6/8Z0HOAlJ1r9dG1Ll3pLHMu9 MtISoEJIc881utDt06cW+7DryGxs7U7GIBI4ZHBe5EUYFfLohDvah0gDBKZdRyC9jso9 gKtFEWkx1kyFQ00mRpyxwtg3nCuF1brZHxpVWH8DJ+c0c2++KT3Hi05rYdfPtVbMHNsQ lLhrlGO52URhoBL/VODW8dnO6xHlvsVqh1rETeodLo4dtCTb/rIi5IPxCVS4d4i4nMR2 xu2w== 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; bh=CxjheP4zhfROxlDTr998tFaLi+cSExxbrzP2VglRv5c=; b=WyicKmBd+kZOt74tFcFBEbrS2c/gWpZY5VHahxi2uLCv2V80S7XTICNAO1ykB/rHs3 YOCG3lJNOqoG6BcWsXyEE+AmiCQXPULpHZ+8xTTl/iKJtJIQ/q11IesMPX8AwqXCRbbo BWXTeO6Af12rMidNMsf9rD3zG8RIXBRioYHuwRZc18fHr1LxYD6SYDcF96qhtFOyalqb JD/LiTx+ITxP+8BDOALNN2DClEpQcfaO9Wn/Y1EXe6MZw3kT+Hr8vudQSl6DIO9XLMpx lFnxy4b3RuEmc6SQUImFkxTt5NBs91cHSKq9Oy31PoHqFc9WilcunNb5sCvFE9tEFi7a p3Dg== X-Gm-Message-State: AN3rC/5MXhrS8yGEKaI4mt1s+p8nHmPe1i5YwMJClPKNzOOp6gyG8SHI opL6j/1Fxtvld7xMoMo= X-Received: by 10.28.47.23 with SMTP id v23mr13275999wmv.50.1492525814151; Tue, 18 Apr 2017 07:30:14 -0700 (PDT) Received: from localhost (p4FC4F5F1.dip0.t-ipconnect.de. [79.196.245.241]) by smtp.gmail.com with ESMTPSA id s82sm15234411wmb.33.2017.04.18.07.30.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 07:30:13 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Apr 2017 16:30:12 +0200 Message-Id: <20170418143012.5372-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.12.2.windows.2 Subject: [FFmpeg-devel] [PATCH] movenc/isom: update vpcC box to the latest draft specification 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This brings our generation of the vpcC box up to date to the latest draft version of the VP Codec ISO Media File Format Binding. Specifically, color/transfer properties are now written with values based on ISO/IEC 23001-8, which is the same reference specification the AVColor* enumerations are based on. --- libavformat/vpcc.c | 53 ++++------------------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/libavformat/vpcc.c b/libavformat/vpcc.c index 2390e1711c..d20ca9edc2 100644 --- a/libavformat/vpcc.c +++ b/libavformat/vpcc.c @@ -23,44 +23,6 @@ #include "libavutil/pixfmt.h" #include "vpcc.h" -enum VpxColorSpace -{ - VPX_COLOR_SPACE_UNSPECIFIED = 0, - VPX_COLOR_SPACE_BT601 = 1, - VPX_COLOR_SPACE_BT709 = 2, - VPX_COLOR_SPACE_SMPTE_170 = 3, - VPX_COLOR_SPACE_SMPTE_240 = 4, - VPX_COLOR_SPACE_BT2020_NCL = 5, - VPX_COLOR_SPACE_BT2020_CL = 6, - VPX_COLOR_SPACE_RGB = 7, -}; - -static int get_vpx_color_space(AVFormatContext *s, - enum AVColorSpace color_space) -{ - switch (color_space) { - case AVCOL_SPC_RGB: - return VPX_COLOR_SPACE_RGB; - case AVCOL_SPC_BT709: - return VPX_COLOR_SPACE_BT709; - case AVCOL_SPC_UNSPECIFIED: - return VPX_COLOR_SPACE_UNSPECIFIED; - case AVCOL_SPC_BT470BG: - return VPX_COLOR_SPACE_BT601; - case AVCOL_SPC_SMPTE170M: - return VPX_COLOR_SPACE_SMPTE_170; - case AVCOL_SPC_SMPTE240M: - return VPX_COLOR_SPACE_SMPTE_240; - case AVCOL_SPC_BT2020_NCL: - return VPX_COLOR_SPACE_BT2020_NCL; - case AVCOL_SPC_BT2020_CL: - return VPX_COLOR_SPACE_BT2020_CL; - default: - av_log(s, AV_LOG_ERROR, "Unsupported color space (%d)\n", color_space); - return -1; - } -} - enum VPX_CHROMA_SUBSAMPLING { VPX_SUBSAMPLING_420_VERTICAL = 0, @@ -100,12 +62,6 @@ static int get_bit_depth(AVFormatContext *s, enum AVPixelFormat pixel_format) return desc->comp[0].depth; } -static int get_vpx_transfer_function( - enum AVColorTransferCharacteristic transfer) -{ - return transfer == AVCOL_TRC_SMPTEST2084; -} - static int get_vpx_video_full_range_flag(enum AVColorRange color_range) { return color_range == AVCOL_RANGE_JPEG; @@ -117,10 +73,8 @@ int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, int profile = par->profile; int level = par->level == FF_LEVEL_UNKNOWN ? 0 : par->level; int bit_depth = get_bit_depth(s, par->format); - int vpx_color_space = get_vpx_color_space(s, par->color_space); int vpx_chroma_subsampling = get_vpx_chroma_subsampling(s, par->format, par->chroma_location); - int vpx_transfer_function = get_vpx_transfer_function(par->color_trc); int vpx_video_full_range_flag = get_vpx_video_full_range_flag(par->color_range); @@ -138,9 +92,10 @@ int ff_isom_write_vpcc(AVFormatContext *s, AVIOContext *pb, avio_w8(pb, profile); avio_w8(pb, level); - avio_w8(pb, (bit_depth << 4) | vpx_color_space); - avio_w8(pb, (vpx_chroma_subsampling << 4) | (vpx_transfer_function << 1) | - vpx_video_full_range_flag); + avio_w8(pb, (bit_depth << 4) | (vpx_chroma_subsampling << 1) | vpx_video_full_range_flag); + avio_w8(pb, par->color_primaries); + avio_w8(pb, par->color_trc); + avio_w8(pb, par->color_space); // vp9 does not have codec initialization data. avio_wb16(pb, 0);