avcodec/h2645_parse: add support for H266/VVC
Co-authored-by: Thomas Siedel <thomas.ff@spin-digital.com> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
bcfcc19821
commit
0b8c1f26d3
@ -30,6 +30,7 @@
|
|||||||
#include "hevc.h"
|
#include "hevc.h"
|
||||||
#include "h264.h"
|
#include "h264.h"
|
||||||
#include "h2645_parse.h"
|
#include "h2645_parse.h"
|
||||||
|
#include "vvc.h"
|
||||||
|
|
||||||
int ff_h2645_extract_rbsp(const uint8_t *src, int length,
|
int ff_h2645_extract_rbsp(const uint8_t *src, int length,
|
||||||
H2645RBSP *rbsp, H2645NAL *nal, int small_padding)
|
H2645RBSP *rbsp, H2645NAL *nal, int small_padding)
|
||||||
@ -145,6 +146,47 @@ nsc:
|
|||||||
return si;
|
return si;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const char *const vvc_nal_type_name[32] = {
|
||||||
|
"TRAIL_NUT", // VVC_TRAIL_NUT
|
||||||
|
"STSA_NUT", // VVC_STSA_NUT
|
||||||
|
"RADL_NUT", // VVC_RADL_NUT
|
||||||
|
"RASL_NUT", // VVC_RASL_NUT
|
||||||
|
"RSV_VCL4", // VVC_RSV_VCL_4
|
||||||
|
"RSV_VCL5", // VVC_RSV_VCL_5
|
||||||
|
"RSV_VCL6", // VVC_RSV_VCL_6
|
||||||
|
"IDR_W_RADL", // VVC_IDR_W_RADL
|
||||||
|
"IDR_N_LP", // VVC_IDR_N_LP
|
||||||
|
"CRA_NUT", // VVC_CRA_NUT
|
||||||
|
"GDR_NUT", // VVC_GDR_NUT
|
||||||
|
"RSV_IRAP_11", // VVC_RSV_IRAP_11
|
||||||
|
"OPI_NUT", // VVC_OPI_NUT
|
||||||
|
"DCI_NUT", // VVC_DCI_NUT
|
||||||
|
"VPS_NUT", // VVC_VPS_NUT
|
||||||
|
"SPS_NUT", // VVC_SPS_NUT
|
||||||
|
"PPS_NUT", // VVC_PPS_NUT
|
||||||
|
"APS_PREFIX", // VVC_PREFIX_APS_NUT
|
||||||
|
"APS_SUFFIX", // VVC_SUFFIX_APS_NUT
|
||||||
|
"PH_NUT", // VVC_PH_NUT
|
||||||
|
"AUD_NUT", // VVC_AUD_NUT
|
||||||
|
"EOS_NUT", // VVC_EOS_NUT
|
||||||
|
"EOB_NUT", // VVC_EOB_NUT
|
||||||
|
"SEI_PREFIX", // VVC_PREFIX_SEI_NUT
|
||||||
|
"SEI_SUFFIX", // VVC_SUFFIX_SEI_NUT
|
||||||
|
"FD_NUT", // VVC_FD_NUT
|
||||||
|
"RSV_NVCL26", // VVC_RSV_NVCL_26
|
||||||
|
"RSV_NVCL27", // VVC_RSV_NVCL_27
|
||||||
|
"UNSPEC28", // VVC_UNSPEC_28
|
||||||
|
"UNSPEC29", // VVC_UNSPEC_29
|
||||||
|
"UNSPEC30", // VVC_UNSPEC_30
|
||||||
|
"UNSPEC31", // VVC_UNSPEC_31
|
||||||
|
};
|
||||||
|
|
||||||
|
static const char *vvc_nal_unit_name(int nal_type)
|
||||||
|
{
|
||||||
|
av_assert0(nal_type >= 0 && nal_type < 32);
|
||||||
|
return vvc_nal_type_name[nal_type];
|
||||||
|
}
|
||||||
|
|
||||||
static const char *const hevc_nal_type_name[64] = {
|
static const char *const hevc_nal_type_name[64] = {
|
||||||
"TRAIL_N", // HEVC_NAL_TRAIL_N
|
"TRAIL_N", // HEVC_NAL_TRAIL_N
|
||||||
"TRAIL_R", // HEVC_NAL_TRAIL_R
|
"TRAIL_R", // HEVC_NAL_TRAIL_R
|
||||||
@ -293,6 +335,31 @@ static int get_bit_length(H2645NAL *nal, int min_size, int skip_trailing_zeros)
|
|||||||
* @return AVERROR_INVALIDDATA if the packet is not a valid NAL unit,
|
* @return AVERROR_INVALIDDATA if the packet is not a valid NAL unit,
|
||||||
* 0 otherwise
|
* 0 otherwise
|
||||||
*/
|
*/
|
||||||
|
static int vvc_parse_nal_header(H2645NAL *nal, void *logctx)
|
||||||
|
{
|
||||||
|
GetBitContext *gb = &nal->gb;
|
||||||
|
|
||||||
|
if (get_bits1(gb) != 0) //forbidden_zero_bit
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
|
skip_bits1(gb); //nuh_reserved_zero_bit
|
||||||
|
|
||||||
|
nal->nuh_layer_id = get_bits(gb, 6);
|
||||||
|
nal->type = get_bits(gb, 5);
|
||||||
|
nal->temporal_id = get_bits(gb, 3) - 1;
|
||||||
|
if (nal->temporal_id < 0)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
|
if ((nal->type >= VVC_IDR_W_RADL && nal->type <= VVC_RSV_IRAP_11) && nal->temporal_id)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
|
av_log(logctx, AV_LOG_DEBUG,
|
||||||
|
"nal_unit_type: %d(%s), nuh_layer_id: %d, temporal_id: %d\n",
|
||||||
|
nal->type, vvc_nal_unit_name(nal->type), nal->nuh_layer_id, nal->temporal_id);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int hevc_parse_nal_header(H2645NAL *nal, void *logctx)
|
static int hevc_parse_nal_header(H2645NAL *nal, void *logctx)
|
||||||
{
|
{
|
||||||
GetBitContext *gb = &nal->gb;
|
GetBitContext *gb = &nal->gb;
|
||||||
@ -509,7 +576,9 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
|
|||||||
/* Reset type in case it contains a stale value from a previously parsed NAL */
|
/* Reset type in case it contains a stale value from a previously parsed NAL */
|
||||||
nal->type = 0;
|
nal->type = 0;
|
||||||
|
|
||||||
if (codec_id == AV_CODEC_ID_HEVC)
|
if (codec_id == AV_CODEC_ID_VVC)
|
||||||
|
ret = vvc_parse_nal_header(nal, logctx);
|
||||||
|
else if (codec_id == AV_CODEC_ID_HEVC)
|
||||||
ret = hevc_parse_nal_header(nal, logctx);
|
ret = hevc_parse_nal_header(nal, logctx);
|
||||||
else
|
else
|
||||||
ret = h264_parse_nal_header(nal, logctx);
|
ret = h264_parse_nal_header(nal, logctx);
|
||||||
|
142
libavcodec/vvc.h
Normal file
142
libavcodec/vvc.h
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
/*
|
||||||
|
* H.266 / VVC shared code
|
||||||
|
*
|
||||||
|
* This file is part of FFmpeg.
|
||||||
|
*
|
||||||
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef AVCODEC_VVC_H
|
||||||
|
#define AVCODEC_VVC_H
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Table 5 – NAL unit type codes and NAL unit type classes
|
||||||
|
* in T-REC-H.266-202008
|
||||||
|
*/
|
||||||
|
enum VVCNALUnitType {
|
||||||
|
VVC_TRAIL_NUT = 0,
|
||||||
|
VVC_STSA_NUT = 1,
|
||||||
|
VVC_RADL_NUT = 2,
|
||||||
|
VVC_RASL_NUT = 3,
|
||||||
|
VVC_RSV_VCL_4 = 4,
|
||||||
|
VVC_RSV_VCL_5 = 5,
|
||||||
|
VVC_RSV_VCL_6 = 6,
|
||||||
|
VVC_IDR_W_RADL = 7,
|
||||||
|
VVC_IDR_N_LP = 8,
|
||||||
|
VVC_CRA_NUT = 9,
|
||||||
|
VVC_GDR_NUT = 10,
|
||||||
|
VVC_RSV_IRAP_11 = 11,
|
||||||
|
VVC_OPI_NUT = 12,
|
||||||
|
VVC_DCI_NUT = 13,
|
||||||
|
VVC_VPS_NUT = 14,
|
||||||
|
VVC_SPS_NUT = 15,
|
||||||
|
VVC_PPS_NUT = 16,
|
||||||
|
VVC_PREFIX_APS_NUT = 17,
|
||||||
|
VVC_SUFFIX_APS_NUT = 18,
|
||||||
|
VVC_PH_NUT = 19,
|
||||||
|
VVC_AUD_NUT = 20,
|
||||||
|
VVC_EOS_NUT = 21,
|
||||||
|
VVC_EOB_NUT = 22,
|
||||||
|
VVC_PREFIX_SEI_NUT = 23,
|
||||||
|
VVC_SUFFIX_SEI_NUT = 24,
|
||||||
|
VVC_FD_NUT = 25,
|
||||||
|
VVC_RSV_NVCL_26 = 26,
|
||||||
|
VVC_RSV_NVCL_27 = 27,
|
||||||
|
VVC_UNSPEC_28 = 28,
|
||||||
|
VVC_UNSPEC_29 = 29,
|
||||||
|
VVC_UNSPEC_30 = 30,
|
||||||
|
VVC_UNSPEC_31 = 31,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum VVCSliceType {
|
||||||
|
VVC_SLICE_TYPE_B = 0,
|
||||||
|
VVC_SLICE_TYPE_P = 1,
|
||||||
|
VVC_SLICE_TYPE_I = 2,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
//6.2 we can have 3 sample arrays
|
||||||
|
VVC_MAX_SAMPLE_ARRAYS = 3,
|
||||||
|
|
||||||
|
//7.4.3.3 vps_max_layers_minus1 is u(6)
|
||||||
|
VVC_MAX_LAYERS = 64,
|
||||||
|
|
||||||
|
//7.4.3.3 The value of vps_max_sublayers_minus1 shall be in the range of 0 to 6, inclusive
|
||||||
|
VVC_MAX_SUBLAYERS = 7,
|
||||||
|
|
||||||
|
//7.4.3.3 vps_num_ptls_minus1 is u(8)
|
||||||
|
VVC_MAX_PTLS = 256,
|
||||||
|
|
||||||
|
//7.4.3.3 vps_num_output_layer_sets_minus2 is u(8)
|
||||||
|
VVC_MAX_TOTAL_NUM_OLSS = 257,
|
||||||
|
|
||||||
|
// 7.3.2.3: vps_video_parameter_set_id is u(4).
|
||||||
|
VVC_MAX_VPS_COUNT = 16,
|
||||||
|
// 7.3.2.4: sps_seq_parameter_set_id is u(4)
|
||||||
|
VVC_MAX_SPS_COUNT = 16,
|
||||||
|
// 7.3.2.5: pps_pic_parameter_set_id is u(6)
|
||||||
|
VVC_MAX_PPS_COUNT = 64,
|
||||||
|
|
||||||
|
// 7.4.4.1: ptl_num_sub_profiles is u(8)
|
||||||
|
VVC_MAX_SUB_PROFILES = 256,
|
||||||
|
|
||||||
|
// A.4.2: according to (1577), MaxDpbSize is bounded above by 2 * maxDpbPicBuf(8)
|
||||||
|
VVC_MAX_DPB_SIZE = 16,
|
||||||
|
|
||||||
|
//7.4.3.4 sps_num_ref_pic_lists in range [0, 64]
|
||||||
|
VVC_MAX_REF_PIC_LISTS = 64,
|
||||||
|
|
||||||
|
//7.4.11 num_ref_entries in range [0, MaxDpbSize + 13]
|
||||||
|
VVC_MAX_REF_ENTRIES = VVC_MAX_DPB_SIZE + 13,
|
||||||
|
|
||||||
|
//7.4.3.3 sps_num_points_in_qp_table_minus1[i] in range [0, 36 − sps_qp_table_start_minus26[i]],
|
||||||
|
//sps_qp_table_start_minus26[i] in range [sps_qp_table_start_minus26[i] −26 − QpBdOffset, 36]
|
||||||
|
//for 10 bitsQpBdOffset is 12, so sps_num_points_in_qp_table_minus1[i] in range [0, 74]
|
||||||
|
VVC_MAX_POINTS_IN_QP_TABLE = 75,
|
||||||
|
|
||||||
|
// 7.4.6.1: hrd_cpb_cnt_minus1 is in [0, 31].
|
||||||
|
VVC_MAX_CPB_CNT = 32,
|
||||||
|
|
||||||
|
// A.4.1: the highest level allows a MaxLumaPs of 35 651 584.
|
||||||
|
VVC_MAX_LUMA_PS = 35651584,
|
||||||
|
|
||||||
|
// A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are
|
||||||
|
// constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/
|
||||||
|
// width are bounded above by sqrt(8 * 35651584) = 16888.2 samples.
|
||||||
|
VVC_MAX_WIDTH = 16888,
|
||||||
|
VVC_MAX_HEIGHT = 16888,
|
||||||
|
|
||||||
|
// A.4.1: table A.1 allows at most 440 tiles per au for any level.
|
||||||
|
VVC_MAX_TILES_PER_AU = 440,
|
||||||
|
// A.4.1: table A.1 did not define max tile rows.
|
||||||
|
// in worest a case, we can have 1x440 tiles picture.
|
||||||
|
VVC_MAX_TILE_ROWS = VVC_MAX_TILES_PER_AU,
|
||||||
|
// A.4.1: table A.1 allows at most 20 tile columns for any level.
|
||||||
|
VVC_MAX_TILE_COLUMNS = 20,
|
||||||
|
|
||||||
|
// A.4.1 table A.1 allows at most 600 slice for any level.
|
||||||
|
VVC_MAX_SLICES = 600,
|
||||||
|
|
||||||
|
// 7.4.8: in the worst case (!pps_no_pic_partition_flag and
|
||||||
|
// sps_entropy_coding_sync_enabled_flag are both true), entry points can be
|
||||||
|
// placed at the beginning of every Ctb row in every tile, giving an
|
||||||
|
// upper bound of (num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1.
|
||||||
|
// Only a stream with very high resolution and perverse parameters could
|
||||||
|
// get near that, though, so set a lower limit here with the maximum
|
||||||
|
// possible value for 8K video (at most 135 32x32 Ctb rows).
|
||||||
|
VVC_MAX_ENTRY_POINTS = VVC_MAX_TILE_COLUMNS * 135,
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* AVCODEC_VVC_H */
|
Loading…
x
Reference in New Issue
Block a user