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 5A61B43F6B for ; Wed, 19 Oct 2022 23:07:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 933AC68BD94; Thu, 20 Oct 2022 02:07:23 +0300 (EEST) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DC8F68BCAA for ; Thu, 20 Oct 2022 02:07:17 +0300 (EEST) Received: by mail-ot1-f53.google.com with SMTP id v40-20020a056830092800b00661e37421c2so8214449ott.3 for ; Wed, 19 Oct 2022 16:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=V3xqO/14sZuuJU4g9EOMhRedqImxz7YD4UTIXS3KIr8=; b=jiC5THWQqaqdwm+goPW/IXOD+9QLvPC2fvRMYyfUE7Ih2x6C8VAol14rCELSBodIBU lHZi4zu3SeUV59/nR52v6qP5z7vik6ey43yE4+Dlo75FbDYMjcHlTOidgG0kK2MlGGht FfbPEHIJtWNOIy54Bbc0VJz1QyvgFoPtdOo6Ou8w739Z2uTWo4x2ItJUHOkQK1mS5Ze7 p8sZKQIcz52neZqv0gQGnPSpQ6QwwzC+T2eQlMxtOD0iZ5yW7IHTmKxLodNWvuHuonIB aasIbsjsClBDgukQV/K6nInDvQcQpXvYmf5hvscp+L5vJaZAMxwEkrslXIQtOLEKu365 midg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=V3xqO/14sZuuJU4g9EOMhRedqImxz7YD4UTIXS3KIr8=; b=8L3Jl0T5b10MIkyCRspXalLDvJIWfZhg+oA0sjxoyUty5ZfEsjonV23C7hiEfid+Df 9oreA60eG+3MDB/gNftdZHvD1TL0YKKF3O+rhhNONYhkw9ggVB6KP0mNa8u7cOtWAkBW UH6JRUuiDTlO7hsFcZXSPMbrw/6bNIT6vr0cDZ3JUVohCZoRO0Uwwtt1vFtSr+SdiIcX 2kZbRHfCjqxyTAD/oWXMREqXso1H8CNl1z8IKTUmx5t2LzSPRoHNxFxo5QWWQw7IGbB2 zIbG0kLfddRf/cKvdBKH4ZeXjUxvu3lU+/8gP72CRhqGLUaYgQ/PtjfHFkGOOwjX9VaQ Vv3A== X-Gm-Message-State: ACrzQf08cRo67qDrzn+VJBYtgViIzesCvZ1xE9RT0ne+UPrpvgw1mJrp MjCTUEndDv7oUgXJXhZgGMrTVsBe478= X-Google-Smtp-Source: AMsMyM5EW3t3Xvj2tJ+4bKm81n/Cv/eN+8MJrJ2VvUMLz6CBzRYVe9igafe+//KzX3zWm1p0BewZnA== X-Received: by 2002:a05:6830:22d1:b0:661:939f:7947 with SMTP id q17-20020a05683022d100b00661939f7947mr5381169otc.86.1666220835512; Wed, 19 Oct 2022 16:07:15 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id u3-20020a056870d58300b0011f00b027bdsm8260895oao.45.2022.10.19.16.07.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Oct 2022 16:07:15 -0700 (PDT) Message-ID: Date: Wed, 19 Oct 2022 20:07:13 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.3.3 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221019072508.23460-1-thomas.ff@spin-digital.com> <20221019072508.23460-4-thomas.ff@spin-digital.com> From: James Almer In-Reply-To: <20221019072508.23460-4-thomas.ff@spin-digital.com> Subject: Re: [FFmpeg-devel] [PATCH v1 03/11] avcodec: enable cbs for H266/VVC 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 10/19/2022 4:25 AM, thomas.ff@spin-digital.com wrote: > From: Thomas Siedel > > Add ff_cbs_type_h266 to cbs types tables and AV_CODEC_ID_H266 to cbs codec ids. > Change CBS_MAX_UNIT_TYPES to 8 as VVC implements 8 different slice types > > Signed-off-by: Thomas Siedel > --- > libavcodec/Makefile | 1 + > libavcodec/cbs.c | 6 ++++++ > libavcodec/cbs_internal.h | 3 ++- > 3 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index c7dc5da0f9..b3fcf173e9 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -76,6 +76,7 @@ OBJS-$(CONFIG_CBS) += cbs.o cbs_bsf.o > OBJS-$(CONFIG_CBS_AV1) += cbs_av1.o > OBJS-$(CONFIG_CBS_H264) += cbs_h2645.o cbs_sei.o h2645_parse.o > OBJS-$(CONFIG_CBS_H265) += cbs_h2645.o cbs_sei.o h2645_parse.o > +OBJS-$(CONFIG_CBS_H266) += cbs_h2645.o cbs_sei.o h2645_parse.o CONFIG_CBS_H266 is undefined. You need to add cbs_h266 to configure here instead of in patch 4/11, even if no module selects it just yet. Also, this patch should be squashed with patch 2/11. > OBJS-$(CONFIG_CBS_JPEG) += cbs_jpeg.o > OBJS-$(CONFIG_CBS_MPEG2) += cbs_mpeg2.o > OBJS-$(CONFIG_CBS_VP9) += cbs_vp9.o > diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c > index 8d6e3c3442..f01726aa37 100644 > --- a/libavcodec/cbs.c > +++ b/libavcodec/cbs.c > @@ -40,6 +40,9 @@ static const CodedBitstreamType *const cbs_type_table[] = { > #if CONFIG_CBS_H265 > &ff_cbs_type_h265, > #endif > +#if CONFIG_CBS_H266 > + &ff_cbs_type_h266, > +#endif > #if CONFIG_CBS_JPEG > &ff_cbs_type_jpeg, > #endif > @@ -61,6 +64,9 @@ const enum AVCodecID ff_cbs_all_codec_ids[] = { > #if CONFIG_CBS_H265 > AV_CODEC_ID_H265, > #endif > +#if CONFIG_CBS_H266 > + AV_CODEC_ID_H266, > +#endif > #if CONFIG_CBS_JPEG > AV_CODEC_ID_MJPEG, > #endif > diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h > index 5ccba3c901..b741030da4 100644 > --- a/libavcodec/cbs_internal.h > +++ b/libavcodec/cbs_internal.h > @@ -45,7 +45,7 @@ enum CBSContentType { > enum { > // Maximum number of unit types described by the same unit type > // descriptor. > - CBS_MAX_UNIT_TYPES = 3, > + CBS_MAX_UNIT_TYPES = 8, > // Maximum number of reference buffer offsets in any one unit. > CBS_MAX_REF_OFFSETS = 2, > // Special value used in a unit type descriptor to indicate that it > @@ -242,6 +242,7 @@ int ff_cbs_write_signed(CodedBitstreamContext *ctx, PutBitContext *pbc, > extern const CodedBitstreamType ff_cbs_type_av1; > extern const CodedBitstreamType ff_cbs_type_h264; > extern const CodedBitstreamType ff_cbs_type_h265; > +extern const CodedBitstreamType ff_cbs_type_h266; > extern const CodedBitstreamType ff_cbs_type_jpeg; > extern const CodedBitstreamType ff_cbs_type_mpeg2; > extern const CodedBitstreamType ff_cbs_type_vp9; _______________________________________________ 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".