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 ESMTPS id 4C97F4BDFF for ; Mon, 3 Feb 2025 22:37:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D07E868B561; Tue, 4 Feb 2025 00:36:53 +0200 (EET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49F2868B3AF for ; Tue, 4 Feb 2025 00:36:46 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21644aca3a0so116414285ad.3 for ; Mon, 03 Feb 2025 14:36:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738622204; x=1739227004; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7kk9x0lMv1lDPH+AdHM9fi+vUTD0LC5H3J9ymp/lw9Y=; b=iL/zxkz6liCkDGcr1BhqTNC5w4aCYXYGkOOVeblnXvreldRhB2enbUPoryaLuroPSt Nl3qof7YdPN58U0ZhX6t4jvNpm9UBNkZRTYihEs0Ce1dGOr3ZdVUTZapvriMW//AGWgD HDCy1BO0RFBQXKij34Jw0wqx97Wf1nTm58ozOV75yS9zNTgH7kzv4KR6wo5DKJFU2aBp jNVZ+Mve+vKA8U8INdPJMZXdXi82UCoWCMUrnzkhFWlWG8hflbBBdf3lX4wlckM+g7MI ZspMKSigWbkNvNhmyLGQmjHAiEThcoshICLmKurDbpIA4LDcYbnj/obgylb7h0eRzXIg ELNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738622204; x=1739227004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7kk9x0lMv1lDPH+AdHM9fi+vUTD0LC5H3J9ymp/lw9Y=; b=YBhsCz9FVavU/sLRf0xDtWHO6T/eE/WwbDsGQvejZCz1RmKidUNlZ/8pO7LpX0KC+3 d7YoHexUYDgDZFPghhbU69g/+hpk1fHcQsnKf2P5avYqtnVOI3oGyH0LeeezZG9Qbmmh 77xIT68tC0IsOzmIRmM8aBRGuSNCG/8uIeZKaio2oDic8Oh+/Oxvr24ppNduJex2+aR5 dZpl9COd/HzpCFR8Uchl84hnE/Z2Eq/CmK1k/aUIWoAtExTknRug1nWvdFYSODEqzjaB 5cpKn2+IhGQZOGzVKDt8e6s1N0+WL00xWgWYk70AgCmgrq4j5JsqFhjqf2S9Fh7duGmY o9gA== X-Gm-Message-State: AOJu0YyC/iK0VShh4opeHrABpwQSL7i8xG2awctvNmx8Uydup1KTt5/F 6Xpa3NUTphJKNDj67A9kxIU+6mH81NNZjppioRC5VgrsKWtSfZHIVoR+swvH X-Gm-Gg: ASbGncsiidTGclUSWJklxRIUIpeXsFNaHoGMYcfNuF8G1tNot9yH/sZiTg+C9g2NGgr rey8tjCPXjQAZstgd9CnqjSbuI9BAl52gdqBi1yMYYivEzy+rzDZPwFYy+5y1GxhiZfzMh2hwK0 NkSSNlQYkgbXXUHx1IQJaJwTE7IvYwQRY+3zlv2nNgB0PIItmLRvgxU5a3RNW9CJZ1x7SZqsBWG zB2ucoMuoqOz5WzoD7ROwfE39aP9T7bksMr8CdTFHe4I8AhPoaCBUubzqNXHhmyEz2DnLaj2EDs GoHsMHsHjfO7nXyxCfaH5+tTPtEQtbA= X-Google-Smtp-Source: AGHT+IEnv60VXQ9ulHpg/qvI/h5B1LXAfYyS/y2t2zR/9zDL4/v07XwwQ9zLUpzmV8Y1i/wYhFbBIA== X-Received: by 2002:a17:902:ccd1:b0:216:4e9f:4ed4 with SMTP id d9443c01a7336-21dd7dcb2a9mr434206825ad.36.1738622203727; Mon, 03 Feb 2025 14:36:43 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:7d9c:3d76:2afc:cc38]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ad11841ec59sm5154543a12.57.2025.02.03.14.36.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 14:36:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Feb 2025 19:35:46 -0300 Message-ID: <20250203223546.12224-6-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250203223546.12224-1-jamrial@gmail.com> References: <20250203223546.12224-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 6/6] avcodec/hevc/hevcdec: export 3D Reference Displays 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/hevc/hevcdec.c | 55 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index f9ff22dbac..ffacbcad24 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -35,6 +35,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/ref_displays_info.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" @@ -4021,6 +4022,58 @@ static int hevc_update_thread_context(AVCodecContext *dst, } #endif +static int hevc_sei_to_context(AVCodecContext *avctx, HEVCSEI *sei) +{ + const HEVCSEITDRDI *tdrdi = sei->tdrdi; + int ret; + + if (tdrdi && tdrdi->num_ref_displays) { + AVBufferRef *buf; + size_t size; + AV3DReferenceDisplaysInfo *rdi = av_ref_displays_info_alloc(tdrdi->num_ref_displays, &size); + + if (!rdi) + return AVERROR(ENOMEM); + + buf = av_buffer_create((uint8_t *)rdi, size, NULL, NULL, 0); + if (!buf) { + av_free(rdi); + return AVERROR(ENOMEM); + } + + rdi->prec_ref_display_width = tdrdi->prec_ref_display_width; + rdi->ref_viewing_distance_flag = tdrdi->ref_viewing_distance_flag; + rdi->prec_ref_viewing_dist = tdrdi->prec_ref_viewing_dist; + rdi->num_ref_displays = tdrdi->num_ref_displays; + + for (int i = 0; i < rdi->num_ref_displays; i++) { + AV3DReferenceDisplay *ref = av_ref_displays_info_display(rdi, i); + + ref->left_view_id = tdrdi->left_view_id[i]; + ref->right_view_id = tdrdi->right_view_id[i]; + ref->exponent_ref_display_width = tdrdi->exponent_ref_display_width[i]; + ref->mantissa_ref_display_width = tdrdi->mantissa_ref_display_width[i]; + ref->exponent_ref_viewing_distance = tdrdi->exponent_ref_viewing_distance[i]; + ref->mantissa_ref_viewing_distance = tdrdi->mantissa_ref_viewing_distance[i]; + ref->additional_shift_present_flag = tdrdi->additional_shift_present_flag[i]; + ref->num_sample_shift = tdrdi->num_sample_shift[i]; + } + + ret = ff_frame_new_side_data_from_buf_ext(avctx, &avctx->decoded_side_data, &avctx->nb_decoded_side_data, + AV_FRAME_DATA_3D_REFERENCE_DISPLAYS, &buf); + if (ret < 0) { + av_buffer_unref(&buf); + return ret; + } + } + + ret = ff_h2645_sei_to_context(avctx, &sei->common); + if (ret < 0) + return ret; + + return 0; +} + static av_cold int hevc_decode_init(AVCodecContext *avctx) { HEVCContext *s = avctx->priv_data; @@ -4044,7 +4097,7 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) return ret; } - ret = ff_h2645_sei_to_context(avctx, &s->sei.common); + ret = hevc_sei_to_context(avctx, &s->sei); if (ret < 0) return ret; } -- 2.48.1 _______________________________________________ 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".