From patchwork Sun Feb 4 15:14:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 46018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp272391pzh; Sun, 4 Feb 2024 07:14:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGpNGeufhbRLADlmWEgV2dam5SZPnO8UvCw7tIFGeJhnbbjsUslS02a/CMT6gQan7aNAhBj X-Received: by 2002:a19:7405:0:b0:511:319d:5151 with SMTP id v5-20020a197405000000b00511319d5151mr5606134lfe.6.1707059679666; Sun, 04 Feb 2024 07:14:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707059679; cv=none; d=google.com; s=arc-20160816; b=rxCslv1TVMfPyyoP5ZVIRWEXyP8OYF4CoBfhM6Ap6dLTrqQJ5ifS8XcYxKeiDVkhPa PlVAKgKuBsX3QkS+kypxF7KP4js7Z5IsEdPYaS1QjU7yiVrh3LTEzrIcCBzDywzVlqCm mykD8rPZLutl7wSThRRDhW38eavfx2QThaoGqBJMQmcxtD7EFSOfNS1n0ASv6Lr6Plk6 CSJlGXKE3W/8pmKzhSubi8G4WyS4DMYoAFJn6nJGQ7m6XaeQKnY0XBLFGVArw81wYaxq RqfynFD7ZAPORaSlShJkD0395Dcgbd+P2eId+BQTVNbMwJIY4H19k1VyKquWiIfO1qQb y8pQ== 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:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=2XuswmyjbX/q/poU7Kop1Puiz0v/P4UBjox+mkWuq3s=; fh=UfTzU68W/lxCxTz+mWD6dfGTXORlc2UiGEuRh3FOa9c=; b=jlwWca2lqDQxyXFYViIj9XWbwiVEH6msPVReLEFYxlsy313aRvAk2iXn1SI/VhoHwq h5/BRuf7zy1LmhqbnTQdq0TttbNb0s/lBU3sRoUQ0j7nvlC3Rwd+CBZVkgTbaUGa4/mc CpCZ+H1mPeCTzaPP2JSXl86RJMTqX5KvjpMOptfHl8QsXVNpxozCOKfhBiFpSxPmw0xH FaruWzMsdTNzlaJiZroXr82tQBKhgdGw69eE0l12qVnX1a5s5btCcKQsYnheaBHdOJ6o vg9L2inlMWLB4f5moy+vENWYrgFAAv+Qxni3I88EGzUz2RcVdTtn23QmYmN3HSpfFebW cTRw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.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 X-Forwarded-Encrypted: i=0; AJvYcCX4co4H4o7uiR8FoyPDLmVkNkd/yHVdyfqIeKkmGO/RhjggrG8z6/wTmOhkUP8w2KdzKopUGwbg6acc5nTgH80/YSkZpiO5FHKVzn+rBBf96e72SO9UImWxOuoTEzKTjzui5F0X8kotL8zCXrRWV81tqXaBxUG3/OSXo9Q6hMeOvnww/VrGwGCrWwD18pMZTpSXfPfi41TMyoeOgjI6m3S1YxH6pf2ErWoFLIPtP2ADod3yAoY6qXM/nU1eScfuC8hnzMSZCw/4xALCe6j0ld43H1Dmp3E1c61XhpJ9NiV0Bl0d95njVt+uIdUDBpLubLrip0m1Gq7dK+yvfdTM9KczLE9qKIp+EAKTyck9Mn0euwp2EhxUXrJkitnhPPBXA7boSdjRtp8U3IQAmXRS4BQCaV7lW6dWR3mNfKL3f6g9geBnIGNLsAwRP1Pf9q5SCYbt/L6nckhQIjdchmrWGyEWU2FxzD9vOQAK5ETtsIgGSXRoL9zsVfodjsGCGBiUluz8EMITJpN+HQSJvjGZORKJb4lAtuTn6LnhyFWtFmRHtXbvcI1ZXBtfqMJIQeH3tvWpC7UPb6mEQuraXo89mYXX7CUmbIe3FgcejlA+I/BLB0DxuLQTyvWjQ+lhrNm5VJTgEeW9AWJgdDt3ZYVYDPXrOZuofz1+N4Sc1yNtCVfGYZnzogpRc2vJLWNK9Xs2cmk4Tq9k5Nwan8Njr89v/reN9/XE0V198QXbQg46fRl6InnSRbMCs/4w5I1tbWunG5OKSy7+0P08U/3VuAJry/XVtSk9ao4Wxr+bsdpUa6+BHWAXFtV0MN8Tbit8eef58goGGWJbBLnBtKl8rWvzlmqllKQ35cf8jYIENj45RoUvUHLe/7OJ/Ty1/fKlkv+1BP+kfBbe8C8PDrNcPS9vIfvsh7Fxv+auC83AaT9xtRmJvRGCBPwwWUxn9aQIP1+eeLva8L bUtxN1WbZS7MzzhO3pDZiQEeGpN9NvgxTcp6BpK9womsk3BKmmFK/SS+qWEQab/V4s3fDh+FQvegxw61yGVUi7cLbndrXgO0/pIdPUr5YVuSv3p/eFRC+uue4ky86HUX9vv87MDl4cJGXYXC1ZTpAxoR4n3vyIbopLj0a+YzPJizz+TvJnTbPv1XYr9JkI+EmuiNVh6iI7SH1S86z4bvZ0FxcMm9UlsmBKqETlUynxu4MFRsSyGiWbj1RssVSRD+FouPzzUfxmEpgT0C63wdxIGdyQs9u9Ag1G3MSn8d8v/0ZTkQsuuVUBNcdek9z0Ls+kKdLML9zFbF4QBVeKWrs+DDiPq8F1tYK/7K7oc0n9jG+yHD5uHQFyc5F8suUGyK7k5Zuhf/xHZLam+cfF0VzGgjIqYP22YvifGQuvQhCGHal7aGIi5h2Pic35PIHUU2P1cfTok836FR9BosFDcO5jasSXr8NjJBm3ef/yqmTO//XSJuokVOZIXX93Iv9ZS2SNlrkhx/hs1oJf8xnyrHSZcKRnlrgBbkX5hwMGP6YVmExiApyNMM3fL0CRZGl6ClNpFgPjMMdnzB0mKZXk3K5D67cI/5b1F6ku+cox1Rh2/6yO1PjsDknu3m4HvNBpELZfKIV4fHiWzByB+m0= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u4-20020aa7d984000000b0055ffd604d4esi2436964eds.285.2024.02.04.07.14.39; Sun, 04 Feb 2024 07:14:39 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43AD668D128; Sun, 4 Feb 2024 17:14:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-32.smtp-out.us-west-2.amazonses.com (a27-32.smtp-out.us-west-2.amazonses.com [54.240.27.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AD3B68D130 for ; Sun, 4 Feb 2024 17:14:14 +0200 (EET) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Sun, 4 Feb 2024 15:14:11 +0000 Mime-Version: 1.0 In-Reply-To: <20240204151404.28289-1-cosmin@cosmin.at> References: <20240204151404.28289-1-cosmin@cosmin.at> <20240204151404.28289-3-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHaV3zM+T1rFAMATIyo76W5iH4qaAAAAH8N Thread-Topic: [PATCH v4 2/3] avformat/mov: add support for 'amve' ambient viewing environment box. As defined in ISOBMFF (ISO/IEC 14496-12) document. X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1707059650 Message-ID: <0101018d74af24d8-b0b1fe71-e0cf-49b5-95fb-069de82c855f-000000@us-west-2.amazonses.com> Feedback-ID: 1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2024.02.04-54.240.27.32 Subject: [FFmpeg-devel] [PATCH v4 2/3] 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: , X-Patchwork-Original-From: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xXSjIo8y02c9 From: Damiano Galassi Co-Authored-By: Cosmin Stejerean --- libavformat/dump.c | 15 +++++++++++++ libavformat/isom.h | 3 +++ libavformat/mov.c | 35 +++++++++++++++++++++++++++++++ libavformat/movenc.c | 50 ++++++++++++++++++++++++++++++++++---------- 4 files changed, 92 insertions(+), 11 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index aff51b43f6..add38914f2 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -28,6 +28,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" @@ -379,6 +380,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, int log_level) { @@ -513,6 +525,9 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, av_log(ctx, log_level, "SMPTE ST 12-1:2014: "); dump_s12m_timecode(ctx, st, sd, log_level); break; + case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT: + dump_ambient_viewing_environment_metadata(ctx, sd); + break; default: av_log(ctx, log_level, "unknown side data type %d " "(%"SIZE_SPECIFIER" bytes)", sd->type, sd->size); diff --git a/libavformat/isom.h b/libavformat/isom.h index 77221d06e4..a4cca4c798 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 5fae777adb..42b0135987 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6039,6 +6039,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; @@ -8215,6 +8240,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('i','s','p','e'), mov_read_ispe }, { MKTAG('i','p','r','p'), mov_read_iprp }, { MKTAG('i','i','n','f'), mov_read_iinf }, +{ MKTAG('a','m','v','e'), mov_read_amve }, /* ambient viewing environment box */ { 0, NULL } }; @@ -8680,6 +8706,7 @@ static void mov_free_stream_context(AVFormatContext *s, AVStream *st) av_freep(&sc->spherical); av_freep(&sc->mastering); av_freep(&sc->coll); + av_freep(&sc->ambient); } static int mov_read_close(AVFormatContext *s) @@ -9072,6 +9099,14 @@ static int mov_read_header(AVFormatContext *s) sc->coll = NULL; } + if (sc->ambient) { + if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, + AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT, + (uint8_t *) sc->ambient, sc->ambient_size, 0)) + return AVERROR(ENOMEM); + + sc->ambient = NULL; + } break; } } diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b724bd5ebc..47f0681258 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2208,7 +2208,7 @@ static int mov_write_clli_tag(AVIOContext *pb, MOVTrack *track) return 12; } -static inline int64_t rescale_mdcv(AVRational q, int b) +static inline int64_t rescale(AVRational q, int b) { return av_rescale(q.num, b, q.den); } @@ -2231,19 +2231,46 @@ static int mov_write_mdcv_tag(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, 32); // size ffio_wfourcc(pb, "mdcv"); - avio_wb16(pb, rescale_mdcv(metadata->display_primaries[1][0], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->display_primaries[1][1], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->display_primaries[2][0], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->display_primaries[2][1], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->display_primaries[0][0], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->display_primaries[0][1], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->white_point[0], chroma_den)); - avio_wb16(pb, rescale_mdcv(metadata->white_point[1], chroma_den)); - avio_wb32(pb, rescale_mdcv(metadata->max_luminance, luma_den)); - avio_wb32(pb, rescale_mdcv(metadata->min_luminance, luma_den)); + avio_wb16(pb, rescale(metadata->display_primaries[1][0], chroma_den)); + avio_wb16(pb, rescale(metadata->display_primaries[1][1], chroma_den)); + avio_wb16(pb, rescale(metadata->display_primaries[2][0], chroma_den)); + avio_wb16(pb, rescale(metadata->display_primaries[2][1], chroma_den)); + avio_wb16(pb, rescale(metadata->display_primaries[0][0], chroma_den)); + avio_wb16(pb, rescale(metadata->display_primaries[0][1], chroma_den)); + avio_wb16(pb, rescale(metadata->white_point[0], chroma_den)); + avio_wb16(pb, rescale(metadata->white_point[1], chroma_den)); + avio_wb32(pb, rescale(metadata->max_luminance, luma_den)); + avio_wb32(pb, rescale(metadata->min_luminance, luma_den)); return 32; } +static int mov_write_amve_tag(AVIOContext *pb, MOVTrack *track) +{ + const int illuminance_den = 10000; + const int ambient_den = 50000; + const AVPacketSideData *side_data; + const AVAmbientViewingEnvironment *ambient; + + + side_data = av_packet_side_data_get(track->st->codecpar->coded_side_data, + track->st->codecpar->nb_coded_side_data, + AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT); + + if (!side_data) + return 0; + + ambient = (const AVAmbientViewingEnvironment*)side_data->data; + if (!ambient || !ambient->ambient_illuminance.num) + return 0; + + avio_wb32(pb, 16); // size + ffio_wfourcc(pb, "amve"); + avio_wb32(pb, rescale(ambient->ambient_illuminance, illuminance_den)); + avio_wb16(pb, rescale(ambient->ambient_light_x, ambient_den)); + avio_wb16(pb, rescale(ambient->ambient_light_y, ambient_den)); + return 16; +} + static void find_compressor(char * compressor_name, int len, MOVTrack *track) { AVDictionaryEntry *encoder; @@ -2457,6 +2484,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) {