From patchwork Fri Mar 22 23:31:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp238172pzb; Fri, 22 Mar 2024 16:32:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3trsksLOvvMIKFrh9mmQGW+vUFTpQDULR1Pz/Qf4ZuZ0BJVq+VNW7isvCuG46jGINXNiUdaqxuV8M2+UKRTAElQ+yQ0ZtpnkzpA== X-Google-Smtp-Source: AGHT+IEuwLq3yl+OZODnG/7hsEnFtiMoVb24a3Q97JoI8pArOSik+wdoNGqmNgQmoerMHUwnog1p X-Received: by 2002:a17:906:f0c7:b0:a47:ab9:89c6 with SMTP id dk7-20020a170906f0c700b00a470ab989c6mr642796ejb.30.1711150350942; Fri, 22 Mar 2024 16:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711150350; cv=none; d=google.com; s=arc-20160816; b=jmX9uticZIujGEzxX19iNMLETxdAP8AAt5DHavAt0tG1sBMn2afRJWmIMG3NNv3jKq b7MzW1NSA59Ny+aPnvbY6FtNhGi1RbqyypXRAX+dgCkZrKQJ9y/+1DDZKI/4tIOxdG7c /gRM2J/ulW27SJsBIIh04x976VTtV6sOygnRXztc47qRuTVmujTGWjkP6HMePJnhGPGt xe2k9MMoXWR/7c9JhD/7lL4TwGwyTSxdm3iXesOioD6XHpDFNww1P0lqNt07KLUb3rr7 fvXN5n+/TnT+B/mKRlCilqXfaisizf46zIBqUC6wReaQPqpErKsnaEtHZ0uefpEn/BHz wPuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=aQseuhI58qNwl49M8jhNhTTLWzO3qS1G+eGIH9bEwsU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ai5R+qNIcKABKD+LFnNFPOEhzrtady6WtLPoWVqvrZ5E88qTPCWOhhaQ0N2E5Axagc w9iePIN4Ng2Bz9fWf7rifE7IZIv2uWwDWetjeZefSWm1HCkbkbrPb8YUohuLIOql9W6l Sd97+ov4ZIKM1Eo9uZnoKdT2VBFctEGi0tCnNZUWVkF9pqPOzrBTQiaa5lmhUVOmt0tq k44cSZdfO31SEkGdR96LH9UQK3KZhdjU21JhvYxMKF1u2bxj5XZNi/j9Gtfen2Sk9mKr sb7cPnH1+/Fld9lzjZQvyLmsQ5Xm3g/bxKai9mPAw5JrNi8t4JzNNxNy3qfg419EDmIR 2nog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=PZB1cFfk; 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 kt11-20020a170906aacb00b00a46d5915561si274345ejb.550.2024.03.22.16.32.30; Fri, 22 Mar 2024 16:32:30 -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=20230601 header.b=PZB1cFfk; 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 A50F568D53F; Sat, 23 Mar 2024 01:31:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F8BF68D595 for ; Sat, 23 Mar 2024 01:31:52 +0200 (EET) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-5e152c757a5so1328994a12.2 for ; Fri, 22 Mar 2024 16:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150310; x=1711755110; 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=M4zaM0rkeTDQWIhGY6fm7GNZS8Qjo8UBH6gWwGb62R8=; b=PZB1cFfk/GQiVF6KTJ4v12K+rMXK+i/jToBFiNaPCxhD/mrL0iUwLQ9ph/aVWmCXAg 0MXrNjpOMvfYoCufhic8lkhbtmS0xPIuQZxLkYSpJ85wegGQRUJl/u7uWfbdtXdNETv5 hW0Pd69jPP3s5wBRKc0iMT057RTFKI8zULjc5cvfIcdMPHehfRZFInwtIKFBsjZsr5bX piYelSpJeUScXJ4myeW5Rzzrsm1NwYiL3m+isl8iGIIJINcy5CGQF0JnM9dJXOaxStwp UdyOH3b9Lr0MKFBGaj4GhijiuDyGPc5djbmCxYzlrI7irsKxAxO9FUGfa0USs4D5rZBA 3fKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150310; x=1711755110; 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=M4zaM0rkeTDQWIhGY6fm7GNZS8Qjo8UBH6gWwGb62R8=; b=YnflNGrYRaxUxIHrXmcVsbXJbhmfr2QSaVxzRX/F21uM4kvRDByk2spm4YDZ1UIIn5 EL2PKr37vVRCtrzEfSRbkouFy/YwLo+qL+xTsKUCpudu9MR0IaTIawN+UKZrM3MG06OG rnQFP9oB4Pqqew8zetmNCzaaR/kMvG0zyQ/nK9lEUcjogg2SeU6jDL1UrvDD72Vx9IZ3 ijNmsjD/9sO3qhL9jyciAadyuEEFA/6anFEjncFPR1qJjc4exnVmkGCTizPAz7Na2sGR BftlMQ+3QmSc9Kml467r3/ma+jnDa0+3sSYTk7Gjus7cCNCqmKt+ium4ygWnzM2wK8CO Fi6Q== X-Gm-Message-State: AOJu0YzTY+QDBpWObYEJIoxF1NMwtwjykGPhPiLTFqJyUjTPjdeUcUPU WMxJZhJ/6SUmBHtd+y5T+mafkCMYM7SxK5IlXs+DWi/W/lGmBcaqxu8eLRUi X-Received: by 2002:a05:6a20:9151:b0:1a3:ac3f:f08b with SMTP id x17-20020a056a20915100b001a3ac3ff08bmr1354389pzc.5.1711150309805; Fri, 22 Mar 2024 16:31:49 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:29 -0300 Message-ID: <20240322233129.62994-5-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240322233129.62994-1-jamrial@gmail.com> References: <20240322233129.62994-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevcdec: export global side data in AVCodecContext 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: p0HGKDx6Ce/N Signed-off-by: James Almer --- libavcodec/avcodec.h | 2 +- libavcodec/h2645_sei.c | 217 ++++++++++++++++++++++++----------------- libavcodec/h2645_sei.h | 2 + libavcodec/hevcdec.c | 4 + 4 files changed, 136 insertions(+), 89 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 83dc487251..968009a192 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2071,7 +2071,7 @@ typedef struct AVCodecContext { * - encoding: may be set by user before calling avcodec_open2() for * encoder configuration. Afterwards owned and freed by the * encoder. - * - decoding: unused + * - decoding: may be set by libavcodec in avcodec_open2(). */ AVFrameSideData **decoded_side_data; int nb_decoded_side_data; diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 2e098d1069..32bb4f841d 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -511,6 +511,124 @@ static int is_frame_packing_type_valid(SEIFpaType type, enum AVCodecID codec_id) type >= SEI_FPA_TYPE_SIDE_BY_SIDE; } +static int h2645_sei_to_side_data(AVCodecContext *avctx, H2645SEI *sei, + AVFrameSideData ***sd, int *nb_sd) +{ + int ret; + + for (unsigned i = 0; i < sei->unregistered.nb_buf_ref; i++) { + H2645SEIUnregistered *unreg = &sei->unregistered; + AVBufferRef *buf; + + if (!unreg->buf_ref[i]) + continue; + + buf = av_buffer_ref(unreg->buf_ref[i]); + if (!buf) + return AVERROR(ENOMEM); + + if (!av_frame_side_data_add(sd, nb_sd, AV_FRAME_DATA_SEI_UNREGISTERED, &buf, 0)) { + av_buffer_unref(&buf); + return AVERROR(ENOMEM); + } + } + + if (sei->ambient_viewing_environment.present) { + H2645SEIAmbientViewingEnvironment *env = + &sei->ambient_viewing_environment; + AVBufferRef *buf; + size_t size; + + AVAmbientViewingEnvironment *dst_env = + av_ambient_viewing_environment_alloc(&size); + if (!dst_env) + return AVERROR(ENOMEM); + + buf = av_buffer_create((uint8_t *)dst_env, size, NULL, NULL, 0); + if (!buf) { + av_free(dst_env); + return AVERROR(ENOMEM); + } + + ret = ff_frame_new_side_data_from_buf(avctx, sd, nb_sd, + AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, &buf); + + if (ret < 0) + return ret; + + dst_env->ambient_illuminance = av_make_q(env->ambient_illuminance, 10000); + dst_env->ambient_light_x = av_make_q(env->ambient_light_x, 50000); + dst_env->ambient_light_y = av_make_q(env->ambient_light_y, 50000); + } + + if (sei->mastering_display.present) { + // HEVC uses a g,b,r ordering, which we convert to a more natural r,g,b + const int mapping[3] = {2, 0, 1}; + const int chroma_den = 50000; + const int luma_den = 10000; + int i; + AVMasteringDisplayMetadata *metadata; + + ret = ff_decode_mastering_display_new(avctx, sd, nb_sd, &metadata); + if (ret < 0) + return ret; + + if (metadata) { + for (i = 0; i < 3; i++) { + const int j = mapping[i]; + metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; + metadata->display_primaries[i][0].den = chroma_den; + metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; + metadata->display_primaries[i][1].den = chroma_den; + } + metadata->white_point[0].num = sei->mastering_display.white_point[0]; + metadata->white_point[0].den = chroma_den; + metadata->white_point[1].num = sei->mastering_display.white_point[1]; + metadata->white_point[1].den = chroma_den; + + metadata->max_luminance.num = sei->mastering_display.max_luminance; + metadata->max_luminance.den = luma_den; + metadata->min_luminance.num = sei->mastering_display.min_luminance; + metadata->min_luminance.den = luma_den; + metadata->has_luminance = 1; + metadata->has_primaries = 1; + + av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); + av_log(avctx, AV_LOG_DEBUG, + "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", + av_q2d(metadata->display_primaries[0][0]), + av_q2d(metadata->display_primaries[0][1]), + av_q2d(metadata->display_primaries[1][0]), + av_q2d(metadata->display_primaries[1][1]), + av_q2d(metadata->display_primaries[2][0]), + av_q2d(metadata->display_primaries[2][1]), + av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); + av_log(avctx, AV_LOG_DEBUG, + "min_luminance=%f, max_luminance=%f\n", + av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); + } + } + + if (sei->content_light.present) { + AVContentLightMetadata *metadata; + + ret = ff_decode_content_light_new(avctx, sd, nb_sd, &metadata); + if (ret < 0) + return ret; + + if (metadata) { + metadata->MaxCLL = sei->content_light.max_content_light_level; + metadata->MaxFALL = sei->content_light.max_pic_average_light_level; + + av_log(avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); + av_log(avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", + metadata->MaxCLL, metadata->MaxFALL); + } + } + + return 0; +} + int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, enum AVCodecID codec_id, AVCodecContext *avctx, const H2645VUI *vui, @@ -607,17 +725,13 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } + ret = h2645_sei_to_side_data(avctx, sei, &frame->side_data, &frame->nb_side_data); + if (ret < 0) + return ret; + for (unsigned i = 0; i < sei->unregistered.nb_buf_ref; i++) { H2645SEIUnregistered *unreg = &sei->unregistered; - - if (unreg->buf_ref[i]) { - AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, - AV_FRAME_DATA_SEI_UNREGISTERED, - unreg->buf_ref[i]); - if (!sd) - av_buffer_unref(&unreg->buf_ref[i]); - unreg->buf_ref[i] = NULL; - } + av_buffer_unref(&unreg->buf_ref[i]); } sei->unregistered.nb_buf_ref = 0; @@ -694,88 +808,15 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; } - if (sei->ambient_viewing_environment.present) { - H2645SEIAmbientViewingEnvironment *env = - &sei->ambient_viewing_environment; - - AVAmbientViewingEnvironment *dst_env = - av_ambient_viewing_environment_create_side_data(frame); - if (!dst_env) - return AVERROR(ENOMEM); - - dst_env->ambient_illuminance = av_make_q(env->ambient_illuminance, 10000); - dst_env->ambient_light_x = av_make_q(env->ambient_light_x, 50000); - dst_env->ambient_light_y = av_make_q(env->ambient_light_y, 50000); - } - - if (sei->mastering_display.present) { - // HEVC uses a g,b,r ordering, which we convert to a more natural r,g,b - const int mapping[3] = {2, 0, 1}; - const int chroma_den = 50000; - const int luma_den = 10000; - int i; - AVMasteringDisplayMetadata *metadata; - - ret = ff_decode_mastering_display_new(avctx, &frame->side_data, &frame->nb_side_data, &metadata); - if (ret < 0) - return ret; - - if (metadata) { - for (i = 0; i < 3; i++) { - const int j = mapping[i]; - metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; - metadata->display_primaries[i][0].den = chroma_den; - metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; - metadata->display_primaries[i][1].den = chroma_den; - } - metadata->white_point[0].num = sei->mastering_display.white_point[0]; - metadata->white_point[0].den = chroma_den; - metadata->white_point[1].num = sei->mastering_display.white_point[1]; - metadata->white_point[1].den = chroma_den; - - metadata->max_luminance.num = sei->mastering_display.max_luminance; - metadata->max_luminance.den = luma_den; - metadata->min_luminance.num = sei->mastering_display.min_luminance; - metadata->min_luminance.den = luma_den; - metadata->has_luminance = 1; - metadata->has_primaries = 1; - - av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); - av_log(avctx, AV_LOG_DEBUG, - "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", - av_q2d(metadata->display_primaries[0][0]), - av_q2d(metadata->display_primaries[0][1]), - av_q2d(metadata->display_primaries[1][0]), - av_q2d(metadata->display_primaries[1][1]), - av_q2d(metadata->display_primaries[2][0]), - av_q2d(metadata->display_primaries[2][1]), - av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); - av_log(avctx, AV_LOG_DEBUG, - "min_luminance=%f, max_luminance=%f\n", - av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); - } - } - - if (sei->content_light.present) { - AVContentLightMetadata *metadata; - - ret = ff_decode_content_light_new(avctx, &frame->side_data, &frame->nb_side_data, &metadata); - if (ret < 0) - return ret; - - if (metadata) { - metadata->MaxCLL = sei->content_light.max_content_light_level; - metadata->MaxFALL = sei->content_light.max_pic_average_light_level; - - av_log(avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); - av_log(avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", - metadata->MaxCLL, metadata->MaxFALL); - } - } - return 0; } +int ff_h2645_sei_to_context(AVCodecContext *avctx, H2645SEI *sei) +{ + return h2645_sei_to_side_data(avctx, sei, &avctx->decoded_side_data, + &avctx->nb_decoded_side_data); +} + void ff_h2645_sei_reset(H2645SEI *s) { av_buffer_unref(&s->a53_caption.buf_ref); diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h index 0ebf48011a..1b55280c05 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -165,4 +165,6 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, unsigned bit_depth_luma, unsigned bit_depth_chroma, int seed); +int ff_h2645_sei_to_context(AVCodecContext *avctx, H2645SEI *sei); + #endif /* AVCODEC_H2645_SEI_H */ diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 565c94cf95..17c77f0919 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3643,6 +3643,10 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) if (ret < 0) { return ret; } + + ret = ff_h2645_sei_to_context(s->avctx, &s->sei.common); + if (ret < 0) + return ret; } sd = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF);