From patchwork Tue Apr 25 18:10:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3488 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp2039727vsd; Tue, 25 Apr 2017 11:11:42 -0700 (PDT) X-Received: by 10.28.37.4 with SMTP id l4mr4345395wml.100.1493143902329; Tue, 25 Apr 2017 11:11:42 -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 r185si5040603wma.136.2017.04.25.11.11.41; Tue, 25 Apr 2017 11:11:42 -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 7DF3D6899D8; Tue, 25 Apr 2017 21:11:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E4A668992B for ; Tue, 25 Apr 2017 21:11:31 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id o36so26291477qtb.2 for ; Tue, 25 Apr 2017 11:11:32 -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=iX/C4CWGfbyyjppQvWH1z6ojAwZiTMP9ZeK8+uehQNI=; b=Mk5Pa4WdtTTL58+C7/baESNpwFcATMB333XqbF5WeZojK8VfbyWP/JgMKA0HbX22yP sQtxUdUFOTavOCH+c1csdA5zubRd3eM/5pr+LpDhbEFj5nJBl0JaouIpcaS6OY8pVypb 08384RPA2BD1k5isrnE5rAWwTvxU04klUNYpH9OyZLEp86Enfri/L5hVRHTTmXDtMydC aBFKOxSZJBSCuJn+09CNIZx3u/zGzh0HKBA65YTmF2eDWvczqcDlq2cjjLntpZi7H1sL 3kGdqkcfIeePuZ1fh38CpyM9Uqg13wL8WEH1qQjKclHutNZjCyyNzc5Vha02JMXjDWnt yzDg== 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=iX/C4CWGfbyyjppQvWH1z6ojAwZiTMP9ZeK8+uehQNI=; b=RecLEJqe02pIsR6NH6LOCG+PSJt8PGPKKP+HjCnmEonJ4qk9jit5Eq7bnA4DFclGOU m8w3j0MEiv0h84TLmAajWTYUHDswOyaGsOvl2Glzamz3IVoRARge65nh7XklE2Xjg9RM YC41GCuqnG2RLUG4MwjzbFsnp+S20ob9f4Z4VvL2KgZXcbz4DWPOeEs6z4b75fYkRqm9 AmeBt2AmLRNVzx6Fq/5ZeGK5sJcmoA30GIk+R6hRWsqafZbYxrdH191uSqBqoVtx3tan 5KJFQOj49o2mC5SsYiKdHwju/mhulKc49U4cPAxvFXLF95tBMhgCuWQf0rwFh1FGLHxS ViqA== X-Gm-Message-State: AN3rC/77P3G974L23CWCtG5HJiIPLkLfvi7hlCbC1e1pnPVig61anEvX 9QinDkmm6bV7ED0P X-Received: by 10.237.62.125 with SMTP id m58mr31097190qtf.36.1493143891248; Tue, 25 Apr 2017 11:11:31 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id e9sm15607930qkb.23.2017.04.25.11.11.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Apr 2017 11:11:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Apr 2017 15:10:40 -0300 Message-Id: <20170425181040.7920-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: export Content Light Level metadata 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" Based on a patch by Hendrik Leppkes Signed-off-by: James Almer --- libavformat/matroskadec.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 47873cccd8..fa786a8457 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1869,6 +1869,21 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { avcodec_chroma_pos_to_enum((color->chroma_siting_horz - 1) << 7, (color->chroma_siting_vert - 1) << 7); } + if (color->max_cll && color->max_fall) { + size_t size = 0; + int ret; + AVContentLightMetadata *metadata = av_content_light_metadata_alloc(&size); + if (!metadata) + return AVERROR(ENOMEM); + ret = av_stream_add_side_data(st, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)metadata, + size); + if (ret < 0) { + av_freep(&metadata); + return ret; + } + metadata->MaxCLL = color->max_cll; + metadata->MaxFALL = color->max_fall; + } if (has_mastering_primaries || has_mastering_luminance) { // Use similar rationals as other standards.