From patchwork Sun Jul 16 06:21:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damiano Galassi X-Patchwork-Id: 42752 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4681603pzb; Sat, 15 Jul 2023 23:21:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlFnoAAaWCkZVJieLuF9MlXm1F+HKdR0+GrUsa26lwmrHxZiyjHTrDi6qNYbQIDUoVghb57/ X-Received: by 2002:a05:6402:3491:b0:51e:63df:499c with SMTP id v17-20020a056402349100b0051e63df499cmr8080700edc.18.1689488499558; Sat, 15 Jul 2023 23:21:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689488499; cv=none; d=google.com; s=arc-20160816; b=H0QBpposhJ+BMZoLe6zZZWNXHR0Ds7U8HbHz+a6UEfELQY9PsbJT7+GNHOU3NG97p1 aY0x6hsqe3D3TAoy0Oqmx9RuOCVrVTRUFpm7ZLVuvPDDjRdLmxNpruxxMq3DNasAPtcb W7WEIQ/B5vzBsvxhfS6BKdx0ZzkOqq19+1tQRA7XjKoJ8TdDLL3dHr1YNpV2O6w5q30z G98sdoPHOdQcYmpVF9wPG8P7qdjzItpcymoOJT3ZS50mOk40P0KF9VlTc0VW0mCV4KxL xpCvzNvUctxm3z4BOtfdAHyqrHOUsmC0wHrLw91ZxkEeRMDTUYOWkqulWGoU8FBcS6jP ohIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=Ae6F7Q4BiI/VjkBZG99fiNWQ8JcdCRLhbiHB5l2AfOc=; fh=y1Gepg8x28+Ebx7njomwWi+46AA0Tuzhnl1RBvhiIHg=; b=ePshNqpq4LkPzTbTGAKqrOrycJmqNCUPn4YvCj98ndpPDJS5RwARqNoRIcFw38E9hi QTxZQC5I3Eheh6BTE4Rcc73YTEM4Tn+2NUCr10WkF3eCROIOKAKiRLHL9QIY1Y6QI+JV K3bl7ChnDlByNU3HxJAiSxqvyc5PldEEYsBDJvamVpSJYlR0ERLyZawgegxWlAmzpoOo Y2BVEVKKPGHysVN+FGbpQvlVYqAE0+2TN3+tKfohbJdZqYbk7/pEw1g+fZFGqZhb2IZQ kLcrs3ayXvXo8ih74ArNusBnJiDA2eWanbkRrrsfJfJBFkrG/+hje8X63VDN42zJmHHD 7u+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=qRbfyg86; 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 b5-20020aa7df85000000b0051e3375d4f2si3083818edy.338.2023.07.15.23.21.38; Sat, 15 Jul 2023 23:21:39 -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=20221208 header.b=qRbfyg86; 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 3FAD968C578; Sun, 16 Jul 2023 09:21:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA10E68C4C5 for ; Sun, 16 Jul 2023 09:21:28 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-3fb4146e8fcso20125535e9.0 for ; Sat, 15 Jul 2023 23:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689488488; x=1692080488; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=R8wrnV+csn9vep8o1Jn5qHrHtaxg26X9LcKmh1bNuss=; b=qRbfyg86Y0zTnr1oHyVUNmBJCHjS+TSrJPTAS3jaAh4fLalvvKgmJsxcMXlDj+xiic eEpp/78Emq4It9MJjISB48mNcgidMAHHq0TK6oBldaX7r6qXEGVfjnpdloIWK0YrGdHp BxErAPAiF05Mqd3tO2NHh96EfHtKF72R4Fs3IbrFydCZloim1hIv9niS4lzElcDq7dLC 8Hu3KyuMWbKVMlhHcoo6/QuiX25MySXX7BmdP/vhDEYftS5PinOx+rD7sfzgA5UlSScS IsRGSfvXJdNA0rdd3F00s2OOTGN/TISB3EWMrEqJ97cBLQn0pH1/UPo7SvfM4heuKYi4 HoAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689488488; x=1692080488; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R8wrnV+csn9vep8o1Jn5qHrHtaxg26X9LcKmh1bNuss=; b=j8g8w0JqBJrZQSzL9VNnrz3JssWe5oiDwzZ4w2uQDqPAYu7XaHeSTxKwYK29y7sjXS NoEBwadMd/SEWS79dgFJDW3hQWALL/IG6cN4HD1Mlz57lpBe/bYK361H2OMh6rjUaqPT UKMojZaeu9hQjD7AVkkxIGKePelVZPFPVKDgSiIxiW7xBY/ysdPWaBGmP8LHnt/w8Yo0 W4S3WxSz4or82xrj1y7yXVASUAW9Hlws7sb/wwyFn43710LphHoupG5inHztJ4h4Bhct PbWBUi7BLUJzg9XIKFyioj3CecMIjrDYIyrQQGt/h3DNdS8haIFxzSSubtzko6g6/nJb X9vA== X-Gm-Message-State: ABy/qLZr/yDf3RyrQvLUprwjQxcXEflctxKbBIEb9dhfW7fCz6EdhSd1 HdKtrdgytaWrGVIn79TaBJDBhwpaicg= X-Received: by 2002:a7b:c851:0:b0:3f6:8ba:6ea2 with SMTP id c17-20020a7bc851000000b003f608ba6ea2mr5834518wml.15.1689488487997; Sat, 15 Jul 2023 23:21:27 -0700 (PDT) Received: from MacBook-Pro.homenet.telecomitalia.it.homenet.telecomitalia.it (host-95-239-222-58.retail.telecomitalia.it. [95.239.222.58]) by smtp.gmail.com with ESMTPSA id f8-20020a7bc8c8000000b003fc3b03caa5sm4677892wml.1.2023.07.15.23.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 23:21:27 -0700 (PDT) From: Damiano Galassi To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 08:21:21 +0200 Message-Id: <20230716062122.5364-1-damiog@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec: add ambient viewing environment packet side data. 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 Cc: Damiano Galassi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c5xBJE+A8yPY --- fftools/ffprobe.c | 3 +++ libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavcodec/packet.h | 7 +++++++ 4 files changed, 12 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 1ff76ce809..9f17567897 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2360,6 +2360,9 @@ static void print_pkt_side_data(WriterContext *w, AVContentLightMetadata *metadata = (AVContentLightMetadata *)sd->data; print_int("max_content", metadata->MaxCLL); print_int("max_average", metadata->MaxFALL); + } else if (sd->type == AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT) { + print_ambient_viewing_environment( + w, (const AVAmbientViewingEnvironment *)sd->data); } else if (sd->type == AV_PKT_DATA_DYNAMIC_HDR10_PLUS) { AVDynamicHDRPlus *metadata = (AVDynamicHDRPlus *)sd->data; print_dynamic_hdr10_plus(w, metadata); diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 5fef65e97a..db9c0c95e8 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -300,6 +300,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record"; case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode"; case AV_PKT_DATA_DYNAMIC_HDR10_PLUS: return "HDR10+ Dynamic Metadata (SMPTE 2094-40)"; + case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT:return "Ambient viewing environment"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a19cca1a7c..68f82e8980 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1408,6 +1408,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, { AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES }, + { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, }; frame->pts = pkt->pts; diff --git a/libavcodec/packet.h b/libavcodec/packet.h index f28e7e7011..199baad763 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -299,6 +299,13 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_DYNAMIC_HDR10_PLUS, + /** + * Ambient viewing environment metadata, as defined by H.274.. This metadata + * should be associated with a video stream and contains data in the form + * of the AVAmbientViewingEnvironment struct. + */ + AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may From patchwork Sun Jul 16 06:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damiano Galassi X-Patchwork-Id: 42753 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4681640pzb; Sat, 15 Jul 2023 23:21:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlF+S03faygZVl9Gprb4C3az0sH4MpYvCyvo3FJnHMVinSBAjdbUKITxtE/hzLzJcOGZLOJX X-Received: by 2002:a05:6402:164d:b0:51e:eba:55ba with SMTP id s13-20020a056402164d00b0051e0eba55bamr7540106edx.32.1689488508608; Sat, 15 Jul 2023 23:21:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689488508; cv=none; d=google.com; s=arc-20160816; b=EpkrkQtA3hEDdP1hBEfASDIMh/GSa58BcdE1VpqZkwlUIS0sW4txl8Qds+N8gYhCBV 3Hh/HvYTJQHIYGH2N9BkuZCWYX5BhTeq+jU/Xrgld2HZGQYrN2ZTjxV5DHxaWZpB67TB cEjBVHFmWVdKz4nwX8J1T24Tn9SL3rj4FzBIlXSKptiWzol0vAR5wGNXibguxne6Dc75 P5Tttbzl5DMuVGwcdNROvC5UQeY94y3iW1ZPpTQ1PlDhgwM7FN0ip9h6Z+RyzeqiEBCo pFYllXFq/APfK/fSpH0uW8+YqrT0V0XdK1ZG0p3didFsg9jEY9p/YhnkF3xg/OXHpu5N DMCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=X6nPRxWBwJPmrDLyP3/YX47T9tk6yBQetr2oQlCS4qI=; fh=y1Gepg8x28+Ebx7njomwWi+46AA0Tuzhnl1RBvhiIHg=; b=IT7+pVBrrZKGNu6tts3YMAukm9TlSiL7n9XLboC29tcx+5uLhCxx9D23/vhdsWJbbl kx4oxJjsIRegsf3Csn/P4TOhQ4wVn8nsMncIkRSwovms84XdgTrUiew84y3j75AZVsy4 T1qRjtmBc5ybXizqJiXG1OmUjQQym7ibzn1+jGMnTBZMUfY1Zx6of1xzsWUePUAVisbj rD7XBZVG+BGxksXtqEeYBhaPrPUcx8kghnKMoXVWRh9UmOx78D1y2YSQyXk0vYFuOpiL DJB8woSuLbGXyNgOjZuwlo5A2otA7c+ucy6fKYhwogxnVD1ekmoY65pHE42AONdS/h7v B4mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=odFHdQlQ; 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 d2-20020a50fb02000000b0051e0d8c614fsi2482635edq.567.2023.07.15.23.21.48; Sat, 15 Jul 2023 23:21:48 -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=20221208 header.b=odFHdQlQ; 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 74BD668C5A0; Sun, 16 Jul 2023 09:21:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9C7D68C57D for ; Sun, 16 Jul 2023 09:21:30 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-315adee6ac8so3366684f8f.2 for ; Sat, 15 Jul 2023 23:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689488490; x=1692080490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f7RXHmjTtY+e7Iw49XUECiz8+xfvgV6ZLNdwYDbjvFE=; b=odFHdQlQHrtrdVduqIfQxZOT/uk0y2f/vXXxGt+Taimya18DdEMJsp1uYDdrebtj3Q aODJGfuPZp1Ss6+bssHOVkz4iEy8UqrVvZqPiMTJ+IjePWCTpIsNfeirigHaWjwzYlab O3CfIGkCTFsUrk5u+BFaD5VLrN+ywWAOT5+e5EWwvO1desEjJdK12Dlu9e50mxUcxBM9 ynUpvOOqVE64KDsfh1fKgsO+eAZR4JmynuqfgBIrq/J7ex/A0vS+iUp/p8tASSMPv4Kr Q5td9FxjQrWWveb4qABdMJqx42aRRnN1ZtHAMDLXYR5SHK0yUcglatU+zt42puOJEaLf q2gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689488490; x=1692080490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f7RXHmjTtY+e7Iw49XUECiz8+xfvgV6ZLNdwYDbjvFE=; b=Fp7WhiTUrCs/NppF8lWVB8e4ytpgL16udJvZUyye+1MKEykdEIaI8+/RkdVA9ZYqeV 7E3O44+Hi4Wnc9Pcp64n3qOjDHx0rO5TAOkTnbj/CoiBQxFdQfEIUX6HfoWk9Dzgl9Yr yo/jxRTPSqcaWX2n17THwyKMDT+PtTc4wfgS87ShKtLEM/itt+Mau21uQ/BLivNoNbCk VnJAfPqM0mHyvnkSTeu081F3WHa6vhmMHz2H+fJe63Hsrybr0LgWCafMFcKuQf9ArZ32 IPx7D8/Z5r+UqYdXL08MOj4F5sOLWZji8UM38M1ny7wGUe/v5tsQsvvME+pk0LJ3KZHK sXrQ== X-Gm-Message-State: ABy/qLatAsL+hpsEKYMgfd0ltA9yg0x3cs9Xj5jY9t4ey1NSiu7/ayLu W1mew+ZDmF7B0EEudol79+mDBEHAu2Q= X-Received: by 2002:adf:f48f:0:b0:315:adee:2e47 with SMTP id l15-20020adff48f000000b00315adee2e47mr7730300wro.30.1689488489821; Sat, 15 Jul 2023 23:21:29 -0700 (PDT) Received: from MacBook-Pro.homenet.telecomitalia.it.homenet.telecomitalia.it (host-95-239-222-58.retail.telecomitalia.it. [95.239.222.58]) by smtp.gmail.com with ESMTPSA id f8-20020a7bc8c8000000b003fc3b03caa5sm4677892wml.1.2023.07.15.23.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 23:21:29 -0700 (PDT) From: Damiano Galassi To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 08:21:22 +0200 Message-Id: <20230716062122.5364-2-damiog@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230716062122.5364-1-damiog@gmail.com> References: <20230716062122.5364-1-damiog@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/mov: add support for 'amve' ambient viewing environment box. As defined in ISOBMFF (ISO/IEC 14496-12) document. 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 Cc: Damiano Galassi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /av7AGJd9GQl --- libavformat/dump.c | 15 +++++++++++++++ libavformat/isom.h | 3 +++ libavformat/mov.c | 36 ++++++++++++++++++++++++++++++++++++ libavformat/movenc.c | 22 ++++++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index d31e4c2ec6..88dc9dd89c 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -27,6 +27,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/ambient_viewing_environment.h" #include "libavutil/dovi_meta.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" @@ -366,6 +367,17 @@ static void dump_content_light_metadata(void *ctx, const AVPacketSideData *sd) metadata->MaxCLL, metadata->MaxFALL); } +static void dump_ambient_viewing_environment_metadata(void *ctx, const AVPacketSideData *sd) +{ + const AVAmbientViewingEnvironment *ambient = + (const AVAmbientViewingEnvironment *)sd->data; + av_log(ctx, AV_LOG_INFO, "Ambient Viewing Environment, " + "ambient_illuminance=%f, ambient_light_x=%f, ambient_light_y=%f", + av_q2d(ambient->ambient_illuminance), + av_q2d(ambient->ambient_light_x), + av_q2d(ambient->ambient_light_y)); +} + static void dump_spherical(void *ctx, const AVCodecParameters *par, const AVPacketSideData *sd) { @@ -497,6 +509,9 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent) av_log(ctx, AV_LOG_INFO, "SMPTE ST 12-1:2014: "); dump_s12m_timecode(ctx, st, sd); break; + case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT: + dump_ambient_viewing_environment_metadata(ctx, sd); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d " "(%"SIZE_SPECIFIER" bytes)", sd->type, sd->size); diff --git a/libavformat/isom.h b/libavformat/isom.h index 4b1cd42f0f..e24dfb3dd0 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -29,6 +29,7 @@ #include "libavutil/encryption_info.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/ambient_viewing_environment.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" @@ -249,6 +250,8 @@ typedef struct MOVStreamContext { AVMasteringDisplayMetadata *mastering; AVContentLightMetadata *coll; size_t coll_size; + AVAmbientViewingEnvironment *ambient; + size_t ambient_size; uint32_t format; diff --git a/libavformat/mov.c b/libavformat/mov.c index 444aca5235..726341736e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6010,6 +6010,31 @@ static int mov_read_clli(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_amve(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + MOVStreamContext *sc; + const int illuminance_den = 10000; + const int ambient_den = 50000; + if (c->fc->nb_streams < 1) + return AVERROR_INVALIDDATA; + sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data; + if (atom.size < 6) { + av_log(c->fc, AV_LOG_ERROR, "Empty Ambient Viewing Environment Info box\n"); + return AVERROR_INVALIDDATA; + } + if (sc->ambient){ + av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate AMVE\n"); + return 0; + } + sc->ambient = av_ambient_viewing_environment_alloc(&sc->ambient_size); + if (!sc->ambient) + return AVERROR(ENOMEM); + sc->ambient->ambient_illuminance = av_make_q(avio_rb32(pb), illuminance_den); + sc->ambient->ambient_light_x = av_make_q(avio_rb16(pb), ambient_den); + sc->ambient->ambient_light_y = av_make_q(avio_rb16(pb), ambient_den); + return 0; +} + static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -7921,6 +7946,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('p','c','m','C'), mov_read_pcmc }, /* PCM configuration box */ { MKTAG('p','i','t','m'), mov_read_pitm }, { MKTAG('e','v','c','C'), mov_read_glbl }, +{ MKTAG('a','m','v','e'), mov_read_amve }, /* ambient viewing environment box */ { 0, NULL } }; @@ -8391,6 +8417,7 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->spherical); av_freep(&sc->mastering); av_freep(&sc->coll); + av_freep(&sc->ambient); } av_freep(&mov->dv_demux); @@ -8756,6 +8783,15 @@ static int mov_read_header(AVFormatContext *s) sc->coll = NULL; } + if (sc->ambient) { + err = av_stream_add_side_data(st, AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT, + (uint8_t *)sc->ambient, + sc->ambient_size); + if (err < 0) + return err; + + sc->ambient = NULL; + } break; } } diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f1cc80b1b3..9c6109f4bd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2220,6 +2220,27 @@ static int mov_write_mdcv_tag(AVIOContext *pb, MOVTrack *track) return 32; } +static int mov_write_amve_tag(AVIOContext *pb, MOVTrack *track) +{ + const int illuminance_den = 10000; + const int ambient_den = 50000; + const uint8_t *side_data; + const AVAmbientViewingEnvironment *ambient; + + side_data = av_stream_get_side_data(track->st, AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT, NULL); + ambient = (const AVAmbientViewingEnvironment*)side_data; + if (!ambient || !ambient->ambient_illuminance.num) { + return 0; + } + + avio_wb32(pb, 16); // size + ffio_wfourcc(pb, "amve"); + avio_wb32(pb, rescale_mdcv(ambient->ambient_illuminance, illuminance_den)); + avio_wb16(pb, rescale_mdcv(ambient->ambient_light_x, ambient_den)); + avio_wb16(pb, rescale_mdcv(ambient->ambient_light_y, ambient_den)); + return 16; +} + static void find_compressor(char * compressor_name, int len, MOVTrack *track) { AVDictionaryEntry *encoder; @@ -2430,6 +2451,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex if (track->mode == MODE_MOV || track->mode == MODE_MP4) { mov_write_clli_tag(pb, track); mov_write_mdcv_tag(pb, track); + mov_write_amve_tag(pb, track); } if (track->mode == MODE_MP4 && mov->fc->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {