From patchwork Tue Mar 5 18:19:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 12200 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 0D3B5448034 for ; Tue, 5 Mar 2019 20:19:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBFB968A4CB; Tue, 5 Mar 2019 20:19:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A28168A0C1 for ; Tue, 5 Mar 2019 20:19:44 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id w4so9951443qtc.1 for ; Tue, 05 Mar 2019 10:19:44 -0800 (PST) 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=zo64vTriFi050s+cG02shkBBJE8S0J3jMYnfZrE4g7w=; b=k+N3frwl0sUvyvwh3Mivds+3mN0O7uNTZe59MLbKiDAtIINXiqaHUal+ZyuMc0LIlW gMZNnRJatjCtn5JcRx/Z0g/gTpuMX82201JkZzvKrWpgYy/Po7VmmWFh0fyzVJCCvQeh iyDuRyIg4tRtyesstCmqpQ3dY8fo9k8ZnPk+JdsXspEJtoUURx4QVYn/l9h/P2JTW8Go a+QsekTRzt4EVy5ZNiHO0A37v6aQj7SmrX5JFdETx1RxVI/1i98JwB7U1/innQ7o+PTs +N8l82fl3oj8/ebUeWSf3CYMn3pV9ZZHb0lIeavT9r7+pa8PUV1LzWnGNyjVPYiw/oN5 sl7A== 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=zo64vTriFi050s+cG02shkBBJE8S0J3jMYnfZrE4g7w=; b=ezy1sSAH/C0IvxDqGN/J8c6jPzXdhzQ5mtQFQnkM9oL4+BFOhtWideMQ6Z/k0yEuab 2Q3bjZyIKayXguQIQYtZTJ9nbmfK21LddDlDBe9k7kNwgv2Rka0UnV0uEIVtNpJWWQTR 3TkNWn5sySKLaoKGcPDrJaqawmPKX8CSM/1DN3xa6PFndS7h33tzs/VMCoPtgsqaupc5 elbKyq/4HHo8oQ+SFQZ2Y2dgUievoRmxn8rFQxwEv7KwTO8I4T37Dmk4dOj/LYXsYnLI g2aBlcYdccGUgM1ioM1uxiSJbYcyo3QJLt6bg2VfqCBn/hqnsKgsS+uRI8Rxg9A/KEFX Yjkg== X-Gm-Message-State: APjAAAWpEYmr1H2j3RTVJmFB8e/8g+A0qXSGsY+KoOkyYe0GLj5z26rK DQV27WIRFk9JvfSx9fi2lNPnCDJZ X-Google-Smtp-Source: APXvYqzGZFAyeatmLijzWNyYLv0Olykx0JmlTH7MrQwPwYpjucnbOcZPmK36n6793QDq5av5PHdqvA== X-Received: by 2002:ac8:1bf7:: with SMTP id m52mr2549775qtk.200.1551809982626; Tue, 05 Mar 2019 10:19:42 -0800 (PST) Received: from vimacnew.iac.corp ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id u25sm5200075qkj.96.2019.03.05.10.19.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 10:19:41 -0800 (PST) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2019 13:19:41 -0500 Message-Id: <20190305181941.32249-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libdav1d: Add support for reading hdr10 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- configure | 2 +- libavcodec/libdav1d.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dcead3a300..a5cef4bc09 100755 --- a/configure +++ b/configure @@ -6142,7 +6142,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 -enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.1.0" "dav1d/dav1d.h" dav1d_version +enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.2.0" "dav1d/dav1d.h" dav1d_version enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index ed02da4ebf..355dd184f4 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -22,6 +22,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "avcodec.h" @@ -90,7 +91,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) Libdav1dContext *dav1d = c->priv_data; Dav1dData *data = &dav1d->data; Dav1dPicture *p; - int res; + int i, res; if (!data->sz) { AVPacket pkt = { 0 }; @@ -206,6 +207,33 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR_INVALIDDATA; } + if (p->mastering_display) { + AVMasteringDisplayMetadata *mastering = av_mastering_display_metadata_create_side_data(frame); + if (!mastering) + return AVERROR(ENOMEM); + + for (i = 0; i < 3; i++) { + mastering->display_primaries[i][0] = av_make_q(p->mastering_display->primaries[i][0], 1 << 16); + mastering->display_primaries[i][1] = av_make_q(p->mastering_display->primaries[i][1], 1 << 16); + } + mastering->white_point[0] = av_make_q(p->mastering_display->white_point[0], 1 << 16); + mastering->white_point[1] = av_make_q(p->mastering_display->white_point[1], 1 << 16); + + mastering->max_luminance = av_make_q(p->mastering_display->max_luminance, 1 << 8); + mastering->min_luminance = av_make_q(p->mastering_display->min_luminance, 1 << 14); + + mastering->has_primaries = 1; + mastering->has_luminance = 1; + } + if (p->content_light) { + AVContentLightMetadata *light = av_content_light_metadata_create_side_data(frame); + if (!light) + return AVERROR(ENOMEM); + + light->MaxCLL = p->content_light->max_content_light_level; + light->MaxFALL = p->content_light->max_frame_average_light_level; + } + return 0; }