From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3ADB94913C for ; Sun, 4 Feb 2024 12:28:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FCD468D124; Sun, 4 Feb 2024 14:28:08 +0200 (EET) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFCDA6807D3 for ; Sun, 4 Feb 2024 14:28:01 +0200 (EET) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3be6ff4f660so2283119b6e.3 for ; Sun, 04 Feb 2024 04:28:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707049679; x=1707654479; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=Tla/lRASo7Lq+SozEdhflAn/zZHUdi6BMXumIh+kUU4=; b=GJ6IWy3CjmQrJZ6hpaCXIVW/I6aU2boaNbGSlCrvvfL2unVqqrF/RBM+cVq2AIGqcJ I2Yj7VLhASBN8DcF8TKfIu13QKtwYTHJT0vpgl9DqLOU9otjev2tQzjOW4NqaUpnFkUi DNHlBI5uu+CByH4W7Hw94v5EB8nAxScIhCgV2lfgDkdY+oxvwB+tmSpdk9ndsrzbMbdh KuG6XDm+UI65nchX8KP4+2HyU/iX2kWYhTTwPensA9eot+p6zLdMgdg9HxAYyTcAXUs6 BV2eszTvgGxDXgxKn+CN+9PJVrsvk0hvpO9WAhsNJ1/32X3c75+/AkM86XEFKiPCxuKy m1Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707049679; x=1707654479; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Tla/lRASo7Lq+SozEdhflAn/zZHUdi6BMXumIh+kUU4=; b=NmC3u96Zrk84pxSvCWtxLqKdlk0oorM+ZvvOveUcO2kwIMLymxP8Ok/m9que2nlguY qNyFXclCHq3l2tKe2h6QjoNJKsiEppZ3E0m8OUUR+gGAdZLUtQ+8PO1oH3RGLbA8NoAX DiHNUBDryz8Upkpa1LfOD/TiT5IafjaWjty++sW2CC3lJcoT0u+MAWpKzoFOPcQHEv8M IDqdFha8FvptXK974WllDaU7vzvOeGT/p2Gx17+9sGt2AT/Nu7kgplX2rEBv6NKujAUp vO0x3vtpGA4362DsxpifHXx4/pPRxPZSGklJ0Nhz/kSYWJhduK3yXRaswQ4RbFBGpgjc QGCQ== X-Gm-Message-State: AOJu0YyKjnkXPUM6gNuMlnRtl3WCaWsHlsEew346rtv53Fc8FsjpCzOB HSpBaooEHelAkoipGlBa1uM0KIE+8cCSs0PDn+58gG3UJnZwnfal/Z1uPoX6 X-Google-Smtp-Source: AGHT+IHRpmhMWhYlq31NN9/foMvMzFISl6e21Vwqegxe8EzZJUshbEOc5U093yM0NMQJKs0V/dTUTw== X-Received: by 2002:a05:6808:918:b0:3bc:2492:3672 with SMTP id w24-20020a056808091800b003bc24923672mr7277370oih.56.1707049678692; Sun, 04 Feb 2024 04:27:58 -0800 (PST) Received: from [192.168.0.18] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id p22-20020aa78616000000b006db3149eacasm4718980pfn.104.2024.02.04.04.27.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 04 Feb 2024 04:27:58 -0800 (PST) Message-ID: <579630f3-2b66-4b17-b8da-8b3b250b5a35@gmail.com> Date: Sun, 4 Feb 2024 09:28:31 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240204111648.76522-1-cosmin@cosmin.at> <20240204111648.76522-3-cosmin@cosmin.at> <0101018d73d5e685-207b272c-3016-4e33-8be9-eb8af0469e93-000000@us-west-2.amazonses.com> Content-Language: en-US From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <0101018d73d5e685-207b272c-3016-4e33-8be9-eb8af0469e93-000000@us-west-2.amazonses.com> Subject: Re: [FFmpeg-devel] [PATCH v3 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: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/4/2024 8:16 AM, Cosmin Stejerean via ffmpeg-devel wrote: > From: Damiano Galassi > > Co-Authored-By: Cosmin Stejerean > --- > libavformat/dump.c | 15 +++++++++++++++ > libavformat/isom.h | 3 +++ > libavformat/mov.c | 35 +++++++++++++++++++++++++++++++++++ > libavformat/movenc.c | 30 ++++++++++++++++++++++++++++++ > 4 files changed, 83 insertions(+) > > 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..c2410e01ce 100644 > --- a/libavformat/movenc.c > +++ b/libavformat/movenc.c > @@ -2244,6 +2244,35 @@ 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 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); Excessive indentation. > + > + if (!side_data || !side_data->data) { > + return 0; > + } Don't use brackets if it's a single line. > + > + ambient = (const AVAmbientViewingEnvironment*)side_data->data; > + if (!ambient || !ambient->ambient_illuminance.num) { > + return 0; > + } Ditto. > + > + avio_wb32(pb, 16); // size > + ffio_wfourcc(pb, "amve"); > + avio_wb32(pb, rescale_mdcv(ambient->ambient_illuminance, illuminance_den)); nit: Maybe rename rescale_mdcv() to something more descriptive now that it's not just used by mdcv? > + 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; > @@ -2457,6 +2486,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) { _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".