History

hevc_ps: expose log2_diff_max_min_transform_block_size

Lynne committed 3 years ago

Commit abdd87d1 parent 6eaca2a2 files · +11 −10Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files
  1. libavcodec/hevc_ps.c +10 −10
  2. libavcodec/hevc_ps.h +1 −0
libavcodec/hevc_ps.c+10−10
@@ -856,9 +856,8 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, · 855 unmodified lines
856856 {
857857 HEVCWindow *ow;
858858 int ret = 0;
859− int log2_diff_max_min_transform_block_size;
860859 int bit_depth_chroma, start, vui_present, sublayer_ordering_info, num_comps;
861− int i;
860+ int i, j;
862861
863862 // Coded parameters
864863
@@ -993,12 +992,12 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, · 128 unmodified lines
993992 }
994993 }
995994
996− sps->log2_min_cb_size = get_ue_golomb_long(gb) + 3;
997− sps->log2_diff_max_min_coding_block_size = get_ue_golomb_long(gb);
998− sps->log2_min_tb_size = get_ue_golomb_long(gb) + 2;
999− log2_diff_max_min_transform_block_size = get_ue_golomb_long(gb);
1000− sps->log2_max_trafo_size = log2_diff_max_min_transform_block_size +
1001− sps->log2_min_tb_size;
995+ sps->log2_min_cb_size = get_ue_golomb_long(gb) + 3;
996+ sps->log2_diff_max_min_coding_block_size = get_ue_golomb_long(gb);
997+ sps->log2_min_tb_size = get_ue_golomb_long(gb) + 2;
998+ sps->log2_diff_max_min_transform_block_size = get_ue_golomb_long(gb);
999+ sps->log2_max_trafo_size = sps->log2_diff_max_min_transform_block_size +
1000+ sps->log2_min_tb_size;
10021001
10031002 if (sps->log2_min_cb_size < 3 || sps->log2_min_cb_size > 30) {
10041003 av_log(avctx, AV_LOG_ERROR, "Invalid value %d for log2_min_cb_size", sps->log2_min_cb_size);
@@ -1015,8 +1014,9 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, · 10 unmodified lines
10151014 return AVERROR_INVALIDDATA;
10161015 }
10171016
1018− if (log2_diff_max_min_transform_block_size < 0 || log2_diff_max_min_transform_block_size > 30) {
1019− av_log(avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_transform_block_size", log2_diff_max_min_transform_block_size);
1017+ if (sps->log2_diff_max_min_transform_block_size > 30) {
1018+ av_log(avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_transform_block_size",
1019+ sps->log2_diff_max_min_transform_block_size);
10201020 return AVERROR_INVALIDDATA;
10211021 }
10221022
libavcodec/hevc_ps.h+1−0
@@ -237,6 +237,7 @@ typedef struct HEVCSPS { · 236 unmodified lines
237237 unsigned int log2_max_trafo_size;
238238 unsigned int log2_ctb_size;
239239 unsigned int log2_min_pu_size;
240+ unsigned int log2_diff_max_min_transform_block_size;
240241
241242 int max_transform_hierarchy_depth_inter;
242243 int max_transform_hierarchy_depth_intra;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t