virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

h264_ps: expose scaling_matrix_present_mask

Browse Source 
Vulkan requires it.
It technically also requires use_default_scaling_matrix_mask,
but we can just be explicit and give it the matrix we fill in as-non
default.
This commit is contained in:
Lynne
2022-12-15 17:05:35 +01:00
parent d13b1c42f6
commit 20de09a6de
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/h264_ps.c
View File

@@ -198,12 +198,14 @@ static inline int decode_vui_parameters(GetBitContext *gb, void *logctx,
} }
static int decode_scaling_list(GetBitContext *gb, uint8_t *factors, int size, static int decode_scaling_list(GetBitContext *gb, uint8_t *factors, int size,
const uint8_t *jvt_list, const uint8_t *jvt_list, const uint8_t *fallback_list,
const uint8_t *fallback_list) uint16_t *mask, int pos)
{ {
int i, last = 8, next = 8; int i, last = 8, next = 8;
const uint8_t *scan = size == 16 ? ff_zigzag_scan : ff_zigzag_direct; const uint8_t *scan = size == 16 ? ff_zigzag_scan : ff_zigzag_direct;
if (!get_bits1(gb)) /* matrix not written, we use the predicted one */ uint16_t seq_scaling_list_present_flag = get_bits1(gb);
*mask |= (seq_scaling_list_present_flag << pos);
if (!seq_scaling_list_present_flag) /* matrix not written, we use the predicted one */
memcpy(factors, fallback_list, size * sizeof(uint8_t)); memcpy(factors, fallback_list, size * sizeof(uint8_t));
else else
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
@@ -227,7 +229,7 @@ static int decode_scaling_list(GetBitContext *gb, uint8_t *factors, int size,
/* returns non zero if the provided SPS scaling matrix has been filled */ /* returns non zero if the provided SPS scaling matrix has been filled */
static int decode_scaling_matrices(GetBitContext *gb, const SPS *sps, static int decode_scaling_matrices(GetBitContext *gb, const SPS *sps,
const PPS *pps, int is_sps, const PPS *pps, int is_sps,
int present_flag, int present_flag, uint16_t *mask,
uint8_t(*scaling_matrix4)[16], uint8_t(*scaling_matrix4)[16],
uint8_t(*scaling_matrix8)[64]) uint8_t(*scaling_matrix8)[64])
{ {
@@ -239,21 +241,22 @@ static int decode_scaling_matrices(GetBitContext *gb, const SPS *sps,
fallback_sps ? sps->scaling_matrix8[3] : default_scaling8[1] fallback_sps ? sps->scaling_matrix8[3] : default_scaling8[1]
}; };
int ret = 0; int ret = 0;
*mask = 0x0;
if (present_flag) { if (present_flag) {
ret |= decode_scaling_list(gb, scaling_matrix4[0], 16, default_scaling4[0], fallback[0]); // Intra, Y ret |= decode_scaling_list(gb, scaling_matrix4[0], 16, default_scaling4[0], fallback[0], mask, 0); // Intra, Y
ret |= decode_scaling_list(gb, scaling_matrix4[1], 16, default_scaling4[0], scaling_matrix4[0]); // Intra, Cr ret |= decode_scaling_list(gb, scaling_matrix4[1], 16, default_scaling4[0], scaling_matrix4[0], mask, 1); // Intra, Cr
ret |= decode_scaling_list(gb, scaling_matrix4[2], 16, default_scaling4[0], scaling_matrix4[1]); // Intra, Cb ret |= decode_scaling_list(gb, scaling_matrix4[2], 16, default_scaling4[0], scaling_matrix4[1], mask, 2); // Intra, Cb
ret |= decode_scaling_list(gb, scaling_matrix4[3], 16, default_scaling4[1], fallback[1]); // Inter, Y ret |= decode_scaling_list(gb, scaling_matrix4[3], 16, default_scaling4[1], fallback[1], mask, 3); // Inter, Y
ret |= decode_scaling_list(gb, scaling_matrix4[4], 16, default_scaling4[1], scaling_matrix4[3]); // Inter, Cr ret |= decode_scaling_list(gb, scaling_matrix4[4], 16, default_scaling4[1], scaling_matrix4[3], mask, 4); // Inter, Cr
ret |= decode_scaling_list(gb, scaling_matrix4[5], 16, default_scaling4[1], scaling_matrix4[4]); // Inter, Cb ret |= decode_scaling_list(gb, scaling_matrix4[5], 16, default_scaling4[1], scaling_matrix4[4], mask, 5); // Inter, Cb
if (is_sps || pps->transform_8x8_mode) { if (is_sps || pps->transform_8x8_mode) {
ret |= decode_scaling_list(gb, scaling_matrix8[0], 64, default_scaling8[0], fallback[2]); // Intra, Y ret |= decode_scaling_list(gb, scaling_matrix8[0], 64, default_scaling8[0], fallback[2], mask, 6); // Intra, Y
ret |= decode_scaling_list(gb, scaling_matrix8[3], 64, default_scaling8[1], fallback[3]); // Inter, Y ret |= decode_scaling_list(gb, scaling_matrix8[3], 64, default_scaling8[1], fallback[3], mask, 7); // Inter, Y
if (sps->chroma_format_idc == 3) { if (sps->chroma_format_idc == 3) {
ret |= decode_scaling_list(gb, scaling_matrix8[1], 64, default_scaling8[0], scaling_matrix8[0]); // Intra, Cr ret |= decode_scaling_list(gb, scaling_matrix8[1], 64, default_scaling8[0], scaling_matrix8[0], mask, 8); // Intra, Cr
ret |= decode_scaling_list(gb, scaling_matrix8[4], 64, default_scaling8[1], scaling_matrix8[3]); // Inter, Cr ret |= decode_scaling_list(gb, scaling_matrix8[4], 64, default_scaling8[1], scaling_matrix8[3], mask, 9); // Inter, Cr
ret |= decode_scaling_list(gb, scaling_matrix8[2], 64, default_scaling8[0], scaling_matrix8[1]); // Intra, Cb ret |= decode_scaling_list(gb, scaling_matrix8[2], 64, default_scaling8[0], scaling_matrix8[1], mask, 10); // Intra, Cb
ret |= decode_scaling_list(gb, scaling_matrix8[5], 64, default_scaling8[1], scaling_matrix8[4]); // Inter, Cb ret |= decode_scaling_list(gb, scaling_matrix8[5], 64, default_scaling8[1], scaling_matrix8[4], mask, 11); // Inter, Cb
} }
} }
if (!ret) if (!ret)
@@ -371,6 +374,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
} }
sps->transform_bypass = get_bits1(gb); sps->transform_bypass = get_bits1(gb);
ret = decode_scaling_matrices(gb, sps, NULL, 1, get_bits1(gb), ret = decode_scaling_matrices(gb, sps, NULL, 1, get_bits1(gb),
&sps->scaling_matrix_present_mask,
sps->scaling_matrix4, sps->scaling_matrix8); sps->scaling_matrix4, sps->scaling_matrix8);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@@ -808,6 +812,7 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct
pps->pic_scaling_matrix_present_flag = get_bits1(gb); pps->pic_scaling_matrix_present_flag = get_bits1(gb);
ret = decode_scaling_matrices(gb, sps, pps, 0, ret = decode_scaling_matrices(gb, sps, pps, 0,
pps->pic_scaling_matrix_present_flag, pps->pic_scaling_matrix_present_flag,
&pps->pic_scaling_matrix_present_mask,
pps->scaling_matrix4, pps->scaling_matrix8); pps->scaling_matrix4, pps->scaling_matrix8);
if (ret < 0) if (ret < 0)
goto fail; goto fail;

2
libavcodec/h264_ps.h
View File

@@ -82,6 +82,7 @@ typedef struct SPS {
int num_reorder_frames; int num_reorder_frames;
int max_dec_frame_buffering; int max_dec_frame_buffering;
int scaling_matrix_present; int scaling_matrix_present;
uint16_t scaling_matrix_present_mask;
uint8_t scaling_matrix4[6][16]; uint8_t scaling_matrix4[6][16];
uint8_t scaling_matrix8[6][64]; uint8_t scaling_matrix8[6][64];
int nal_hrd_parameters_present_flag; int nal_hrd_parameters_present_flag;
@@ -125,6 +126,7 @@ typedef struct PPS {
int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag
int transform_8x8_mode; ///< transform_8x8_mode_flag int transform_8x8_mode; ///< transform_8x8_mode_flag
int pic_scaling_matrix_present_flag; int pic_scaling_matrix_present_flag;
uint16_t pic_scaling_matrix_present_mask;
uint8_t scaling_matrix4[6][16]; uint8_t scaling_matrix4[6][16];
uint8_t scaling_matrix8[6][64]; uint8_t scaling_matrix8[6][64];
uint8_t chroma_qp_table[2][QP_MAX_NUM+1]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table uint8_t chroma_qp_table[2][QP_MAX_NUM+1]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table