From patchwork Fri Oct 25 02:26:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:be6b:0:b0:48e:c0f8:d0de with SMTP id bd11csp174401vqb; Fri, 25 Oct 2024 01:24:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVruBl07ixJTG+q/UlyxX/bx+KvbdnKKW1r3uFD793fHkDMbh+Nr8s+OudgFSbd/0zFE6zCRiNTCviiRQGB/QXX@gmail.com X-Google-Smtp-Source: AGHT+IHk3J0KxSrdxVI9x1xdrRstCukPRHqIBUz8OQZpbU6wX1b+9blSXGGt5xPGwf7Bg2wqOUFM X-Received: by 2002:a05:6402:3550:b0:5cb:6712:6089 with SMTP id 4fb4d7f45d1cf-5cba23f1ba5mr3269662a12.7.1729844644847; Fri, 25 Oct 2024 01:24:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729844644; cv=none; d=google.com; s=arc-20240605; b=PAsE0mMw5TFH+8WKudp3kp5ptmMAZ53MciP5JHVJAHYGb5SOLbomQ0tuq3PNpQ7g+r 0/x6cxEcsWMUOYTWN/BL6Umgg7uxbTbZUelPZ8GTZZuLoIy1/DqZJVQpesATzyPyaAFa vn9H+R+76QtE8rGPdFVSt8gemrlgMk14iyXtEJhC/Ygw20Rq5TNNBiCLw8lyB1an2U+v gsZy9fTHBQq3VpmujmmpDtgb3B5muTPlKWbE307FM1bTK5CIDgC7dV9Azjfi4xf/tVPI gwCFgNn9ZYVIL8nFaot3FsX15hR1Gn7TWqvv8p++ENQRIbnJNT8TgHXlehHUgSGMBnrs 00+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4sDGOOd0MZmOujhojPjLu1Ib/9EH1cigh2AQojq9Kho=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=QmSfIx7RhZpqNEzqM0srYlj+vQ452Bn8V7QW00NCVqZgrzR5n6AgtXgQTmi5vYQ4Br WOF9UJlvyudpLDeQz+JrE1YmSrum1cjpFEet2B/XvlwXFM2ZfaVRfLfFFofc/x4ffgTB nxjPNsumFqCk6jwp5RZOkUbJkmrvTxz+PgQJcCkmmbFKoyJ1Kx1dbljCJWxAjXB087cq Z+5Gdgeg9+VFme3/Io27q2j0PmilUxUXE75Bk4YerOs8Vk63Dvyvi+tnsxXaLDEamn4v Qw8ARWhNF33UjzPffscNdFkuhQTzIVeoDO1gP9qR3DJauV8Kpfc6hoM0ivHS/kG5rlNE 5ubQ==; 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="TfsLlSo/"; 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; dara=fail header.i=@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 4fb4d7f45d1cf-5cbb62309c1si505687a12.74.2024.10.25.01.24.04; Fri, 25 Oct 2024 01:24:04 -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="TfsLlSo/"; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B933168D79B; Fri, 25 Oct 2024 05:27:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0EDB68D79B for ; Fri, 25 Oct 2024 05:27:03 +0300 (EEST) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2e2e2d09decso1831724a91.1 for ; Thu, 24 Oct 2024 19:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729823220; x=1730428020; 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=sZccNP5H2u8j43ErO4jqlSUYxYUXe8Kjk6zrBY4GfrE=; b=TfsLlSo/nyWOQ/2+ocFSlDd1EA4sKiHfI0ps5Vs9XSa4uNTf7ssAno1wT7hmrK2Wi4 z5kSU+H9K2AkmtzKIG6jTRToCvxsjFgydGkt70voCGRFXggk5ZxYNb+fx2SdM2bteyZ+ hXG19jzudz45ohZittcW7q+TH0uxjhYMLQdlZaeM6Z4svKhnL/g38q5qjPYhZf9S6d4c dF9XOCozNIwP0t9lB0RnWL/HRCIEJwgCPKEJ+k2S3SttEu7c1OFn6jI9wLY3HWZgCwaz 4GccI1lK3yVyN4RZnz1ESLFufOrAJR3iJ0se0nkGzkOIM54a7nhg2WdTPhQI9S3Ktd9B jVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729823220; x=1730428020; 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=sZccNP5H2u8j43ErO4jqlSUYxYUXe8Kjk6zrBY4GfrE=; b=pTRX2zFz0OajcNDfDxY6bYH608EgXuSvl0dQyUSbmDh6yPtXoqEwGDu1nOtQEs1JR2 wffl3XXZCkSLKBlr0vBu+tkGeMUgq9wVR9S5RttbcsVdcgkLyk3pcSiYigRigeOzCbrC wo0cHMRI58TCE3WLP1HlE4UXfcOASmZ53MJ55CUjCieuDjSr452TN1jD8wG10Zvowu8u 4WhULQ8N58Xj9PYJ4mbqrjCyykPRC5bs8TbNR7cJRlkE7xHETHI22YnajOmjLJFr96V5 6UlGV+2ZNYSPL2mH/80c6y9c/sLycyb6/o6m3GsHwTdIy8egBeYN4a4Qy3+R9ialiRlz 74eQ== X-Gm-Message-State: AOJu0YwOZ4CVET0DA9FLatRbb60x9E2b2BZvypAwiowS7u+yFiZSL3f4 Gu+yfKRLS98tRyoVmi6Q66uKVsxJ5WyWkfMDX0fSoRvhswuPHfauUZxfZA== X-Received: by 2002:a17:90a:8a0c:b0:2e0:8780:ecb with SMTP id 98e67ed59e1d1-2e77e610e54mr6123110a91.12.1729823219826; Thu, 24 Oct 2024 19:26:59 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e77e48ed34sm2485491a91.9.2024.10.24.19.26.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 19:26:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Oct 2024 23:26:10 -0300 Message-ID: <20241025022613.3921-2-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241025022613.3921-1-jamrial@gmail.com> References: <20241025022613.3921-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/aom_film_grain: allocate film grain metadata dynamically 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: lTxvymI3SQcs This removes the ABI breaking use of sizeof(AVFilmGrainParams), and achieves the same size reduction to decoder structs as 08b1bffa49715a9615acc025dfbea252d8409e1f. Signed-off-by: James Almer --- libavcodec/aom_film_grain.c | 47 +++++++++++++++++++++++++++++-------- libavcodec/aom_film_grain.h | 6 ++++- libavcodec/h2645_sei.c | 12 +++++++++- libavcodec/hevc/hevcdec.c | 1 - 4 files changed, 53 insertions(+), 13 deletions(-) diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c index e302567ba5..de4437fd16 100644 --- a/libavcodec/aom_film_grain.c +++ b/libavcodec/aom_film_grain.c @@ -26,7 +26,9 @@ */ #include "libavutil/avassert.h" +#include "libavutil/buffer.h" #include "libavutil/imgutils.h" +#include "libavutil/mem.h" #include "aom_film_grain.h" #include "get_bits.h" @@ -124,7 +126,7 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, { GetBitContext gbc, *gb = &gbc; AVFilmGrainAOMParams *aom; - AVFilmGrainParams *fgp, *ref = NULL; + AVFilmGrainParams *fgp = NULL, *ref = NULL; int ret, num_sets, n, i, uv, num_y_coeffs, update_grain, luma_only; ret = init_get_bits8(gb, payload, payload_size); @@ -135,28 +137,38 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, if (!s->enable) return 0; + for (int i = 0; i < FF_ARRAY_ELEMS(s->sets); i++) + av_buffer_unref(&s->sets[i]); + skip_bits(gb, 4); // reserved num_sets = get_bits(gb, 3) + 1; for (n = 0; n < num_sets; n++) { int payload_4byte, payload_size, set_idx, apply_units_log2, vsc_flag; int predict_scaling, predict_y_scaling, predict_uv_scaling[2]; int payload_bits, start_position; + size_t fgp_size; start_position = get_bits_count(gb); payload_4byte = get_bits1(gb); payload_size = get_bits(gb, payload_4byte ? 2 : 8); set_idx = get_bits(gb, 3); - fgp = &s->sets[set_idx]; + fgp = av_film_grain_params_alloc(&fgp_size); + if (!fgp) + goto error; aom = &fgp->codec.aom; fgp->type = get_bits1(gb) ? AV_FILM_GRAIN_PARAMS_AV1 : AV_FILM_GRAIN_PARAMS_NONE; - if (!fgp->type) + if (!fgp->type) { + av_freep(&fgp); continue; + } fgp->seed = get_bits(gb, 16); update_grain = get_bits1(gb); - if (!update_grain) + if (!update_grain) { + av_freep(&fgp); continue; + } apply_units_log2 = get_bits(gb, 4); fgp->width = get_bits(gb, 12) << apply_units_log2; @@ -330,32 +342,47 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, if (payload_bits > payload_size * 8) goto error; skip_bits(gb, payload_size * 8 - payload_bits); + + av_buffer_unref(&s->sets[set_idx]); + s->sets[set_idx] = av_buffer_create((uint8_t *)fgp, fgp_size, NULL, NULL, 0); + if (!s->sets[set_idx]) + goto error; } return 0; error: - memset(s, 0, sizeof(*s)); + av_free(fgp); + ff_aom_film_grain_uninit_params(s); return AVERROR_INVALIDDATA; } int ff_aom_attach_film_grain_sets(const AVFilmGrainAFGS1Params *s, AVFrame *frame) { - AVFilmGrainParams *fgp; if (!s->enable) return 0; for (int i = 0; i < FF_ARRAY_ELEMS(s->sets); i++) { - if (s->sets[i].type != AV_FILM_GRAIN_PARAMS_AV1) + AVBufferRef *buf; + + if (!s->sets[i]) continue; - fgp = av_film_grain_params_create_side_data(frame); - if (!fgp) + + buf = av_buffer_ref(s->sets[i]); + if (!buf || !av_frame_new_side_data_from_buf(frame, + AV_FRAME_DATA_FILM_GRAIN_PARAMS, buf)) return AVERROR(ENOMEM); - memcpy(fgp, &s->sets[i], sizeof(*fgp)); } return 0; } +void ff_aom_film_grain_uninit_params(AVFilmGrainAFGS1Params *s) +{ + for (int i = 0; i < FF_ARRAY_ELEMS(s->sets); i++) + av_buffer_unref(&s->sets[i]); + s->enable = 0; +} + // Taken from the AV1 spec. Range is [-2048, 2047], mean is 0 and stddev is 512 static const int16_t gaussian_sequence[2048] = { 56, 568, -180, 172, 124, -84, 172, -64, -900, 24, 820, diff --git a/libavcodec/aom_film_grain.h b/libavcodec/aom_film_grain.h index 1f8c78f657..94cd9d9f67 100644 --- a/libavcodec/aom_film_grain.h +++ b/libavcodec/aom_film_grain.h @@ -28,11 +28,12 @@ #ifndef AVCODEC_AOM_FILM_GRAIN_H #define AVCODEC_AOM_FILM_GRAIN_H +#include "libavutil/buffer.h" #include "libavutil/film_grain_params.h" typedef struct AVFilmGrainAFGS1Params { int enable; - AVFilmGrainParams sets[8]; + AVBufferRef *sets[8]; } AVFilmGrainAFGS1Params; // Synthesizes film grain on top of `in` and stores the result to `out`. `out` @@ -48,4 +49,7 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s, // Attach all valid film grain param sets to `frame`. int ff_aom_attach_film_grain_sets(const AVFilmGrainAFGS1Params *s, AVFrame *frame); +// Free all allocations in `s` and zero the entire struct. +void ff_aom_film_grain_uninit_params(AVFilmGrainAFGS1Params *s); + #endif /* AVCODEC_AOM_FILM_GRAIN_H */ diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index a481dbca2c..33390d389d 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -26,6 +26,7 @@ #include "config_components.h" #include "libavutil/ambient_viewing_environment.h" +#include "libavutil/buffer.h" #include "libavutil/display.h" #include "libavutil/hdr_dynamic_metadata.h" #include "libavutil/film_grain_params.h" @@ -547,6 +548,14 @@ int ff_h2645_sei_ctx_replace(H2645SEI *dst, const H2645SEI *src) } } + for (unsigned i = 0; i < FF_ARRAY_ELEMS(dst->aom_film_grain.sets); i++) { + ret = av_buffer_replace(&dst->aom_film_grain.sets[i], + src->aom_film_grain.sets[i]); + if (ret < 0) + return ret; + } + dst->aom_film_grain.enable = src->aom_film_grain.enable; + return 0; } @@ -918,7 +927,8 @@ void ff_h2645_sei_reset(H2645SEI *s) s->ambient_viewing_environment.present = 0; s->mastering_display.present = 0; s->content_light.present = 0; - s->aom_film_grain.enable = 0; + + ff_aom_film_grain_uninit_params(&s->aom_film_grain); av_freep(&s->film_grain_characteristics); } diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 900895598f..f2bdf6134e 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -4010,7 +4010,6 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer; s->sei.common.mastering_display = s0->sei.common.mastering_display; s->sei.common.content_light = s0->sei.common.content_light; - s->sei.common.aom_film_grain = s0->sei.common.aom_film_grain; s->sei.tdrdi = s0->sei.tdrdi; return 0;