From patchwork Tue Jul 11 07:41:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damiano Galassi X-Patchwork-Id: 42592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1251580pzb; Tue, 11 Jul 2023 00:41:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlE1TzepGjLLOkk51bdFhK4YQhJH1U95irc42tSsJ0uxPu38k6tqKLsCj7fAaU1eTvz8Dghp X-Received: by 2002:a17:906:19b:b0:993:fb68:ed67 with SMTP id 27-20020a170906019b00b00993fb68ed67mr9509719ejb.24.1689061317023; Tue, 11 Jul 2023 00:41:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689061317; cv=none; d=google.com; s=arc-20160816; b=ep5UOQP2rPU+0Ace65MTn244ulFn08mdziiaFd0DtX2Umz95bmEW1zXdqYJPyaO1WI KLHukiVHjXlsoRJBqOjuI+wBduWyjBO9IawxJWBQemTO1Ahxw8wc2xBU5p7GcsUJq9HH 2XLVhkxVPv/ZYafMb4zvgovUIsilLYRxIkOmquS0fwxpqUrm0FNSUpvnuBZwDkMtHVUE fSqOeHDF2PELgr/Ft2spGLrLcUq/95SPtAO7z3dDY8pU6MKClz/2XsVgXz1k+95B2jyu IEHo+RoR44h8F4i4UPRWPEOYP5cBis4S8YZJNLK4wA3aAQYtSv3oI9DqCJpQzrhzef/e 9ZuA== 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=KD13SUUtFqpdPMGlkz6wh6osi3wXOzJ5eOUYS1we78c=; fh=y1Gepg8x28+Ebx7njomwWi+46AA0Tuzhnl1RBvhiIHg=; b=I9vnhbAolp819KUJ0FcPdVnRpbvUtcc7nzCG05caUghvrHjRAJYkmSnpfaUWetx1fl w0LyPaSv14HI4AhS6b/7Mxz7h9XDM9bkv97rJUv3C5CfBmofUZOtIgX9hws+0hmWjdm1 yKt1R3jTOrNTXAWxfn1ZIExhcB2v63jvEkMGByEjS0GMOv9ovcy9JA+KslyPZcXuiaaw wMKs/d/T2Znu4870+CY+FePvvVl9c4g+ZilEZN5JUMNODoCfB3vyFIdpxH5lKUNy2Jyw chWunwGyyENJCY1nQ+mOgICHfpxUdxaJ+35rSyyj27r/IpvLOVJeh5mxsjM0FwcvMtEK GXgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=e3btoPxl; 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 m19-20020a1709060d9300b009886d385534si1504025eji.950.2023.07.11.00.41.56; Tue, 11 Jul 2023 00:41:57 -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=e3btoPxl; 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 B7FEB68C2E9; Tue, 11 Jul 2023 10:41:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D87D68C2E9 for ; Tue, 11 Jul 2023 10:41:47 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3fbc5d5742bso59494745e9.2 for ; Tue, 11 Jul 2023 00:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689061306; x=1691653306; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=d3QPmojYjDKQoLst0nE4v1E7iCkvKr/hMxiBjK1zdJw=; b=e3btoPxlvebTyRakjqy0UqRa86/h+FnG0ucWc13k7j6MWLMCuDedh0BOaW5fYE/889 WghLyg8QWtBu/r+Pf7KCqiK7mhzCO9HjZVKa1AkLepkr8FpqwNN3DebPt1qCZACJ/5Db 4YJ1/SzYl7BPwgWIwCQDcFiEdEvbeZyRbE9YA/OHOTHzwlMT1bvbMZ1fHQkN4NFIB+o7 9ospCyD9+uKbJzULC9Y3iLIPDopb69/l60v8HLIO/N/vmvOmuV/2Y/mDl4txRmJFCG45 lTF3iOMV/t0FgaLM1TeNcQFxJYn+xWYN76kmq9kmE6TataOy+XzKSQ8tQt1ZtWyLnaIF r5Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689061306; x=1691653306; 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=d3QPmojYjDKQoLst0nE4v1E7iCkvKr/hMxiBjK1zdJw=; b=DIhESi2JAPQdjtcLkB5hhaO4w3sqN/h2N2Pd5jA8QIk8mIOxsXcJG+7Vgk8Vbn7xnc zFactZGRQFQmFLUaM7vgZm8p8BTiCe1PJ65caPBopXBIwXRgdT3pJMCiVxFYzuuEqg30 dDJXIRW6tetQe6UYxNNMF/tlWmxDHCDxSGa6FOQS9mmFqCQAJWFeJTRWUBYtHamo5c7s m0JG3iqQYy+WGtlWpF+DacAILr3HM8lCg6lWII22r5DspAUfUZ3bNe7t8IFSmmwC0yWM nH7ZLPsITYxLyQKQS10e8TUndZysNAXHFtWOsRBGULG3nfGFteTHOF5l+nIcgq0849Uh Uc6A== X-Gm-Message-State: ABy/qLYb37eZC+05xp08SwdR7xH5H36qovWuyN1yWnySMy3/KrakfO+q QQUzeWpxHR3R/tn8jsodrIMA65ry+r8= X-Received: by 2002:a5d:6902:0:b0:315:8f4f:81b2 with SMTP id t2-20020a5d6902000000b003158f4f81b2mr10131527wru.64.1689061306430; Tue, 11 Jul 2023 00:41:46 -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 c17-20020a056000105100b0031433d8af0dsm1492688wrx.18.2023.07.11.00.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 00:41:46 -0700 (PDT) From: Damiano Galassi To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jul 2023 09:41:25 +0200 Message-Id: <20230711074126.95328-1-damiog@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 3gU3J/kQqmvJ --- 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 a47abeca06..d8ba94d363 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1374,6 +1374,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, { 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_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 Tue Jul 11 07:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damiano Galassi X-Patchwork-Id: 42593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1251619pzb; Tue, 11 Jul 2023 00:42:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlFUiEpUgC7l24PklnmLpytqWe9gJpv0Q5db0fSJN79Oq5Sigdi4TftS2jBnqqi80c70pU2w X-Received: by 2002:aa7:db48:0:b0:514:a4cd:85d7 with SMTP id n8-20020aa7db48000000b00514a4cd85d7mr14115550edt.26.1689061325084; Tue, 11 Jul 2023 00:42:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689061325; cv=none; d=google.com; s=arc-20160816; b=01soUyE1C7Jfr30TQiKHgE2+pMiNc0qe8786+GZTADskkWPz0wjV+MXR3+ZyKd9f1G DuTjWxhVga8gb4X584wVSispJu1ex5TzPOvt6ifk91o1wSmoc/I6O4+NeflmBgyRl9Qc XfRTy2a60PVEKdt2mVAGYux79RojPymSPXFDr/BuWVoSYwTH+eUJrW+ZyY/gPn8TxyQf mKwkx1F3b4e9ID24vqXbGcibSzzqyX0rPyaino74W6c+u8OxNvpXgfCbuHvNro+WkG7v HLbenX7yM1XWn2kKnM8YYAIgULyYf34SSG8KNFKTRpV1mb9YwxiqgLTmQDGN+J0wHq8F 2+/w== 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=am57J7mSE02tl/AdMTfWMMrCrsmHhPZ6WrAfH43zDKQ=; fh=y1Gepg8x28+Ebx7njomwWi+46AA0Tuzhnl1RBvhiIHg=; b=nBgCYAjdioG8VNXKFnSCBkSl3Zh3wCoHvPHiPujUXWiXPWNTflwvUtwWpGDd/E+5/z uHQeERLHF6U3i5hfFBQMzZ5PILVx3Dfq4UR+uHAkTrOHR+gy8l89lURYlvgTkQvRV3rS spCQ5eemv++ksVI5V3q176fc0Qz2wh7eoCbWUhmMHjfB2lm3HQgxOQhNh88HkJIFawox HDdKqjOQRwi3WZRd4B+5jKr1Hesja42L9W3cLJsqVJal9rPMhuPJEZ4t9bwkSzZhLPC8 fDfl3Inou8qNN8towJqHsAwspGwen6fQJbBTzsuNBiMGtdEhyXFQSjjx12DmUacwF9LP bLgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=QkKodmc1; 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 s18-20020a056402015200b0051dec544c9asi1406377edu.45.2023.07.11.00.42.04; Tue, 11 Jul 2023 00:42:05 -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=QkKodmc1; 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 C41B968C5CC; Tue, 11 Jul 2023 10:41:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FE2868C552 for ; Tue, 11 Jul 2023 10:41:50 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3159da54e95so1599669f8f.3 for ; Tue, 11 Jul 2023 00:41:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689061309; x=1691653309; 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=h3PqcFgPStD9Sh4+TghiGnrrK0TlpHC7f/H4CwJwDh8=; b=QkKodmc1LOWf6qJHzrY0uZqx000ob2ZPN7RamnZhpnCKnbigvhOxmLMExGzDBfF9En +yPE33NJgn2wMgksmXGrfHkG8JHUWsq01T3FO+oecTGc7COMx1fPAgG7kOSIyhEmT1LS MbLlPnTLRnEXOa3HChLQ9fB+2trJwiBoRqNtDInTm5bNigbOAEafuDIWSpoVV17TSReC klYzM/lnG3g3IkonlBqE6KLhxMf0YZLAw1BcNfZElDuybJGzmWxYzk/Z0HznXwHZqu8O JIIduRgUAReGIuxhL3fHODCy8QVOOFbkMS8PQY89bDHQF8zDvolrTULq6egvaRFgdCB6 GuVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689061309; x=1691653309; 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=h3PqcFgPStD9Sh4+TghiGnrrK0TlpHC7f/H4CwJwDh8=; b=U6yP9seGVWDxIJs3nBv4KYuTwJwPWAky1vFsrpomeeix5Py8/dw0xn7GZncjl16pVQ 5s/1H5hYB0IJ5RZBnfkKvsSOI9u/sxfwGE8n6HJhR/fQ0odVdejT5/CDm9rLhNTxDlQ/ sk3xWDzWMWapVOH8SnONtu2KoaNo5JTBybLTDQ+E/wuwoAugakbuPVvdCLWTmJRY2YFp YoDvg1Kxxlp5vboFGA2/cCGoqID+bPjuMw2NFxK/HOSkLdaVHL4h4ivfEvnpBoEKszs7 ZlnrP/zAeyuOVRbUy9E5TNLtlzbfGAF+g9lg2uliZpi4AdbJ9TDzIDyISr/qNUVE3XC1 I8Iw== X-Gm-Message-State: ABy/qLYeebQYf2xy7ppfe/qelTC490XV8PmfEXcKUEoOffddRUzSSPH4 ODgYuKBDgqymF9pdToABlB5Q5nUpwVw= X-Received: by 2002:adf:e4ca:0:b0:313:f462:769 with SMTP id v10-20020adfe4ca000000b00313f4620769mr14227608wrm.19.1689061309290; Tue, 11 Jul 2023 00:41:49 -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 c17-20020a056000105100b0031433d8af0dsm1492688wrx.18.2023.07.11.00.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 00:41:48 -0700 (PDT) From: Damiano Galassi To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jul 2023 09:41:26 +0200 Message-Id: <20230711074126.95328-2-damiog@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230711074126.95328-1-damiog@gmail.com> References: <20230711074126.95328-1-damiog@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: b4U6l8xA3p// --- libavformat/dump.c | 15 +++++++++++++++ libavformat/isom.h | 2 ++ libavformat/mov.c | 36 ++++++++++++++++++++++++++++++++++++ libavformat/movenc.c | 22 ++++++++++++++++++++++ 4 files changed, 75 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index d31e4c2ec6..eca6e733ae 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, "Ambvient 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..486836fd62 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,7 @@ typedef struct MOVStreamContext { AVMasteringDisplayMetadata *mastering; AVContentLightMetadata *coll; size_t coll_size; + AVAmbientViewingEnvironment *ambient; uint32_t format; diff --git a/libavformat/mov.c b/libavformat/mov.c index 444aca5235..693baa01a3 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(NULL); + 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, + sizeof(*sc->ambient)); + 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) {