From f82c68f66f275ea760972e3717ae3fdcfb86cda1 Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Wed, 12 Oct 2011 22:28:34 +0300 Subject: [PATCH] Fix XML printing of descriptors 0x2a, 0x2b and 0x2c. --- examples/dvb_print_si.output.txt | 2 +- examples/dvb_print_si.output.xml | 6 +++--- mpeg/psi/desc_2a.h | 4 ++-- mpeg/psi/desc_2b.h | 2 +- mpeg/psi/desc_2c.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index d43d4fd..c1a6262 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -263,7 +263,7 @@ new PMT program=20000 version=1 pcrpid=110 - desc 2c flexmux_timing fcr_es_id=0x1234 fcr_resolution=123456789 fcr_length=55 fmx_rate_length=66 * ES pid=126 streamtype=0x1b streamtype_txt="H.264/14496-10 video (MPEG-4/AVC)" - desc 28 avc_video profile_idc=0x12 constraint_set0_flag=1 constraint_set1_flag=1 constraint_set2_flag=0 AVC_compatible_flags=0x0a level_idc=0x34 AVC_still_present=0 AVC_24_hour_picture_flag=0 - - desc 2a avc_timing_and_hrd hrd_management_valid_flag=0 picture_and_timing_info_present=1 90khz_flag=0 N=12345678 K=34567890 num_units_in_tick=456789 fixed_frame_rate_flag=1 temporal_poc_flag=0 picture_to_display_conversion_flag=1 + - desc 2a avc_timing_and_hrd hrd_management_valid_flag=0 picture_and_timing_info_present=1 flag_90khz=0 N=12345678 K=34567890 num_units_in_tick=456789 fixed_frame_rate_flag=1 temporal_poc_flag=0 picture_to_display_conversion_flag=1 * ES pid=127 streamtype=0x0f streamtype_txt="13818-7 Audio with ADTS transport syntax" - desc 42 stuffing length=4 - desc 2b mpeg2_aac_audio profile=0x12 channel_config=0x05 additional_info=0x00 diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index 2dd2e2e..b1eaf8f 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -465,7 +465,7 @@ - @@ -473,7 +473,7 @@ - + @@ -481,7 +481,7 @@ - diff --git a/mpeg/psi/desc_2a.h b/mpeg/psi/desc_2a.h index 0ce1c4f..9664dff 100644 --- a/mpeg/psi/desc_2a.h +++ b/mpeg/psi/desc_2a.h @@ -231,7 +231,7 @@ static inline void desc2a_print(const uint8_t *p_desc, f_print pf_print, case PRINT_XML: pf_print(opaque,"", desc2a_get_hrd_management_valid_flag(p_desc), @@ -248,7 +248,7 @@ static inline void desc2a_print(const uint8_t *p_desc, f_print pf_print, default: pf_print(opaque," - desc 2a avc_timing_and_hrd hrd_management_valid_flag=%u" " picture_and_timing_info_present=%u" - " 90khz_flag=%u N=%u K=%u num_units_in_tick=%u" + " flag_90khz=%u N=%u K=%u num_units_in_tick=%u" " fixed_frame_rate_flag=%u temporal_poc_flag=%u" " picture_to_display_conversion_flag=%u", desc2a_get_hrd_management_valid_flag(p_desc), diff --git a/mpeg/psi/desc_2b.h b/mpeg/psi/desc_2b.h index a1af9b5..1be95c1 100644 --- a/mpeg/psi/desc_2b.h +++ b/mpeg/psi/desc_2b.h @@ -93,7 +93,7 @@ static inline void desc2b_print(const uint8_t *p_desc, f_print pf_print, switch (i_print_type) { case PRINT_XML: pf_print(opaque, "", desc2b_get_aac_profile(p_desc), desc2b_get_aac_channel_config(p_desc), desc2b_get_aac_additional_info(p_desc) diff --git a/mpeg/psi/desc_2c.h b/mpeg/psi/desc_2c.h index c5a3855..444c845 100644 --- a/mpeg/psi/desc_2c.h +++ b/mpeg/psi/desc_2c.h @@ -107,7 +107,7 @@ static inline void desc2c_print(const uint8_t *p_desc, f_print pf_print, switch (i_print_type) { case PRINT_XML: pf_print(opaque, "", desc2c_get_fcr_es_id(p_desc), desc2c_get_fcr_resolution(p_desc), desc2c_get_fcr_length(p_desc),