History

avcodec/cbs_h265: reindent after the previous commit

James Almer committed 2 years ago

Commit 25138fa1 parent 41211ed1 file · +62 −62Browse files

Unified · Split

libavcodec/cbs_h265_syntax_template.c+62−62
@@ -806,7 +806,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 805 unmodified lines
806 }806 }
807 807
808 if (current->nal_unit_header.nuh_layer_id == 0)808 if (current->nal_unit_header.nuh_layer_id == 0)
809 u(3, sps_max_sub_layers_minus1, 0, vps->vps_max_sub_layers_minus1);809 u(3, sps_max_sub_layers_minus1, 0, vps->vps_max_sub_layers_minus1);
810 else {810 else {
811 u(3, sps_ext_or_max_sub_layers_minus1, 0, HEVC_MAX_SUB_LAYERS);811 u(3, sps_ext_or_max_sub_layers_minus1, 0, HEVC_MAX_SUB_LAYERS);
812 infer(sps_max_sub_layers_minus1, current->sps_ext_or_max_sub_layers_minus1 == HEVC_MAX_SUB_LAYERS812 infer(sps_max_sub_layers_minus1, current->sps_ext_or_max_sub_layers_minus1 == HEVC_MAX_SUB_LAYERS
@@ -816,25 +816,25 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 3 unmodified lines
816 multi_layer_ext_sps_flag = current->nal_unit_header.nuh_layer_id &&816 multi_layer_ext_sps_flag = current->nal_unit_header.nuh_layer_id &&
817 current->sps_ext_or_max_sub_layers_minus1 == HEVC_MAX_SUB_LAYERS;817 current->sps_ext_or_max_sub_layers_minus1 == HEVC_MAX_SUB_LAYERS;
818 if (!multi_layer_ext_sps_flag) {818 if (!multi_layer_ext_sps_flag) {
819 flag(sps_temporal_id_nesting_flag);819 flag(sps_temporal_id_nesting_flag);
820 820
821 if (vps->vps_temporal_id_nesting_flag &&821 if (vps->vps_temporal_id_nesting_flag &&
822 !current->sps_temporal_id_nesting_flag) {822 !current->sps_temporal_id_nesting_flag) {
823 av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid stream: "823 av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid stream: "
824 "sps_temporal_id_nesting_flag must be 1 if "824 "sps_temporal_id_nesting_flag must be 1 if "
825 "vps_temporal_id_nesting_flag is 1.\n");825 "vps_temporal_id_nesting_flag is 1.\n");
826 return AVERROR_INVALIDDATA;826 return AVERROR_INVALIDDATA;
827 }827 }
828 if (current->sps_max_sub_layers_minus1 == 0 &&828 if (current->sps_max_sub_layers_minus1 == 0 &&
829 current->sps_temporal_id_nesting_flag != 1) {829 current->sps_temporal_id_nesting_flag != 1) {
830 av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid stream: "830 av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid stream: "
831 "sps_temporal_id_nesting_flag must be 1 if "831 "sps_temporal_id_nesting_flag must be 1 if "
832 "sps_max_sub_layers_minus1 is 0.\n");832 "sps_max_sub_layers_minus1 is 0.\n");
833 return AVERROR_INVALIDDATA;833 return AVERROR_INVALIDDATA;
834 }834 }
835 835
836 CHECK(FUNC(profile_tier_level)(ctx, rw, &current->profile_tier_level,836 CHECK(FUNC(profile_tier_level)(ctx, rw, &current->profile_tier_level,
837 1, current->sps_max_sub_layers_minus1));837 1, current->sps_max_sub_layers_minus1));
838 } else {838 } else {
839 if (current->sps_max_sub_layers_minus1 > 0)839 if (current->sps_max_sub_layers_minus1 > 0)
840 infer(sps_temporal_id_nesting_flag, vps->vps_temporal_id_nesting_flag);840 infer(sps_temporal_id_nesting_flag, vps->vps_temporal_id_nesting_flag);
@@ -849,56 +849,56 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 8 unmodified lines
849 if (current->update_rep_format_flag)849 if (current->update_rep_format_flag)
850 ub(8, sps_rep_format_idx);850 ub(8, sps_rep_format_idx);
851 } else {851 } else {
852 ue(chroma_format_idc, 0, 3);852 ue(chroma_format_idc, 0, 3);
853 if (current->chroma_format_idc == 3)853 if (current->chroma_format_idc == 3)
854 flag(separate_colour_plane_flag);854 flag(separate_colour_plane_flag);
855 else855 else
856 infer(separate_colour_plane_flag, 0);856 infer(separate_colour_plane_flag, 0);
857 857
858 ue(pic_width_in_luma_samples, 1, HEVC_MAX_WIDTH);858 ue(pic_width_in_luma_samples, 1, HEVC_MAX_WIDTH);
859 ue(pic_height_in_luma_samples, 1, HEVC_MAX_HEIGHT);859 ue(pic_height_in_luma_samples, 1, HEVC_MAX_HEIGHT);
860 860
861 flag(conformance_window_flag);861 flag(conformance_window_flag);
862 if (current->conformance_window_flag) {862 if (current->conformance_window_flag) {
863 ue(conf_win_left_offset, 0, current->pic_width_in_luma_samples);863 ue(conf_win_left_offset, 0, current->pic_width_in_luma_samples);
864 ue(conf_win_right_offset, 0, current->pic_width_in_luma_samples);864 ue(conf_win_right_offset, 0, current->pic_width_in_luma_samples);
865 ue(conf_win_top_offset, 0, current->pic_height_in_luma_samples);865 ue(conf_win_top_offset, 0, current->pic_height_in_luma_samples);
866 ue(conf_win_bottom_offset, 0, current->pic_height_in_luma_samples);866 ue(conf_win_bottom_offset, 0, current->pic_height_in_luma_samples);
867 } else {867 } else {
868 infer(conf_win_left_offset, 0);868 infer(conf_win_left_offset, 0);
869 infer(conf_win_right_offset, 0);869 infer(conf_win_right_offset, 0);
870 infer(conf_win_top_offset, 0);870 infer(conf_win_top_offset, 0);
871 infer(conf_win_bottom_offset, 0);871 infer(conf_win_bottom_offset, 0);
872 }872 }
873 873
874 ue(bit_depth_luma_minus8, 0, 8);874 ue(bit_depth_luma_minus8, 0, 8);
875 ue(bit_depth_chroma_minus8, 0, 8);875 ue(bit_depth_chroma_minus8, 0, 8);
876 }876 }
877 877
878 ue(log2_max_pic_order_cnt_lsb_minus4, 0, 12);878 ue(log2_max_pic_order_cnt_lsb_minus4, 0, 12);
879 879
880 if (!multi_layer_ext_sps_flag) {880 if (!multi_layer_ext_sps_flag) {
881 flag(sps_sub_layer_ordering_info_present_flag);881 flag(sps_sub_layer_ordering_info_present_flag);
882 for (i = (current->sps_sub_layer_ordering_info_present_flag ?882 for (i = (current->sps_sub_layer_ordering_info_present_flag ?
883 0 : current->sps_max_sub_layers_minus1);883 0 : current->sps_max_sub_layers_minus1);
884 i <= current->sps_max_sub_layers_minus1; i++) {884 i <= current->sps_max_sub_layers_minus1; i++) {
885 ues(sps_max_dec_pic_buffering_minus1[i],885 ues(sps_max_dec_pic_buffering_minus1[i],
886 0, HEVC_MAX_DPB_SIZE - 1, 1, i);886 0, HEVC_MAX_DPB_SIZE - 1, 1, i);
887 ues(sps_max_num_reorder_pics[i],887 ues(sps_max_num_reorder_pics[i],
888 0, current->sps_max_dec_pic_buffering_minus1[i], 1, i);888 0, current->sps_max_dec_pic_buffering_minus1[i], 1, i);
889 ues(sps_max_latency_increase_plus1[i],889 ues(sps_max_latency_increase_plus1[i],
890 0, UINT32_MAX - 1, 1, i);890 0, UINT32_MAX - 1, 1, i);
891 }891 }
892 if (!current->sps_sub_layer_ordering_info_present_flag) {892 if (!current->sps_sub_layer_ordering_info_present_flag) {
893 for (i = 0; i < current->sps_max_sub_layers_minus1; i++) {893 for (i = 0; i < current->sps_max_sub_layers_minus1; i++) {
894 infer(sps_max_dec_pic_buffering_minus1[i],894 infer(sps_max_dec_pic_buffering_minus1[i],
895 current->sps_max_dec_pic_buffering_minus1[current->sps_max_sub_layers_minus1]);895 current->sps_max_dec_pic_buffering_minus1[current->sps_max_sub_layers_minus1]);
896 infer(sps_max_num_reorder_pics[i],896 infer(sps_max_num_reorder_pics[i],
897 current->sps_max_num_reorder_pics[current->sps_max_sub_layers_minus1]);897 current->sps_max_num_reorder_pics[current->sps_max_sub_layers_minus1]);
898 infer(sps_max_latency_increase_plus1[i],898 infer(sps_max_latency_increase_plus1[i],
899 current->sps_max_latency_increase_plus1[current->sps_max_sub_layers_minus1]);899 current->sps_max_latency_increase_plus1[current->sps_max_sub_layers_minus1]);
900 }
900 }901 }
901 }
902 }902 }
903 903
904 ue(log2_min_luma_coding_block_size_minus3, 0, 3);904 ue(log2_min_luma_coding_block_size_minus3, 0, 3);
@@ -937,9 +937,9 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 32 unmodified lines
937 if (current->sps_infer_scaling_list_flag)937 if (current->sps_infer_scaling_list_flag)
938 ub(6, sps_scaling_list_ref_layer_id);938 ub(6, sps_scaling_list_ref_layer_id);
939 else {939 else {
940 flag(sps_scaling_list_data_present_flag);940 flag(sps_scaling_list_data_present_flag);
941 if (current->sps_scaling_list_data_present_flag)941 if (current->sps_scaling_list_data_present_flag)
942 CHECK(FUNC(scaling_list_data)(ctx, rw, &current->scaling_list));942 CHECK(FUNC(scaling_list_data)(ctx, rw, &current->scaling_list));
943 }943 }
944 } else {944 } else {
945 infer(sps_scaling_list_data_present_flag, 0);945 infer(sps_scaling_list_data_present_flag, 0);

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