From patchwork Thu Feb 11 14:36:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25566 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0021444A465 for ; Thu, 11 Feb 2021 16:43:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E06C368AA7B; Thu, 11 Feb 2021 16:43:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 057B168A9EE for ; Thu, 11 Feb 2021 16:43:50 +0200 (EET) Received: by mail-pg1-f171.google.com with SMTP id o7so4034659pgl.1 for ; Thu, 11 Feb 2021 06:43:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2vwKqDp6dyzH0ewjcW9Y5+neKR91w90WL1vkdjOqRis=; b=JdyEcpANZTZ0RiFbqOELkWsp4CgWsB6t9utm50Z68qyc9fP0xEWwzIAZHqM+f3kPPf zK2O+MbqOT3zCoQ0idtfRSdd7RQZS1LW01erszCTGY15lWL5lBu1ykGHvgHyhMqSy8iW 8Fei3zXmvxKJ9+e3ckACuY6pujAcgjO+5RbHr3gMCmQoOGbBALaxAtwki6eIncCE6xpX +yNK9Mzd9xFsPhspRc1SABRgUW4wIHwhQuGLRiRN313ub9SzF+9RNux6boElaP5SECUi g28MQvDgF9WxX7h+aTsSyFshegF+sfPa2ehbzVduK3epNB8y9SkxLK/qz4maOSxDdwSC 4DBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2vwKqDp6dyzH0ewjcW9Y5+neKR91w90WL1vkdjOqRis=; b=CbGrUUP35GpfHC/P5S0nvwZU9lkVOLvuCJ80C5Wr69LKr5afNsl+wOLlPEfDK3AlTF Xd4wy0vfU16BxdLoz+OwVhdyBxq7WyOljBSM6FZjV3yTq0i4siTgFlEhWijC9DJkiTPc SQtfr3nW+RWg7inZEhaj4MFmSgRceiMdh9bpjz9OhQFS4v2yvg7Ul7U/nnfq3OheZX9V nhWlcdaHva5bFs9coRX3PrgxiH1VY3t22HGLljXSfLaZyFYrECvjE02MFKZ33J5ccLDZ hY23ON04hyJ32hpYdkujsjODIvNanpzJqWRi6TC5ImosKXKvYUD7YaA71MGmWurD8QR/ 26DQ== X-Gm-Message-State: AOAM533iPaQXlSSu1+WXtXKSwRC1uHzAVG0NHBDl3dqXWgrC24o3hKlT wx4gSzstBW12PWQ2xHXN/kU1YzmDGI8= X-Google-Smtp-Source: ABdhPJxEK9bBDwi271Tm5HENr3x8y0/RoEBwzjxao6mcduBCA/1xdYwnhjULglne7jn9aeQMMc+rJQ== X-Received: by 2002:a63:221a:: with SMTP id i26mr8155974pgi.71.1613054203406; Thu, 11 Feb 2021 06:36:43 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id p29sm6564587pgm.64.2021.02.11.06.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 06:36:43 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Feb 2021 22:36:02 +0800 Message-Id: <20210211143611.5663-2-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210211143611.5663-1-nuomi2021@gmail.com> References: <20210125141507.11012-1-nuomi2021@gmail.com> <20210211143611.5663-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 01/10] cbs_h2645: refact, use cbs_h2645_replace_ps to replace cbs_h26*_replace_*ps X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Mark Thompson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mark Thompson --- libavcodec/cbs_h2645.c | 171 +++++++++++++++++++++++++++++++---------- 1 file changed, 130 insertions(+), 41 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 6005d46e0d..36212d1da6 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -661,38 +661,127 @@ static int cbs_h2645_split_fragment(CodedBitstreamContext *ctx, return 0; } -#define cbs_h2645_replace_ps(h26n, ps_name, ps_var, id_element) \ -static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \ - CodedBitstreamUnit *unit) \ -{ \ - CodedBitstreamH26 ## h26n ## Context *priv = ctx->priv_data; \ - H26 ## h26n ## Raw ## ps_name *ps_var = unit->content; \ - unsigned int id = ps_var->id_element; \ - int err; \ - if (id >= FF_ARRAY_ELEMS(priv->ps_var)) { \ - av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid " #ps_name \ - " id : %d.\n", id); \ - return AVERROR_INVALIDDATA; \ - } \ - err = ff_cbs_make_unit_refcounted(ctx, unit); \ - if (err < 0) \ - return err; \ - if (priv->ps_var[id] == priv->active_ ## ps_var) \ - priv->active_ ## ps_var = NULL ; \ - av_buffer_unref(&priv->ps_var ## _ref[id]); \ - av_assert0(unit->content_ref); \ - priv->ps_var ## _ref[id] = av_buffer_ref(unit->content_ref); \ - if (!priv->ps_var ## _ref[id]) \ - return AVERROR(ENOMEM); \ - priv->ps_var[id] = (H26 ## h26n ## Raw ## ps_name *)priv->ps_var ## _ref[id]->data; \ - return 0; \ -} +static int cbs_h2645_replace_ps(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + typedef struct { + int nal_unit_type; + int max_count; + const char *name; + size_t id_offset; + size_t ref_array_offset; + size_t ptr_array_offset; + size_t active_offset; + } PSType; + + static const PSType h264_ps_types[] = { + { + H264_NAL_SPS, + H264_MAX_SPS_COUNT, + "SPS", + offsetof(H264RawSPS, seq_parameter_set_id), + offsetof(CodedBitstreamH264Context, sps_ref), + offsetof(CodedBitstreamH264Context, sps), + offsetof(CodedBitstreamH264Context, active_sps), + }, + { + H264_NAL_PPS, + H264_MAX_PPS_COUNT, + "PPS", + offsetof(H264RawPPS, pic_parameter_set_id), + offsetof(CodedBitstreamH264Context, pps_ref), + offsetof(CodedBitstreamH264Context, pps), + offsetof(CodedBitstreamH264Context, active_pps), + }, + }; + + static const PSType h265_ps_types[] = { + { + HEVC_NAL_VPS, + HEVC_MAX_VPS_COUNT, + "VPS", + offsetof(H265RawVPS, vps_video_parameter_set_id), + offsetof(CodedBitstreamH265Context, vps_ref), + offsetof(CodedBitstreamH265Context, vps), + offsetof(CodedBitstreamH265Context, active_vps), + }, + { + HEVC_NAL_SPS, + HEVC_MAX_SPS_COUNT, + "SPS", + offsetof(H265RawSPS, sps_seq_parameter_set_id), + offsetof(CodedBitstreamH265Context, sps_ref), + offsetof(CodedBitstreamH265Context, sps), + offsetof(CodedBitstreamH265Context, active_sps), + }, + { + HEVC_NAL_PPS, + HEVC_MAX_PPS_COUNT, + "PPS", + offsetof(H265RawPPS, pps_pic_parameter_set_id), + offsetof(CodedBitstreamH265Context, pps_ref), + offsetof(CodedBitstreamH265Context, pps), + offsetof(CodedBitstreamH265Context, active_pps), + }, + }; -cbs_h2645_replace_ps(4, SPS, sps, seq_parameter_set_id) -cbs_h2645_replace_ps(4, PPS, pps, pic_parameter_set_id) -cbs_h2645_replace_ps(5, VPS, vps, vps_video_parameter_set_id) -cbs_h2645_replace_ps(5, SPS, sps, sps_seq_parameter_set_id) -cbs_h2645_replace_ps(5, PPS, pps, pps_pic_parameter_set_id) + const PSType *ps_type; + AVBufferRef **ref_array; + void **ptr_array; + void **active; + int err, id, i, nb_ps_types; + + switch (ctx->codec->codec_id) { + case AV_CODEC_ID_H264: + ps_type = h264_ps_types; + nb_ps_types = FF_ARRAY_ELEMS(h264_ps_types); + break; + case AV_CODEC_ID_H265: + ps_type = h265_ps_types; + nb_ps_types = FF_ARRAY_ELEMS(h265_ps_types); + break; + default: + av_assert0(0); + } + + for (i = 0; i < nb_ps_types; i++) { + if (ps_type->nal_unit_type == unit->type) + break; + ++ps_type; + } + av_assert0(i < nb_ps_types); + + id = *((uint8_t*)unit->content + ps_type->id_offset); + + if (id >= ps_type->max_count) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid %s id: %d.\n", + ps_type->name, id); + return AVERROR_INVALIDDATA; + } + + err = ff_cbs_make_unit_refcounted(ctx, unit); + if (err < 0) + return err; + + ref_array = + (AVBufferRef**)((uint8_t*)ctx->priv_data + ps_type->ref_array_offset); + ptr_array = (void**)((uint8_t*)ctx->priv_data + ps_type->ptr_array_offset); + active = (void**)((uint8_t*)ctx->priv_data + ps_type->active_offset); + + if (ptr_array[id] == *active) { + // The old active parameter set is being overwritten, so it can't + // be active after this point. + *active = NULL; + } + av_buffer_unref(&ref_array[id]); + + ref_array[id] = av_buffer_ref(unit->content_ref); + if (!ref_array[id]) + return AVERROR(ENOMEM); + ptr_array[id] = ref_array[id]->data; + + return 0; +} static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit) @@ -717,7 +806,7 @@ static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h264_replace_sps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -739,7 +828,7 @@ static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h264_replace_pps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -836,7 +925,7 @@ static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h265_replace_vps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -849,7 +938,7 @@ static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h265_replace_sps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -863,7 +952,7 @@ static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h265_replace_pps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -1007,7 +1096,7 @@ static int cbs_h264_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h264_replace_sps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -1031,7 +1120,7 @@ static int cbs_h264_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h264_replace_pps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -1124,7 +1213,7 @@ static int cbs_h265_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h265_replace_vps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -1138,7 +1227,7 @@ static int cbs_h265_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h265_replace_sps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; } @@ -1152,7 +1241,7 @@ static int cbs_h265_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h265_replace_pps(ctx, unit); + err = cbs_h2645_replace_ps(ctx, unit); if (err < 0) return err; }