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 B9B104A184 for ; Sat, 23 Mar 2024 02:33:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CD1A68D5DD; Sat, 23 Mar 2024 04:33:21 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 889C668CF84 for ; Sat, 23 Mar 2024 04:33:15 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1e034607879so20504655ad.0 for ; Fri, 22 Mar 2024 19:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711161193; x=1711765993; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=hrZbiGS6p70/GEcN8FD55LIAVWqzb9ocFmqh8BnWM5k=; b=kTKgzEkWhcQl6P3R58NKm15P9DeMjrWvIQ915CNe77HYOXRruzgoFZusTrOWroBm6n azpFm06/uvU8jSxe6HtU6SAtTvvSQplIHIZ9KCXz4C3FUmP0lEjWo1CSuFt3F6Xcl/LJ v3myyQxsLqZiws8ps/5BXBpg/pCE7c6gqA9K8cD61+OCZKSq8108f7cDDHBAxFGkerk7 kvRURwcfZqLzUGpHhvaHGwJe/6r1kIsEcWNNi/M2Gi45Zfb3PCsDLQdriPWyT2Qou6jn qlVBN1oWbl7XB0dANATUrUDTrNvVQD+IdDWTMmMMOLBi+M9kLxUXe+uCDkZ0DG2Y9Z8B XbdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711161193; x=1711765993; h=content-transfer-encoding:in-reply-to: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=hrZbiGS6p70/GEcN8FD55LIAVWqzb9ocFmqh8BnWM5k=; b=p+DQdbLIM8ze34pRwX4WXwnJRB8S6EDrWfOhlOXtjd5626Be3G1aiWbvfMuJLnktGE HybEY0YnE4LbFJb6r5baRJZPesf5a8wIYOAkgUhF2BKN8c3NNuz3ax3MywPW1Gb/Wzlv 48agfr1aJwqpp2c5CKdviEShS+GWr8p2POF44rG5DlloIcCElmUf2zbkujEPLd4BBzdJ tsAjOG8N3xCVeG/JxkKSaxw6JGZbmfOSL3+R4D+krUayXvBcoPzTaf9Dw/D/bQ6Ark5Z fsjupnwnKBZKV+cQhpIVbCDvvdIVsiIf9ojEqKkDoVsqSVXmUBdQ5VlTUowOcbmHaxj/ PJjg== X-Gm-Message-State: AOJu0Yza0iwoq+L8kZRaE9dZD/u1UolJ8a6szJqvHeFsyRiTBaVe1ZKD Kj7IN3ewoUVOXsTaU/fO3zvrUu9k7WK3JjuzkCo1iUmfd7j/E48Rk0tvmsce X-Google-Smtp-Source: AGHT+IGgtQaUp4VhCit831pBL4TgFM/skHUEvgN6l9gAeeZdnfdJam+Rk0Xpmrvynx8JFg9mDiQQ0g== X-Received: by 2002:a17:902:f603:b0:1dc:3e49:677d with SMTP id n3-20020a170902f60300b001dc3e49677dmr2087870plg.26.1711161192856; Fri, 22 Mar 2024 19:33:12 -0700 (PDT) Received: from [192.168.0.10] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d6-20020a170902654600b001dd4d0082c8sm469138pln.216.2024.03.22.19.33.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Mar 2024 19:33:12 -0700 (PDT) Message-ID: <8769faa9-90b0-463e-9de2-138071cc5364@gmail.com> Date: Fri, 22 Mar 2024 23:33:13 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240322202841.31730-1-anton@khirnov.net> <20240322202841.31730-10-anton@khirnov.net> Content-Language: en-US From: James Almer In-Reply-To: <20240322202841.31730-10-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 10/12] lavc/encode: map AVCodecContext.decoded_side_data to coded_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 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 3/22/2024 5:28 PM, Anton Khirnov wrote: > This way it can be automagically propagated through the encoder to > muxing. > --- > libavcodec/encode.c | 23 +++++++++++++++++++++++ > tests/ref/fate/libx265-hdr10 | 24 ++++++++++++------------ > 2 files changed, 35 insertions(+), 12 deletions(-) > > diff --git a/libavcodec/encode.c b/libavcodec/encode.c > index 7fc9737e93..46e46a055e 100644 > --- a/libavcodec/encode.c > +++ b/libavcodec/encode.c > @@ -782,6 +782,29 @@ int ff_encode_preinit(AVCodecContext *avctx) > return AVERROR(ENOMEM); > } > > + for (int i = 0; ff_sd_global_map[i].packet < AV_PKT_DATA_NB; i++) { > + const enum AVPacketSideDataType type_packet = ff_sd_global_map[i].packet; > + const enum AVFrameSideDataType type_frame = ff_sd_global_map[i].frame; > + const AVFrameSideData *sd_frame; > + AVPacketSideData *sd_packet; > + > + sd_frame = av_frame_side_data_get(avctx->decoded_side_data, > + avctx->nb_decoded_side_data, > + type_frame); > + if (!sd_frame || > + av_packet_side_data_get(avctx->coded_side_data, avctx->nb_coded_side_data, > + type_packet)) > + > + continue; > + > + sd_packet = av_packet_side_data_new(&avctx->coded_side_data, &avctx->nb_coded_side_data, > + type_packet, sd_frame->size, 0); > + if (!sd_packet) > + return AVERROR(ENOMEM); > + > + memcpy(sd_packet->data, sd_frame->data, sd_frame->size); > + } > + > if (CONFIG_FRAME_THREAD_ENCODER) { > ret = ff_frame_thread_encoder_init(avctx); > if (ret < 0) > diff --git a/tests/ref/fate/libx265-hdr10 b/tests/ref/fate/libx265-hdr10 > index 571c837cac..68511202a5 100644 > --- a/tests/ref/fate/libx265-hdr10 > +++ b/tests/ref/fate/libx265-hdr10 > @@ -1,16 +1,16 @@ > frames.frame.0.side_data_list.side_data.0.side_data_type="H.26[45] User Data Unregistered SEI message" > -frames.frame.0.side_data_list.side_data.1.side_data_type="H.26[45] User Data Unregistered SEI message" > -frames.frame.0.side_data_list.side_data.2.side_data_type="Mastering display metadata" > -frames.frame.0.side_data_list.side_data.2.red_x="13250/50000" > -frames.frame.0.side_data_list.side_data.2.red_y="34500/50000" > -frames.frame.0.side_data_list.side_data.2.green_x="7500/50000" > -frames.frame.0.side_data_list.side_data.2.green_y="3000/50000" > -frames.frame.0.side_data_list.side_data.2.blue_x="34000/50000" > -frames.frame.0.side_data_list.side_data.2.blue_y="16000/50000" > -frames.frame.0.side_data_list.side_data.2.white_point_x="15635/50000" > -frames.frame.0.side_data_list.side_data.2.white_point_y="16450/50000" > -frames.frame.0.side_data_list.side_data.2.min_luminance="50/10000" > -frames.frame.0.side_data_list.side_data.2.max_luminance="10000000/10000" > +frames.frame.0.side_data_list.side_data.1.side_data_type="Mastering display metadata" > +frames.frame.0.side_data_list.side_data.1.red_x="13250/50000" > +frames.frame.0.side_data_list.side_data.1.red_y="34500/50000" > +frames.frame.0.side_data_list.side_data.1.green_x="7500/50000" > +frames.frame.0.side_data_list.side_data.1.green_y="3000/50000" > +frames.frame.0.side_data_list.side_data.1.blue_x="34000/50000" > +frames.frame.0.side_data_list.side_data.1.blue_y="16000/50000" > +frames.frame.0.side_data_list.side_data.1.white_point_x="15635/50000" > +frames.frame.0.side_data_list.side_data.1.white_point_y="16450/50000" > +frames.frame.0.side_data_list.side_data.1.min_luminance="50/10000" > +frames.frame.0.side_data_list.side_data.1.max_luminance="10000000/10000" > +frames.frame.0.side_data_list.side_data.2.side_data_type="H.26[45] User Data Unregistered SEI message" > frames.frame.0.side_data_list.side_data.3.side_data_type="Content light level metadata" > frames.frame.0.side_data_list.side_data.3.max_content=1000 > frames.frame.0.side_data_list.side_data.3.max_average=200 Why does this test change? And is it just the order or side data in the output frame? _______________________________________________ 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".