Skip to content

L
libdvbpsi
Commit b43c6fc2 authored by Daniel Kamil Kozar's avatar Daniel Kamil Kozar Committed by Jean-Paul Saman
Browse files
Options

use the new descriptor API in test_dr 

(cherry picked from commit d1d2e934)
Signed-off-by: default avatarJean-Paul Saman <jpsaman@videolan.org>
parent b8e56f3d
Show whitespace changes
Inline Side-by-side
Showing with 423 additions and 424 deletions
misc/dr.dtd
View file @ b43c6fc2
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<!ATTLIST descriptor name CDATA #IMPLIED> <!ATTLIST descriptor name CDATA #IMPLIED>
<!ATTLIST descriptor sname CDATA #IMPLIED> <!ATTLIST descriptor sname CDATA #IMPLIED>
<!ATTLIST descriptor fname CDATA #IMPLIED>
<!ATTLIST descriptor msuffix CDATA #IMPLIED> <!ATTLIST descriptor msuffix CDATA #IMPLIED>
<!ATTLIST descriptor gen_args CDATA #IMPLIED> <!ATTLIST descriptor gen_args CDATA #IMPLIED>
......
misc/dr.xml
View file @ b43c6fc2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE dr SYSTEM "dr.dtd"> <!DOCTYPE dr SYSTEM "dr.dtd">
<dr> <dr>
<descriptor name="video stream (b_mpeg2 = false)" sname="vstream" fname="VStream" msuffix="1" > <descriptor name="video stream (b_mpeg2 = false)" sname="mpeg_vstream" msuffix="1" >
<boolean name="b_multiple_frame_rate" default="0" /> <boolean name="b_multiple_frame_rate" default="0" />
<integer name="i_frame_rate_code" bitcount="4" default="0" /> <integer name="i_frame_rate_code" bitcount="4" default="0" />
<insert> <insert>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<boolean name="b_still_picture" default="0" /> <boolean name="b_still_picture" default="0" />
</descriptor> </descriptor>
<descriptor name="video stream (b_mpeg2 = true)" sname="vstream" fname="VStream" msuffix="2" > <descriptor name="video stream (b_mpeg2 = true)" sname="mpeg_vstream" msuffix="2" >
<boolean name="b_multiple_frame_rate" default="0" /> <boolean name="b_multiple_frame_rate" default="0" />
<integer name="i_frame_rate_code" bitcount="4" default="0" /> <integer name="i_frame_rate_code" bitcount="4" default="0" />
<insert> <insert>
...@@ -27,20 +27,20 @@ ...@@ -27,20 +27,20 @@
<boolean name="b_frame_rate_extension" default="0" /> <boolean name="b_frame_rate_extension" default="0" />
</descriptor> </descriptor>
<descriptor name="audio stream" sname="astream" fname="AStream"> <descriptor name="audio stream" sname="mpeg_astream">
<boolean name="b_free_format" default="0" /> <boolean name="b_free_format" default="0" />
<integer name="i_id" bitcount="1" default="0" /> <integer name="i_id" bitcount="1" default="0" />
<integer name="i_layer" bitcount="2" default="0" /> <integer name="i_layer" bitcount="2" default="0" />
</descriptor> </descriptor>
<descriptor name="hierarchy" sname="hierarchy" fname="Hierarchy"> <descriptor name="hierarchy" sname="mpeg_hierarchy">
<integer name="i_h_type" bitcount="4" default="0" /> <integer name="i_h_type" bitcount="4" default="0" />
<integer name="i_h_layer_index" bitcount="6" default="0" /> <integer name="i_h_layer_index" bitcount="6" default="0" />
<integer name="i_h_embedded_layer" bitcount="6" default="0" /> <integer name="i_h_embedded_layer" bitcount="6" default="0" />
<integer name="i_h_priority" bitcount="6" default="0" /> <integer name="i_h_priority" bitcount="6" default="0" />
</descriptor> </descriptor>
<descriptor name="registration" sname="registration" fname="Registration"> <descriptor name="registration" sname="mpeg_registration">
<insert> <insert>
<begin> <begin>
s_decoded.i_additional_length = 0;</begin> s_decoded.i_additional_length = 0;</begin>
...@@ -48,23 +48,23 @@ ...@@ -48,23 +48,23 @@
<integer name="i_format_identifier" bitcount="32" default="0" /> <integer name="i_format_identifier" bitcount="32" default="0" />
</descriptor> </descriptor>
<descriptor name="data stream alignment" sname="ds_alignment" fname="DSAlignment"> <descriptor name="data stream alignment" sname="mpeg_ds_alignment">
<integer name="i_alignment_type" bitcount="8" default="0" /> <integer name="i_alignment_type" bitcount="8" default="0" />
</descriptor> </descriptor>
<descriptor name="target background grid" sname="target_bg_grid" fname="TargetBgGrid"> <descriptor name="target background grid" sname="mpeg_target_bg_grid">
<integer name="i_horizontal_size" bitcount="14" default="0" /> <integer name="i_horizontal_size" bitcount="14" default="0" />
<integer name="i_vertical_size" bitcount="14" default="0" /> <integer name="i_vertical_size" bitcount="14" default="0" />
<integer name="i_pel_aspect_ratio" bitcount="4" default="0" /> <integer name="i_pel_aspect_ratio" bitcount="4" default="0" />
</descriptor> </descriptor>
<descriptor name="video window" sname="vwindow" fname="VWindow"> <descriptor name="video window" sname="mpeg_vwindow">
<integer name="i_horizontal_offset" bitcount="14" default="0" /> <integer name="i_horizontal_offset" bitcount="14" default="0" />
<integer name="i_vertical_offset" bitcount="14" default="0" /> <integer name="i_vertical_offset" bitcount="14" default="0" />
<integer name="i_window_priority" bitcount="4" default="0" /> <integer name="i_window_priority" bitcount="4" default="0" />
</descriptor> </descriptor>
<descriptor name="conditional access" sname="ca" fname="CA"> <descriptor name="conditional access" sname="mpeg_ca">
<insert> <insert>
<begin> <begin>
s_decoded.i_private_length = 0;</begin> s_decoded.i_private_length = 0;</begin>
...@@ -74,23 +74,23 @@ ...@@ -74,23 +74,23 @@
<array name="i_private_data" len_name="i_private_length" min_size="0" /> <array name="i_private_data" len_name="i_private_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="ISO 639 language" sname="iso639" fname="ISO639"> <descriptor name="ISO 639 language" sname="mpeg_iso639">
<array name="code" len_name="i_code_count" min_size="1" /> <array name="code" len_name="i_code_count" min_size="1" />
</descriptor> </descriptor>
<descriptor name="system clock" sname="system_clock" fname="SystemClock"> <descriptor name="system clock" sname="mpeg_system_clock">
<boolean name="b_external_clock_ref" default="0" /> <boolean name="b_external_clock_ref" default="0" />
<integer name="i_clock_accuracy_integer" bitcount="6" default="0" /> <integer name="i_clock_accuracy_integer" bitcount="6" default="0" />
<integer name="i_clock_accuracy_exponent" bitcount="3" default="0" /> <integer name="i_clock_accuracy_exponent" bitcount="3" default="0" />
</descriptor> </descriptor>
<descriptor name="multiplex buffer utilization" sname="mx_buff_utilization" fname="MxBuffUtilization"> <descriptor name="multiplex buffer utilization" sname="mpeg_mx_buff_utilization">
<boolean name="b_mdv_valid" default="0" /> <boolean name="b_mdv_valid" default="0" />
<integer name="i_mx_delay_variation" bitcount="15" default="0" /> <integer name="i_mx_delay_variation" bitcount="15" default="0" />
<integer name="i_mx_strategy" bitcount="3" default="0" /> <integer name="i_mx_strategy" bitcount="3" default="0" />
</descriptor> </descriptor>
<descriptor name="copyright" sname="copyright" fname="Copyright"> <descriptor name="copyright" sname="mpeg_copyright">
<insert> <insert>
<begin> <begin>
s_decoded.i_additional_length = 0;</begin> s_decoded.i_additional_length = 0;</begin>
...@@ -99,50 +99,50 @@ ...@@ -99,50 +99,50 @@
<array name="i_additional_info" len_name="i_additional_length" min_size="0" /> <array name="i_additional_info" len_name="i_additional_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="maximum bitrate" sname="max_bitrate" fname="MaxBitrate"> <descriptor name="maximum bitrate" sname="mpeg_max_bitrate">
<integer name="i_max_bitrate" bitcount="22" default="0" /> <integer name="i_max_bitrate" bitcount="22" default="0" />
</descriptor> </descriptor>
<descriptor name="private data indicator" sname="private_data" fname="PrivateData"> <descriptor name="private data indicator" sname="mpeg_private_data">
<integer name="i_private_data" bitcount="32" default="0" /> <integer name="i_private_data" bitcount="32" default="0" />
</descriptor> </descriptor>
<descriptor name="smoothing buffer" sname="smoothing_buffer" fname="SmoothingBuffer" gen_args="1"> <descriptor name="smoothing buffer" sname="mpeg_smoothing_buffer" gen_args="1">
<integer name="i_sb_leak_rate" bitcount="22" default="0" /> <integer name="i_sb_leak_rate" bitcount="22" default="0" />
<integer name="i_sb_size" bitcount="22" default="0" /> <integer name="i_sb_size" bitcount="22" default="0" />
</descriptor> </descriptor>
<descriptor name="STD" sname="std" fname="STD" gen_args="1"> <descriptor name="STD" sname="mpeg_std" gen_args="1">
<boolean name="b_leak_valid_flag" default="0" /> <boolean name="b_leak_valid_flag" default="0" />
</descriptor> </descriptor>
<descriptor name="IBP" sname="ibp" fname="IBP" gen_args="1"> <descriptor name="IBP" sname="mpeg_ibp" gen_args="1">
<boolean name="b_closed_gop_flag" default="0" /> <boolean name="b_closed_gop_flag" default="0" />
<boolean name="b_identical_gop_flag" default="0" /> <boolean name="b_identical_gop_flag" default="0" />
<integer name="i_max_gop_length" bitcount="14" default="1" /> <integer name="i_max_gop_length" bitcount="14" default="1" />
</descriptor> </descriptor>
<descriptor name="MPEG-4 video" sname="mpeg4_video" fname="MPEG4Video" gen_args="1"> <descriptor name="MPEG-4 video" sname="mpeg_mpeg4_video" gen_args="1">
<integer name="i_mpeg4_visual_profile_and_level" bitcount="8" default="0" /> <integer name="i_mpeg4_visual_profile_and_level" bitcount="8" default="0" />
</descriptor> </descriptor>
<descriptor name="MPEG-4 audio" sname="mpeg4_audio" fname="MPEG4Audio" gen_args="1"> <descriptor name="MPEG-4 audio" sname="mpeg_mpeg4_audio" gen_args="1">
<integer name="i_mpeg4_audio_profile_and_level" bitcount="8" default="0" /> <integer name="i_mpeg4_audio_profile_and_level" bitcount="8" default="0" />
</descriptor> </descriptor>
<descriptor name="network name" sname="network_name" fname="NetworkName"> <descriptor name="network name" sname="dvb_network_name">
<array name="i_name_byte" len_name="i_name_length" min_size="0" /> <array name="i_name_byte" len_name="i_name_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="service list" sname="service_list" fname="ServiceList"> <descriptor name="service list" sname="dvb_service_list">
<array name="i_service" len_name="i_service_count" min_size="1" type="dvbpsi_service_list_service_s" /> <array name="i_service" len_name="i_service_count" min_size="1" type="dvbpsi_service_list_service_s" />
</descriptor> </descriptor>
<descriptor name="stuffing" sname="stuffing" fname="Stuffing"> <descriptor name="stuffing" sname="dvb_stuffing">
<array name="i_stuffing_byte" len_name="i_stuffing_length" min_size="0" /> <array name="i_stuffing_byte" len_name="i_stuffing_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="satellite delivery system" sname="sat_deliv_sys" fname="SatDelivSys"> <descriptor name="satellite delivery system" sname="dvb_sat_deliv_sys">
<integer name="i_frequency" bitcount="32" default="0"/> <integer name="i_frequency" bitcount="32" default="0"/>
<integer name="i_orbital_position" bitcount="16" default="0"/> <integer name="i_orbital_position" bitcount="16" default="0"/>
<integer name="i_west_east_flag" bitcount="1" default="0"/> <integer name="i_west_east_flag" bitcount="1" default="0"/>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<integer name="i_fec_inner" bitcount="4" default="0"/> <integer name="i_fec_inner" bitcount="4" default="0"/>
</descriptor> </descriptor>
<descriptor name="cable delivery system" sname="cable_deliv_sys" fname="CableDelivSys"> <descriptor name="cable delivery system" sname="dvb_cable_deliv_sys">
<integer name="i_frequency" bitcount="32" default="0"/> <integer name="i_frequency" bitcount="32" default="0"/>
<integer name="i_modulation" bitcount="8" default="0"/> <integer name="i_modulation" bitcount="8" default="0"/>
<integer name="i_symbol_rate" bitcount="28" default="0"/> <integer name="i_symbol_rate" bitcount="28" default="0"/>
...@@ -162,11 +162,11 @@ ...@@ -162,11 +162,11 @@
<integer name="i_fec_outer" bitcount="4" default="0"/> <integer name="i_fec_outer" bitcount="4" default="0"/>
</descriptor> </descriptor>
<descriptor name="bouquet name" sname="bouquet_name" fname="BouquetName"> <descriptor name="bouquet name" sname="dvb_bouquet_name">
<array name="i_char" len_name="i_name_length" min_size="0" /> <array name="i_char" len_name="i_name_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="service (i_service_provider_name)" sname="service" fname="Service" msuffix="1"> <descriptor name="service (i_service_provider_name)" sname="dvb_service" msuffix="1">
<insert> <insert>
<begin> <begin>
s_decoded.i_service_name_length = 0;</begin> s_decoded.i_service_name_length = 0;</begin>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<array name="i_service_provider_name" len_name="i_service_provider_name_length" min_size="0" /> <array name="i_service_provider_name" len_name="i_service_provider_name_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="service (i_service_name)" sname="service" fname="Service" msuffix="2"> <descriptor name="service (i_service_name)" sname="dvb_service" msuffix="2">
<insert> <insert>
<begin> <begin>
s_decoded.i_service_provider_name_length = 0;</begin> s_decoded.i_service_provider_name_length = 0;</begin>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<array name="i_service_name" len_name="i_service_name_length" min_size="0" /> <array name="i_service_name" len_name="i_service_name_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="service (both names)" sname="service" fname="Service" msuffix="3"> <descriptor name="service (both names)" sname="dvb_service" msuffix="3">
<insert> <insert>
<begin> <begin>
s_decoded.i_service_provider_name_length = 0;</begin> s_decoded.i_service_provider_name_length = 0;</begin>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<array name="i_service_provider_name" len_name="i_service_provider_name_length" min_size="0" max_size="126" /> <array name="i_service_provider_name" len_name="i_service_provider_name_length" min_size="0" max_size="126" />
</descriptor> </descriptor>
<descriptor name="linkage (information service)" sname="linkage" fname="Linkage" msuffix="0"> <descriptor name="linkage (information service)" sname="dvb_linkage" msuffix="0">
<insert> <insert>
<begin> <begin>
s_decoded.i_linkage_type = 1; s_decoded.i_linkage_type = 1;
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
<array name="i_private_data" len_name="i_private_data_length" min_size="0" /> <array name="i_private_data" len_name="i_private_data_length" min_size="0" />
</descriptor> </descriptor>
<descriptor name="linkage (mobile handover, no extra data)" sname="linkage" fname="Linkage" msuffix="1"> <descriptor name="linkage (mobile handover, no extra data)" sname="dvb_linkage" msuffix="1">
<insert> <insert>
<begin> <begin>
s_decoded.i_linkage_type = 8; s_decoded.i_linkage_type = 8;
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="245" /> <array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="245" />
</descriptor> </descriptor>
<descriptor name="linkage (mobile handover, extra network_id)" sname="linkage" fname="Linkage" msuffix="2"> <descriptor name="linkage (mobile handover, extra network_id)" sname="dvb_linkage" msuffix="2">
<insert> <insert>
<begin> <begin>
s_decoded.i_linkage_type = 8; s_decoded.i_linkage_type = 8;
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
<array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="243" /> <array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="243" />
</descriptor> </descriptor>
<descriptor name="linkage (mobile handover, extra initial_service_id)" sname="linkage" fname="Linkage" msuffix="3"> <descriptor name="linkage (mobile handover, extra initial_service_id)" sname="dvb_linkage" msuffix="3">
<insert> <insert>
<begin> <begin>
s_decoded.i_linkage_type = 8; s_decoded.i_linkage_type = 8;
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="243" /> <array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="243" />
</descriptor> </descriptor>
<descriptor name="linkage (mobile handover, extra network_id and initial_service_id)" sname="linkage" fname="Linkage" msuffix="4"> <descriptor name="linkage (mobile handover, extra network_id and initial_service_id)" sname="dvb_linkage" msuffix="4">
<insert> <insert>
<begin> <begin>
s_decoded.i_linkage_type = 8; s_decoded.i_linkage_type = 8;
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
<array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="241" /> <array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="241" />
</descriptor> </descriptor>
<descriptor name="linkage (event linkage)" sname="linkage" fname="Linkage" msuffix="5"> <descriptor name="linkage (event linkage)" sname="dvb_linkage" msuffix="5">
<insert> <insert>
<begin> <begin>
s_decoded.i_linkage_type = 13; s_decoded.i_linkage_type = 13;
...@@ -281,15 +281,15 @@ ...@@ -281,15 +281,15 @@
<array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="242" /> <array name="i_private_data" len_name="i_private_data_length" min_size="0" max_size="242" />
</descriptor> </descriptor>
<descriptor name="Near Video On Demand reference" sname="nvod_ref" fname="NVODReference"> <descriptor name="Near Video On Demand reference" sname="dvb_nvod_ref">
<array name="p_nvod_refs" len_name="i_references" min_size="1" type="dvbpsi_nvod_ref_t"/> <array name="p_nvod_refs" len_name="i_references" min_size="1" type="dvbpsi_nvod_ref_t"/>
</descriptor> </descriptor>
<descriptor name="time shifted service" sname="tshifted_service" fname="TimeShiftedService"> <descriptor name="time shifted service" sname="dvb_tshifted_service">
<integer name="i_ref_service_id" bitcount="16" default="0"/> <integer name="i_ref_service_id" bitcount="16" default="0"/>
</descriptor> </descriptor>
<descriptor name="short event (event_name)" sname="short_event" fname="ShortEvent" msuffix="0"> <descriptor name="short event (event_name)" sname="dvb_short_event" msuffix="0">
<insert> <insert>
<begin> <begin>
s_decoded.i_text_length = 0; s_decoded.i_text_length = 0;
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<array name="i_event_name" len_name="i_event_name_length" min_size="0" max_size="248" /> <array name="i_event_name" len_name="i_event_name_length" min_size="0" max_size="248" />
</descriptor> </descriptor>
<descriptor name="short event (i_text)" sname="short_event" fname="ShortEvent" msuffix="1"> <descriptor name="short event (i_text)" sname="dvb_short_event" msuffix="1">
<insert> <insert>
<begin> <begin>
s_decoded.i_event_name_length = 0; s_decoded.i_event_name_length = 0;
...@@ -309,46 +309,46 @@ ...@@ -309,46 +309,46 @@
<array name="i_text" len_name="i_text_length" min_size="0" max_size="248" /> <array name="i_text" len_name="i_text_length" min_size="0" max_size="248" />
</descriptor> </descriptor>
<descriptor name="short event (both)" sname="short_event" fname="ShortEvent" msuffix="2"> <descriptor name="short event (both)" sname="dvb_short_event" msuffix="2">
<carray name="i_iso_639_code" /> <carray name="i_iso_639_code" />
<array name="i_text" len_name="i_text_length" min_size="0" max_size="124" /> <array name="i_text" len_name="i_text_length" min_size="0" max_size="124" />
<array name="i_event_name" len_name="i_event_name_length" min_size="0" max_size="124" /> <array name="i_event_name" len_name="i_event_name_length" min_size="0" max_size="124" />
</descriptor> </descriptor>
<descriptor name="time shifted event" sname="tshifted_ev" fname="TimeShiftedEvent"> <descriptor name="time shifted event" sname="dvb_tshifted_ev">
<integer name="i_ref_service_id" bitcount="16" default="0"/> <integer name="i_ref_service_id" bitcount="16" default="0"/>
<integer name="i_ref_event_id" bitcount="16" default="0"/> <integer name="i_ref_event_id" bitcount="16" default="0"/>
</descriptor> </descriptor>
<descriptor name="stream identifier" sname="stream_identifier" fname="StreamIdentifier"> <descriptor name="stream identifier" sname="dvb_stream_identifier">
<integer name="i_component_tag" bitcount="8" default="0"/> <integer name="i_component_tag" bitcount="8" default="0"/>
</descriptor> </descriptor>
<descriptor name="CA identifier" sname="ca_identifier" fname="CAIdentifier"> <descriptor name="CA identifier" sname="dvb_ca_identifier">
<array name="p_system" len_name="i_number" min_size="1" type="dvbpsi_ca_system_t"/> <array name="p_system" len_name="i_number" min_size="1" type="dvbpsi_ca_system_t"/>
</descriptor> </descriptor>
<descriptor name="content" sname="content" fname="Content"> <descriptor name="content" sname="dvb_content">
<array name="p_content" len_name="i_contents_number" min_size="1" type="dvbpsi_content_t"/> <array name="p_content" len_name="i_contents_number" min_size="1" type="dvbpsi_content_t"/>
</descriptor> </descriptor>
<descriptor name="parental rating" sname="parental_rating" fname="ParentalRating"> <descriptor name="parental rating" sname="dvb_parental_rating">
<array name="p_parental_rating" len_name="i_ratings_number" min_size="1" type="dvbpsi_parental_rating_t"/> <array name="p_parental_rating" len_name="i_ratings_number" min_size="1" type="dvbpsi_parental_rating_t"/>
</descriptor> </descriptor>
<descriptor name="teletext" sname="teletext" fname="Teletext"> <descriptor name="teletext" sname="dvb_teletext">
<array name="p_pages" len_name="i_pages_number" min_size="1" type="dvbpsi_teletextpage_t"/> <array name="p_pages" len_name="i_pages_number" min_size="1" type="dvbpsi_teletextpage_t"/>
</descriptor> </descriptor>
<descriptor name="local time offset" sname="local_time_offset" fname="LocalTimeOffset"> <descriptor name="local time offset" sname="dvb_local_time_offset">
<array name="p_local_time_offset" len_name="i_local_time_offsets_number" min_size="1" type="dvbpsi_local_time_offset_t"/> <array name="p_local_time_offset" len_name="i_local_time_offsets_number" min_size="1" type="dvbpsi_local_time_offset_t"/>
</descriptor> </descriptor>
<descriptor name="subtitling" sname="subtitling" fname="Subtitling"> <descriptor name="subtitling" sname="dvb_subtitling">
<array name="p_subtitle" len_name="i_subtitles_number" min_size="1" type="dvbpsi_subtitle_t"/> <array name="p_subtitle" len_name="i_subtitles_number" min_size="1" type="dvbpsi_subtitle_t"/>
</descriptor> </descriptor>
<descriptor name="terrestial delivery system" sname="terr_deliv_sys" fname="TerrDelivSys"> <descriptor name="terrestial delivery system" sname="dvb_terr_deliv_sys">
<integer name="i_centre_frequency" bitcount="32" default="0"/> <integer name="i_centre_frequency" bitcount="32" default="0"/>
<integer name="i_bandwidth" bitcount="3" default="0"/> <integer name="i_bandwidth" bitcount="3" default="0"/>
<integer name="i_priority" bitcount="1" default="0"/> <integer name="i_priority" bitcount="1" default="0"/>
......
misc/dr.xsl
View file @ b43c6fc2
...@@ -74,8 +74,8 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix" ...@@ -74,8 +74,8 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
<!-- declare a macro for calling the one-argument generate functions --> <!-- declare a macro for calling the one-argument generate functions -->
<xsl:if test="@gen_args = 1"> <xsl:if test="@gen_args = 1">
#define dvbpsi_Gen<xsl:value-of select="@fname"/>Dr(x,y) \ #define dvbpsi_gen_<xsl:value-of select="@sname"/>_dr(x,y) \
dvbpsi_Gen<xsl:value-of select="@fname"/>Dr(x) dvbpsi_gen_<xsl:value-of select="@sname"/>_dr(x)
</xsl:if> </xsl:if>
<xsl:apply-templates mode="check" /> <xsl:apply-templates mode="check" />
...@@ -117,7 +117,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix" ...@@ -117,7 +117,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
<xsl:template match="integer" mode="check"> <xsl:template match="integer" mode="check">
/* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" /> /* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" />
BOZO_begin_integer(<xsl:value-of select="@name" />, <xsl:value-of select="@bitcount" />) BOZO_begin_integer(<xsl:value-of select="@name" />, <xsl:value-of select="@bitcount" />)
BOZO_DOJOB(<xsl:value-of select="../@fname" />); BOZO_DOJOB(<xsl:value-of select="../@sname" />);
BOZO_check_integer(<xsl:value-of select="@name" />, <xsl:value-of select="@bitcount" />) BOZO_check_integer(<xsl:value-of select="@name" />, <xsl:value-of select="@bitcount" />)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(<xsl:value-of select="@name" />, <xsl:value-of select="@bitcount" />) BOZO_end_integer(<xsl:value-of select="@name" />, <xsl:value-of select="@bitcount" />)
...@@ -126,7 +126,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix" ...@@ -126,7 +126,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
<xsl:template match="boolean" mode="check"> <xsl:template match="boolean" mode="check">
/* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" /> /* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" />
BOZO_begin_boolean(<xsl:value-of select="@name" />) BOZO_begin_boolean(<xsl:value-of select="@name" />)
BOZO_DOJOB(<xsl:value-of select="../@fname" />); BOZO_DOJOB(<xsl:value-of select="../@sname" />);
BOZO_check_boolean(<xsl:value-of select="@name" />) BOZO_check_boolean(<xsl:value-of select="@name" />)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(<xsl:value-of select="@name" />) BOZO_end_boolean(<xsl:value-of select="@name" />)
...@@ -136,7 +136,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix" ...@@ -136,7 +136,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
/* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" /> /* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" />
BOZO_begin_array(<xsl:value-of select="@name" />) BOZO_begin_array(<xsl:value-of select="@name" />)
BOZO_loop_array_begin(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />, <xsl:value-of select="@min_size" />) BOZO_loop_array_begin(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />, <xsl:value-of select="@min_size" />)
BOZO_DOJOB(<xsl:value-of select="../@fname" />); BOZO_DOJOB(<xsl:value-of select="../@sname" />);
BOZO_check_array_begin(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />) BOZO_check_array_begin(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />)
<xsl:choose> <xsl:choose>
<xsl:when test="@type"> <xsl:when test="@type">
...@@ -173,7 +173,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix" ...@@ -173,7 +173,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
/* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" /> /* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" />
i_loop_count = 0; i_loop_count = 0;
BOZO_begin_array(<xsl:value-of select="@name" />) BOZO_begin_array(<xsl:value-of select="@name" />)
BOZO_DOJOB(<xsl:value-of select="../@fname" />); BOZO_DOJOB(<xsl:value-of select="../@sname" />);
BOZO_check_carray(<xsl:value-of select="@name" />) BOZO_check_carray(<xsl:value-of select="@name" />)
BOZO_end_array BOZO_end_array
</xsl:template> </xsl:template>
......
misc/test_dr.c
View file @ b43c6fc2
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
/* video stream (b_mpeg2 = false) */ /* video stream (b_mpeg2 = false) */
static int main_vstream_1(void) static int main_mpeg_vstream_1(void)
{ {
BOZO_VARS(vstream); BOZO_VARS(mpeg_vstream);
BOZO_START(video stream (b_mpeg2 = false)); BOZO_START(video stream (b_mpeg2 = false));
...@@ -44,7 +44,7 @@ static int main_vstream_1(void) ...@@ -44,7 +44,7 @@ static int main_vstream_1(void)
BOZO_init_boolean(b_constrained_parameter, 0); BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0); BOZO_init_boolean(b_still_picture, 0);
BOZO_begin_boolean(b_multiple_frame_rate) BOZO_begin_boolean(b_multiple_frame_rate)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_multiple_frame_rate) BOZO_check_boolean(b_multiple_frame_rate)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_multiple_frame_rate) BOZO_end_boolean(b_multiple_frame_rate)
...@@ -56,7 +56,7 @@ static int main_vstream_1(void) ...@@ -56,7 +56,7 @@ static int main_vstream_1(void)
BOZO_init_boolean(b_constrained_parameter, 0); BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0); BOZO_init_boolean(b_still_picture, 0);
BOZO_begin_integer(i_frame_rate_code, 4) BOZO_begin_integer(i_frame_rate_code, 4)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_integer(i_frame_rate_code, 4) BOZO_check_integer(i_frame_rate_code, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_frame_rate_code, 4) BOZO_end_integer(i_frame_rate_code, 4)
...@@ -68,7 +68,7 @@ static int main_vstream_1(void) ...@@ -68,7 +68,7 @@ static int main_vstream_1(void)
BOZO_init_boolean(b_constrained_parameter, 0); BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0); BOZO_init_boolean(b_still_picture, 0);
BOZO_begin_boolean(b_constrained_parameter) BOZO_begin_boolean(b_constrained_parameter)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_constrained_parameter) BOZO_check_boolean(b_constrained_parameter)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_constrained_parameter) BOZO_end_boolean(b_constrained_parameter)
...@@ -80,7 +80,7 @@ static int main_vstream_1(void) ...@@ -80,7 +80,7 @@ static int main_vstream_1(void)
BOZO_init_boolean(b_constrained_parameter, 0); BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0); BOZO_init_boolean(b_still_picture, 0);
BOZO_begin_boolean(b_still_picture) BOZO_begin_boolean(b_still_picture)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_still_picture) BOZO_check_boolean(b_still_picture)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_still_picture) BOZO_end_boolean(b_still_picture)
...@@ -92,9 +92,9 @@ static int main_vstream_1(void) ...@@ -92,9 +92,9 @@ static int main_vstream_1(void)
} }
/* video stream (b_mpeg2 = true) */ /* video stream (b_mpeg2 = true) */
static int main_vstream_2(void) static int main_mpeg_vstream_2(void)
{ {
BOZO_VARS(vstream); BOZO_VARS(mpeg_vstream);
BOZO_START(video stream (b_mpeg2 = true)); BOZO_START(video stream (b_mpeg2 = true));
...@@ -108,7 +108,7 @@ static int main_vstream_2(void) ...@@ -108,7 +108,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_boolean(b_multiple_frame_rate) BOZO_begin_boolean(b_multiple_frame_rate)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_multiple_frame_rate) BOZO_check_boolean(b_multiple_frame_rate)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_multiple_frame_rate) BOZO_end_boolean(b_multiple_frame_rate)
...@@ -123,7 +123,7 @@ static int main_vstream_2(void) ...@@ -123,7 +123,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_integer(i_frame_rate_code, 4) BOZO_begin_integer(i_frame_rate_code, 4)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_integer(i_frame_rate_code, 4) BOZO_check_integer(i_frame_rate_code, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_frame_rate_code, 4) BOZO_end_integer(i_frame_rate_code, 4)
...@@ -138,7 +138,7 @@ static int main_vstream_2(void) ...@@ -138,7 +138,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_boolean(b_constrained_parameter) BOZO_begin_boolean(b_constrained_parameter)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_constrained_parameter) BOZO_check_boolean(b_constrained_parameter)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_constrained_parameter) BOZO_end_boolean(b_constrained_parameter)
...@@ -153,7 +153,7 @@ static int main_vstream_2(void) ...@@ -153,7 +153,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_boolean(b_still_picture) BOZO_begin_boolean(b_still_picture)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_still_picture) BOZO_check_boolean(b_still_picture)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_still_picture) BOZO_end_boolean(b_still_picture)
...@@ -168,7 +168,7 @@ static int main_vstream_2(void) ...@@ -168,7 +168,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_integer(i_profile_level_indication, 8) BOZO_begin_integer(i_profile_level_indication, 8)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_integer(i_profile_level_indication, 8) BOZO_check_integer(i_profile_level_indication, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_profile_level_indication, 8) BOZO_end_integer(i_profile_level_indication, 8)
...@@ -183,7 +183,7 @@ static int main_vstream_2(void) ...@@ -183,7 +183,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_integer(i_chroma_format, 2) BOZO_begin_integer(i_chroma_format, 2)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_integer(i_chroma_format, 2) BOZO_check_integer(i_chroma_format, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_chroma_format, 2) BOZO_end_integer(i_chroma_format, 2)
...@@ -198,7 +198,7 @@ static int main_vstream_2(void) ...@@ -198,7 +198,7 @@ static int main_vstream_2(void)
BOZO_init_integer(i_chroma_format, 0); BOZO_init_integer(i_chroma_format, 0);
BOZO_init_boolean(b_frame_rate_extension, 0); BOZO_init_boolean(b_frame_rate_extension, 0);
BOZO_begin_boolean(b_frame_rate_extension) BOZO_begin_boolean(b_frame_rate_extension)
BOZO_DOJOB(VStream); BOZO_DOJOB(mpeg_vstream);
BOZO_check_boolean(b_frame_rate_extension) BOZO_check_boolean(b_frame_rate_extension)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_frame_rate_extension) BOZO_end_boolean(b_frame_rate_extension)
...@@ -210,9 +210,9 @@ static int main_vstream_2(void) ...@@ -210,9 +210,9 @@ static int main_vstream_2(void)
} }
/* audio stream */ /* audio stream */
static int main_astream_(void) static int main_mpeg_astream_(void)
{ {
BOZO_VARS(astream); BOZO_VARS(mpeg_astream);
BOZO_START(audio stream); BOZO_START(audio stream);
...@@ -221,7 +221,7 @@ static int main_astream_(void) ...@@ -221,7 +221,7 @@ static int main_astream_(void)
BOZO_init_integer(i_id, 0); BOZO_init_integer(i_id, 0);
BOZO_init_integer(i_layer, 0); BOZO_init_integer(i_layer, 0);
BOZO_begin_boolean(b_free_format) BOZO_begin_boolean(b_free_format)
BOZO_DOJOB(AStream); BOZO_DOJOB(mpeg_astream);
BOZO_check_boolean(b_free_format) BOZO_check_boolean(b_free_format)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_free_format) BOZO_end_boolean(b_free_format)
...@@ -231,7 +231,7 @@ static int main_astream_(void) ...@@ -231,7 +231,7 @@ static int main_astream_(void)
BOZO_init_integer(i_id, 0); BOZO_init_integer(i_id, 0);
BOZO_init_integer(i_layer, 0); BOZO_init_integer(i_layer, 0);
BOZO_begin_integer(i_id, 1) BOZO_begin_integer(i_id, 1)
BOZO_DOJOB(AStream); BOZO_DOJOB(mpeg_astream);
BOZO_check_integer(i_id, 1) BOZO_check_integer(i_id, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_id, 1) BOZO_end_integer(i_id, 1)
...@@ -241,7 +241,7 @@ static int main_astream_(void) ...@@ -241,7 +241,7 @@ static int main_astream_(void)
BOZO_init_integer(i_id, 0); BOZO_init_integer(i_id, 0);
BOZO_init_integer(i_layer, 0); BOZO_init_integer(i_layer, 0);
BOZO_begin_integer(i_layer, 2) BOZO_begin_integer(i_layer, 2)
BOZO_DOJOB(AStream); BOZO_DOJOB(mpeg_astream);
BOZO_check_integer(i_layer, 2) BOZO_check_integer(i_layer, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_layer, 2) BOZO_end_integer(i_layer, 2)
...@@ -253,9 +253,9 @@ static int main_astream_(void) ...@@ -253,9 +253,9 @@ static int main_astream_(void)
} }
/* hierarchy */ /* hierarchy */
static int main_hierarchy_(void) static int main_mpeg_hierarchy_(void)
{ {
BOZO_VARS(hierarchy); BOZO_VARS(mpeg_hierarchy);
BOZO_START(hierarchy); BOZO_START(hierarchy);
...@@ -265,7 +265,7 @@ static int main_hierarchy_(void) ...@@ -265,7 +265,7 @@ static int main_hierarchy_(void)
BOZO_init_integer(i_h_embedded_layer, 0); BOZO_init_integer(i_h_embedded_layer, 0);
BOZO_init_integer(i_h_priority, 0); BOZO_init_integer(i_h_priority, 0);
BOZO_begin_integer(i_h_type, 4) BOZO_begin_integer(i_h_type, 4)
BOZO_DOJOB(Hierarchy); BOZO_DOJOB(mpeg_hierarchy);
BOZO_check_integer(i_h_type, 4) BOZO_check_integer(i_h_type, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_h_type, 4) BOZO_end_integer(i_h_type, 4)
...@@ -276,7 +276,7 @@ static int main_hierarchy_(void) ...@@ -276,7 +276,7 @@ static int main_hierarchy_(void)
BOZO_init_integer(i_h_embedded_layer, 0); BOZO_init_integer(i_h_embedded_layer, 0);
BOZO_init_integer(i_h_priority, 0); BOZO_init_integer(i_h_priority, 0);
BOZO_begin_integer(i_h_layer_index, 6) BOZO_begin_integer(i_h_layer_index, 6)
BOZO_DOJOB(Hierarchy); BOZO_DOJOB(mpeg_hierarchy);
BOZO_check_integer(i_h_layer_index, 6) BOZO_check_integer(i_h_layer_index, 6)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_h_layer_index, 6) BOZO_end_integer(i_h_layer_index, 6)
...@@ -287,7 +287,7 @@ static int main_hierarchy_(void) ...@@ -287,7 +287,7 @@ static int main_hierarchy_(void)
BOZO_init_integer(i_h_embedded_layer, 0); BOZO_init_integer(i_h_embedded_layer, 0);
BOZO_init_integer(i_h_priority, 0); BOZO_init_integer(i_h_priority, 0);
BOZO_begin_integer(i_h_embedded_layer, 6) BOZO_begin_integer(i_h_embedded_layer, 6)
BOZO_DOJOB(Hierarchy); BOZO_DOJOB(mpeg_hierarchy);
BOZO_check_integer(i_h_embedded_layer, 6) BOZO_check_integer(i_h_embedded_layer, 6)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_h_embedded_layer, 6) BOZO_end_integer(i_h_embedded_layer, 6)
...@@ -298,7 +298,7 @@ static int main_hierarchy_(void) ...@@ -298,7 +298,7 @@ static int main_hierarchy_(void)
BOZO_init_integer(i_h_embedded_layer, 0); BOZO_init_integer(i_h_embedded_layer, 0);
BOZO_init_integer(i_h_priority, 0); BOZO_init_integer(i_h_priority, 0);
BOZO_begin_integer(i_h_priority, 6) BOZO_begin_integer(i_h_priority, 6)
BOZO_DOJOB(Hierarchy); BOZO_DOJOB(mpeg_hierarchy);
BOZO_check_integer(i_h_priority, 6) BOZO_check_integer(i_h_priority, 6)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_h_priority, 6) BOZO_end_integer(i_h_priority, 6)
...@@ -310,9 +310,9 @@ static int main_hierarchy_(void) ...@@ -310,9 +310,9 @@ static int main_hierarchy_(void)
} }
/* registration */ /* registration */
static int main_registration_(void) static int main_mpeg_registration_(void)
{ {
BOZO_VARS(registration); BOZO_VARS(mpeg_registration);
BOZO_START(registration); BOZO_START(registration);
...@@ -320,7 +320,7 @@ static int main_registration_(void) ...@@ -320,7 +320,7 @@ static int main_registration_(void)
s_decoded.i_additional_length = 0; s_decoded.i_additional_length = 0;
BOZO_init_integer(i_format_identifier, 0); BOZO_init_integer(i_format_identifier, 0);
BOZO_begin_integer(i_format_identifier, 32) BOZO_begin_integer(i_format_identifier, 32)
BOZO_DOJOB(Registration); BOZO_DOJOB(mpeg_registration);
BOZO_check_integer(i_format_identifier, 32) BOZO_check_integer(i_format_identifier, 32)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_format_identifier, 32) BOZO_end_integer(i_format_identifier, 32)
...@@ -332,16 +332,16 @@ static int main_registration_(void) ...@@ -332,16 +332,16 @@ static int main_registration_(void)
} }
/* data stream alignment */ /* data stream alignment */
static int main_ds_alignment_(void) static int main_mpeg_ds_alignment_(void)
{ {
BOZO_VARS(ds_alignment); BOZO_VARS(mpeg_ds_alignment);
BOZO_START(data stream alignment); BOZO_START(data stream alignment);
/* check i_alignment_type */ /* check i_alignment_type */
BOZO_init_integer(i_alignment_type, 0); BOZO_init_integer(i_alignment_type, 0);
BOZO_begin_integer(i_alignment_type, 8) BOZO_begin_integer(i_alignment_type, 8)
BOZO_DOJOB(DSAlignment); BOZO_DOJOB(mpeg_ds_alignment);
BOZO_check_integer(i_alignment_type, 8) BOZO_check_integer(i_alignment_type, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_alignment_type, 8) BOZO_end_integer(i_alignment_type, 8)
...@@ -353,9 +353,9 @@ static int main_ds_alignment_(void) ...@@ -353,9 +353,9 @@ static int main_ds_alignment_(void)
} }
/* target background grid */ /* target background grid */
static int main_target_bg_grid_(void) static int main_mpeg_target_bg_grid_(void)
{ {
BOZO_VARS(target_bg_grid); BOZO_VARS(mpeg_target_bg_grid);
BOZO_START(target background grid); BOZO_START(target background grid);
...@@ -364,7 +364,7 @@ static int main_target_bg_grid_(void) ...@@ -364,7 +364,7 @@ static int main_target_bg_grid_(void)
BOZO_init_integer(i_vertical_size, 0); BOZO_init_integer(i_vertical_size, 0);
BOZO_init_integer(i_pel_aspect_ratio, 0); BOZO_init_integer(i_pel_aspect_ratio, 0);
BOZO_begin_integer(i_horizontal_size, 14) BOZO_begin_integer(i_horizontal_size, 14)
BOZO_DOJOB(TargetBgGrid); BOZO_DOJOB(mpeg_target_bg_grid);
BOZO_check_integer(i_horizontal_size, 14) BOZO_check_integer(i_horizontal_size, 14)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_horizontal_size, 14) BOZO_end_integer(i_horizontal_size, 14)
...@@ -374,7 +374,7 @@ static int main_target_bg_grid_(void) ...@@ -374,7 +374,7 @@ static int main_target_bg_grid_(void)
BOZO_init_integer(i_vertical_size, 0); BOZO_init_integer(i_vertical_size, 0);
BOZO_init_integer(i_pel_aspect_ratio, 0); BOZO_init_integer(i_pel_aspect_ratio, 0);
BOZO_begin_integer(i_vertical_size, 14) BOZO_begin_integer(i_vertical_size, 14)
BOZO_DOJOB(TargetBgGrid); BOZO_DOJOB(mpeg_target_bg_grid);
BOZO_check_integer(i_vertical_size, 14) BOZO_check_integer(i_vertical_size, 14)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_vertical_size, 14) BOZO_end_integer(i_vertical_size, 14)
...@@ -384,7 +384,7 @@ static int main_target_bg_grid_(void) ...@@ -384,7 +384,7 @@ static int main_target_bg_grid_(void)
BOZO_init_integer(i_vertical_size, 0); BOZO_init_integer(i_vertical_size, 0);
BOZO_init_integer(i_pel_aspect_ratio, 0); BOZO_init_integer(i_pel_aspect_ratio, 0);
BOZO_begin_integer(i_pel_aspect_ratio, 4) BOZO_begin_integer(i_pel_aspect_ratio, 4)
BOZO_DOJOB(TargetBgGrid); BOZO_DOJOB(mpeg_target_bg_grid);
BOZO_check_integer(i_pel_aspect_ratio, 4) BOZO_check_integer(i_pel_aspect_ratio, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_pel_aspect_ratio, 4) BOZO_end_integer(i_pel_aspect_ratio, 4)
...@@ -396,9 +396,9 @@ static int main_target_bg_grid_(void) ...@@ -396,9 +396,9 @@ static int main_target_bg_grid_(void)
} }
/* video window */ /* video window */
static int main_vwindow_(void) static int main_mpeg_vwindow_(void)
{ {
BOZO_VARS(vwindow); BOZO_VARS(mpeg_vwindow);
BOZO_START(video window); BOZO_START(video window);
...@@ -407,7 +407,7 @@ static int main_vwindow_(void) ...@@ -407,7 +407,7 @@ static int main_vwindow_(void)
BOZO_init_integer(i_vertical_offset, 0); BOZO_init_integer(i_vertical_offset, 0);
BOZO_init_integer(i_window_priority, 0); BOZO_init_integer(i_window_priority, 0);
BOZO_begin_integer(i_horizontal_offset, 14) BOZO_begin_integer(i_horizontal_offset, 14)
BOZO_DOJOB(VWindow); BOZO_DOJOB(mpeg_vwindow);
BOZO_check_integer(i_horizontal_offset, 14) BOZO_check_integer(i_horizontal_offset, 14)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_horizontal_offset, 14) BOZO_end_integer(i_horizontal_offset, 14)
...@@ -417,7 +417,7 @@ static int main_vwindow_(void) ...@@ -417,7 +417,7 @@ static int main_vwindow_(void)
BOZO_init_integer(i_vertical_offset, 0); BOZO_init_integer(i_vertical_offset, 0);
BOZO_init_integer(i_window_priority, 0); BOZO_init_integer(i_window_priority, 0);
BOZO_begin_integer(i_vertical_offset, 14) BOZO_begin_integer(i_vertical_offset, 14)
BOZO_DOJOB(VWindow); BOZO_DOJOB(mpeg_vwindow);
BOZO_check_integer(i_vertical_offset, 14) BOZO_check_integer(i_vertical_offset, 14)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_vertical_offset, 14) BOZO_end_integer(i_vertical_offset, 14)
...@@ -427,7 +427,7 @@ static int main_vwindow_(void) ...@@ -427,7 +427,7 @@ static int main_vwindow_(void)
BOZO_init_integer(i_vertical_offset, 0); BOZO_init_integer(i_vertical_offset, 0);
BOZO_init_integer(i_window_priority, 0); BOZO_init_integer(i_window_priority, 0);
BOZO_begin_integer(i_window_priority, 4) BOZO_begin_integer(i_window_priority, 4)
BOZO_DOJOB(VWindow); BOZO_DOJOB(mpeg_vwindow);
BOZO_check_integer(i_window_priority, 4) BOZO_check_integer(i_window_priority, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_window_priority, 4) BOZO_end_integer(i_window_priority, 4)
...@@ -439,9 +439,9 @@ static int main_vwindow_(void) ...@@ -439,9 +439,9 @@ static int main_vwindow_(void)
} }
/* conditional access */ /* conditional access */
static int main_ca_(void) static int main_mpeg_ca_(void)
{ {
BOZO_VARS(ca); BOZO_VARS(mpeg_ca);
BOZO_START(conditional access); BOZO_START(conditional access);
...@@ -451,7 +451,7 @@ static int main_ca_(void) ...@@ -451,7 +451,7 @@ static int main_ca_(void)
BOZO_init_integer(i_ca_pid, 0); BOZO_init_integer(i_ca_pid, 0);
BOZO_init_array(i_private_length); BOZO_init_array(i_private_length);
BOZO_begin_integer(i_ca_system_id, 16) BOZO_begin_integer(i_ca_system_id, 16)
BOZO_DOJOB(CA); BOZO_DOJOB(mpeg_ca);
BOZO_check_integer(i_ca_system_id, 16) BOZO_check_integer(i_ca_system_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_ca_system_id, 16) BOZO_end_integer(i_ca_system_id, 16)
...@@ -462,7 +462,7 @@ static int main_ca_(void) ...@@ -462,7 +462,7 @@ static int main_ca_(void)
BOZO_init_integer(i_ca_pid, 0); BOZO_init_integer(i_ca_pid, 0);
BOZO_init_array(i_private_length); BOZO_init_array(i_private_length);
BOZO_begin_integer(i_ca_pid, 13) BOZO_begin_integer(i_ca_pid, 13)
BOZO_DOJOB(CA); BOZO_DOJOB(mpeg_ca);
BOZO_check_integer(i_ca_pid, 13) BOZO_check_integer(i_ca_pid, 13)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_ca_pid, 13) BOZO_end_integer(i_ca_pid, 13)
...@@ -474,7 +474,7 @@ static int main_ca_(void) ...@@ -474,7 +474,7 @@ static int main_ca_(void)
BOZO_init_array(i_private_length); BOZO_init_array(i_private_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_length, 0) BOZO_loop_array_begin(i_private_data, i_private_length, 0)
BOZO_DOJOB(CA); BOZO_DOJOB(mpeg_ca);
BOZO_check_array_begin(i_private_data, i_private_length) BOZO_check_array_begin(i_private_data, i_private_length)
BOZO_check_array_gen(i_private_data, i_private_length) BOZO_check_array_gen(i_private_data, i_private_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -488,9 +488,9 @@ static int main_ca_(void) ...@@ -488,9 +488,9 @@ static int main_ca_(void)
} }
/* ISO 639 language */ /* ISO 639 language */
static int main_iso639_(void) static int main_mpeg_iso639_(void)
{ {
BOZO_VARS(iso639); BOZO_VARS(mpeg_iso639);
BOZO_START(ISO 639 language); BOZO_START(ISO 639 language);
...@@ -498,7 +498,7 @@ static int main_iso639_(void) ...@@ -498,7 +498,7 @@ static int main_iso639_(void)
BOZO_init_array(i_code_count); BOZO_init_array(i_code_count);
BOZO_begin_array(code) BOZO_begin_array(code)
BOZO_loop_array_begin(code, i_code_count, 1) BOZO_loop_array_begin(code, i_code_count, 1)
BOZO_DOJOB(ISO639); BOZO_DOJOB(mpeg_iso639);
BOZO_check_array_begin(code, i_code_count) BOZO_check_array_begin(code, i_code_count)
BOZO_check_array_gen(code, i_code_count) BOZO_check_array_gen(code, i_code_count)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -512,9 +512,9 @@ static int main_iso639_(void) ...@@ -512,9 +512,9 @@ static int main_iso639_(void)
} }
/* system clock */ /* system clock */
static int main_system_clock_(void) static int main_mpeg_system_clock_(void)
{ {
BOZO_VARS(system_clock); BOZO_VARS(mpeg_system_clock);
BOZO_START(system clock); BOZO_START(system clock);
...@@ -523,7 +523,7 @@ static int main_system_clock_(void) ...@@ -523,7 +523,7 @@ static int main_system_clock_(void)
BOZO_init_integer(i_clock_accuracy_integer, 0); BOZO_init_integer(i_clock_accuracy_integer, 0);
BOZO_init_integer(i_clock_accuracy_exponent, 0); BOZO_init_integer(i_clock_accuracy_exponent, 0);
BOZO_begin_boolean(b_external_clock_ref) BOZO_begin_boolean(b_external_clock_ref)
BOZO_DOJOB(SystemClock); BOZO_DOJOB(mpeg_system_clock);
BOZO_check_boolean(b_external_clock_ref) BOZO_check_boolean(b_external_clock_ref)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_external_clock_ref) BOZO_end_boolean(b_external_clock_ref)
...@@ -533,7 +533,7 @@ static int main_system_clock_(void) ...@@ -533,7 +533,7 @@ static int main_system_clock_(void)
BOZO_init_integer(i_clock_accuracy_integer, 0); BOZO_init_integer(i_clock_accuracy_integer, 0);
BOZO_init_integer(i_clock_accuracy_exponent, 0); BOZO_init_integer(i_clock_accuracy_exponent, 0);
BOZO_begin_integer(i_clock_accuracy_integer, 6) BOZO_begin_integer(i_clock_accuracy_integer, 6)
BOZO_DOJOB(SystemClock); BOZO_DOJOB(mpeg_system_clock);
BOZO_check_integer(i_clock_accuracy_integer, 6) BOZO_check_integer(i_clock_accuracy_integer, 6)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_clock_accuracy_integer, 6) BOZO_end_integer(i_clock_accuracy_integer, 6)
...@@ -543,7 +543,7 @@ static int main_system_clock_(void) ...@@ -543,7 +543,7 @@ static int main_system_clock_(void)
BOZO_init_integer(i_clock_accuracy_integer, 0); BOZO_init_integer(i_clock_accuracy_integer, 0);
BOZO_init_integer(i_clock_accuracy_exponent, 0); BOZO_init_integer(i_clock_accuracy_exponent, 0);
BOZO_begin_integer(i_clock_accuracy_exponent, 3) BOZO_begin_integer(i_clock_accuracy_exponent, 3)
BOZO_DOJOB(SystemClock); BOZO_DOJOB(mpeg_system_clock);
BOZO_check_integer(i_clock_accuracy_exponent, 3) BOZO_check_integer(i_clock_accuracy_exponent, 3)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_clock_accuracy_exponent, 3) BOZO_end_integer(i_clock_accuracy_exponent, 3)
...@@ -555,9 +555,9 @@ static int main_system_clock_(void) ...@@ -555,9 +555,9 @@ static int main_system_clock_(void)
} }
/* multiplex buffer utilization */ /* multiplex buffer utilization */
static int main_mx_buff_utilization_(void) static int main_mpeg_mx_buff_utilization_(void)
{ {
BOZO_VARS(mx_buff_utilization); BOZO_VARS(mpeg_mx_buff_utilization);
BOZO_START(multiplex buffer utilization); BOZO_START(multiplex buffer utilization);
...@@ -566,7 +566,7 @@ static int main_mx_buff_utilization_(void) ...@@ -566,7 +566,7 @@ static int main_mx_buff_utilization_(void)
BOZO_init_integer(i_mx_delay_variation, 0); BOZO_init_integer(i_mx_delay_variation, 0);
BOZO_init_integer(i_mx_strategy, 0); BOZO_init_integer(i_mx_strategy, 0);
BOZO_begin_boolean(b_mdv_valid) BOZO_begin_boolean(b_mdv_valid)
BOZO_DOJOB(MxBuffUtilization); BOZO_DOJOB(mpeg_mx_buff_utilization);
BOZO_check_boolean(b_mdv_valid) BOZO_check_boolean(b_mdv_valid)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_mdv_valid) BOZO_end_boolean(b_mdv_valid)
...@@ -576,7 +576,7 @@ static int main_mx_buff_utilization_(void) ...@@ -576,7 +576,7 @@ static int main_mx_buff_utilization_(void)
BOZO_init_integer(i_mx_delay_variation, 0); BOZO_init_integer(i_mx_delay_variation, 0);
BOZO_init_integer(i_mx_strategy, 0); BOZO_init_integer(i_mx_strategy, 0);
BOZO_begin_integer(i_mx_delay_variation, 15) BOZO_begin_integer(i_mx_delay_variation, 15)
BOZO_DOJOB(MxBuffUtilization); BOZO_DOJOB(mpeg_mx_buff_utilization);
BOZO_check_integer(i_mx_delay_variation, 15) BOZO_check_integer(i_mx_delay_variation, 15)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_mx_delay_variation, 15) BOZO_end_integer(i_mx_delay_variation, 15)
...@@ -586,7 +586,7 @@ static int main_mx_buff_utilization_(void) ...@@ -586,7 +586,7 @@ static int main_mx_buff_utilization_(void)
BOZO_init_integer(i_mx_delay_variation, 0); BOZO_init_integer(i_mx_delay_variation, 0);
BOZO_init_integer(i_mx_strategy, 0); BOZO_init_integer(i_mx_strategy, 0);
BOZO_begin_integer(i_mx_strategy, 3) BOZO_begin_integer(i_mx_strategy, 3)
BOZO_DOJOB(MxBuffUtilization); BOZO_DOJOB(mpeg_mx_buff_utilization);
BOZO_check_integer(i_mx_strategy, 3) BOZO_check_integer(i_mx_strategy, 3)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_mx_strategy, 3) BOZO_end_integer(i_mx_strategy, 3)
...@@ -598,9 +598,9 @@ static int main_mx_buff_utilization_(void) ...@@ -598,9 +598,9 @@ static int main_mx_buff_utilization_(void)
} }
/* copyright */ /* copyright */
static int main_copyright_(void) static int main_mpeg_copyright_(void)
{ {
BOZO_VARS(copyright); BOZO_VARS(mpeg_copyright);
BOZO_START(copyright); BOZO_START(copyright);
...@@ -609,7 +609,7 @@ static int main_copyright_(void) ...@@ -609,7 +609,7 @@ static int main_copyright_(void)
BOZO_init_integer(i_copyright_identifier, 0); BOZO_init_integer(i_copyright_identifier, 0);
BOZO_init_array(i_additional_length); BOZO_init_array(i_additional_length);
BOZO_begin_integer(i_copyright_identifier, 32) BOZO_begin_integer(i_copyright_identifier, 32)
BOZO_DOJOB(Copyright); BOZO_DOJOB(mpeg_copyright);
BOZO_check_integer(i_copyright_identifier, 32) BOZO_check_integer(i_copyright_identifier, 32)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_copyright_identifier, 32) BOZO_end_integer(i_copyright_identifier, 32)
...@@ -620,7 +620,7 @@ static int main_copyright_(void) ...@@ -620,7 +620,7 @@ static int main_copyright_(void)
BOZO_init_array(i_additional_length); BOZO_init_array(i_additional_length);
BOZO_begin_array(i_additional_info) BOZO_begin_array(i_additional_info)
BOZO_loop_array_begin(i_additional_info, i_additional_length, 0) BOZO_loop_array_begin(i_additional_info, i_additional_length, 0)
BOZO_DOJOB(Copyright); BOZO_DOJOB(mpeg_copyright);
BOZO_check_array_begin(i_additional_info, i_additional_length) BOZO_check_array_begin(i_additional_info, i_additional_length)
BOZO_check_array_gen(i_additional_info, i_additional_length) BOZO_check_array_gen(i_additional_info, i_additional_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -634,16 +634,16 @@ static int main_copyright_(void) ...@@ -634,16 +634,16 @@ static int main_copyright_(void)
} }
/* maximum bitrate */ /* maximum bitrate */
static int main_max_bitrate_(void) static int main_mpeg_max_bitrate_(void)
{ {
BOZO_VARS(max_bitrate); BOZO_VARS(mpeg_max_bitrate);
BOZO_START(maximum bitrate); BOZO_START(maximum bitrate);
/* check i_max_bitrate */ /* check i_max_bitrate */
BOZO_init_integer(i_max_bitrate, 0); BOZO_init_integer(i_max_bitrate, 0);
BOZO_begin_integer(i_max_bitrate, 22) BOZO_begin_integer(i_max_bitrate, 22)
BOZO_DOJOB(MaxBitrate); BOZO_DOJOB(mpeg_max_bitrate);
BOZO_check_integer(i_max_bitrate, 22) BOZO_check_integer(i_max_bitrate, 22)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_max_bitrate, 22) BOZO_end_integer(i_max_bitrate, 22)
...@@ -655,16 +655,16 @@ static int main_max_bitrate_(void) ...@@ -655,16 +655,16 @@ static int main_max_bitrate_(void)
} }
/* private data indicator */ /* private data indicator */
static int main_private_data_(void) static int main_mpeg_private_data_(void)
{ {
BOZO_VARS(private_data); BOZO_VARS(mpeg_private_data);
BOZO_START(private data indicator); BOZO_START(private data indicator);
/* check i_private_data */ /* check i_private_data */
BOZO_init_integer(i_private_data, 0); BOZO_init_integer(i_private_data, 0);
BOZO_begin_integer(i_private_data, 32) BOZO_begin_integer(i_private_data, 32)
BOZO_DOJOB(PrivateData); BOZO_DOJOB(mpeg_private_data);
BOZO_check_integer(i_private_data, 32) BOZO_check_integer(i_private_data, 32)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_private_data, 32) BOZO_end_integer(i_private_data, 32)
...@@ -676,20 +676,20 @@ static int main_private_data_(void) ...@@ -676,20 +676,20 @@ static int main_private_data_(void)
} }
/* smoothing buffer */ /* smoothing buffer */
static int main_smoothing_buffer_(void) static int main_mpeg_smoothing_buffer_(void)
{ {
BOZO_VARS(smoothing_buffer); BOZO_VARS(mpeg_smoothing_buffer);
BOZO_START(smoothing buffer); BOZO_START(smoothing buffer);
#define dvbpsi_GenSmoothingBufferDr(x,y) \ #define dvbpsi_gen_mpeg_smoothing_buffer_dr(x,y) \
dvbpsi_GenSmoothingBufferDr(x) dvbpsi_gen_mpeg_smoothing_buffer_dr(x)
/* check i_sb_leak_rate */ /* check i_sb_leak_rate */
BOZO_init_integer(i_sb_leak_rate, 0); BOZO_init_integer(i_sb_leak_rate, 0);
BOZO_init_integer(i_sb_size, 0); BOZO_init_integer(i_sb_size, 0);
BOZO_begin_integer(i_sb_leak_rate, 22) BOZO_begin_integer(i_sb_leak_rate, 22)
BOZO_DOJOB(SmoothingBuffer); BOZO_DOJOB(mpeg_smoothing_buffer);
BOZO_check_integer(i_sb_leak_rate, 22) BOZO_check_integer(i_sb_leak_rate, 22)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_sb_leak_rate, 22) BOZO_end_integer(i_sb_leak_rate, 22)
...@@ -698,7 +698,7 @@ static int main_smoothing_buffer_(void) ...@@ -698,7 +698,7 @@ static int main_smoothing_buffer_(void)
BOZO_init_integer(i_sb_leak_rate, 0); BOZO_init_integer(i_sb_leak_rate, 0);
BOZO_init_integer(i_sb_size, 0); BOZO_init_integer(i_sb_size, 0);
BOZO_begin_integer(i_sb_size, 22) BOZO_begin_integer(i_sb_size, 22)
BOZO_DOJOB(SmoothingBuffer); BOZO_DOJOB(mpeg_smoothing_buffer);
BOZO_check_integer(i_sb_size, 22) BOZO_check_integer(i_sb_size, 22)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_sb_size, 22) BOZO_end_integer(i_sb_size, 22)
...@@ -710,19 +710,19 @@ static int main_smoothing_buffer_(void) ...@@ -710,19 +710,19 @@ static int main_smoothing_buffer_(void)
} }
/* STD */ /* STD */
static int main_std_(void) static int main_mpeg_std_(void)
{ {
BOZO_VARS(std); BOZO_VARS(mpeg_std);
BOZO_START(STD); BOZO_START(STD);
#define dvbpsi_GenSTDDr(x,y) \ #define dvbpsi_gen_mpeg_std_dr(x,y) \
dvbpsi_GenSTDDr(x) dvbpsi_gen_mpeg_std_dr(x)
/* check b_leak_valid_flag */ /* check b_leak_valid_flag */
BOZO_init_boolean(b_leak_valid_flag, 0); BOZO_init_boolean(b_leak_valid_flag, 0);
BOZO_begin_boolean(b_leak_valid_flag) BOZO_begin_boolean(b_leak_valid_flag)
BOZO_DOJOB(STD); BOZO_DOJOB(mpeg_std);
BOZO_check_boolean(b_leak_valid_flag) BOZO_check_boolean(b_leak_valid_flag)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_leak_valid_flag) BOZO_end_boolean(b_leak_valid_flag)
...@@ -734,21 +734,21 @@ static int main_std_(void) ...@@ -734,21 +734,21 @@ static int main_std_(void)
} }
/* IBP */ /* IBP */
static int main_ibp_(void) static int main_mpeg_ibp_(void)
{ {
BOZO_VARS(ibp); BOZO_VARS(mpeg_ibp);
BOZO_START(IBP); BOZO_START(IBP);
#define dvbpsi_GenIBPDr(x,y) \ #define dvbpsi_gen_mpeg_ibp_dr(x,y) \
dvbpsi_GenIBPDr(x) dvbpsi_gen_mpeg_ibp_dr(x)
/* check b_closed_gop_flag */ /* check b_closed_gop_flag */
BOZO_init_boolean(b_closed_gop_flag, 0); BOZO_init_boolean(b_closed_gop_flag, 0);
BOZO_init_boolean(b_identical_gop_flag, 0); BOZO_init_boolean(b_identical_gop_flag, 0);
BOZO_init_integer(i_max_gop_length, 1); BOZO_init_integer(i_max_gop_length, 1);
BOZO_begin_boolean(b_closed_gop_flag) BOZO_begin_boolean(b_closed_gop_flag)
BOZO_DOJOB(IBP); BOZO_DOJOB(mpeg_ibp);
BOZO_check_boolean(b_closed_gop_flag) BOZO_check_boolean(b_closed_gop_flag)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_closed_gop_flag) BOZO_end_boolean(b_closed_gop_flag)
...@@ -758,7 +758,7 @@ static int main_ibp_(void) ...@@ -758,7 +758,7 @@ static int main_ibp_(void)
BOZO_init_boolean(b_identical_gop_flag, 0); BOZO_init_boolean(b_identical_gop_flag, 0);
BOZO_init_integer(i_max_gop_length, 1); BOZO_init_integer(i_max_gop_length, 1);
BOZO_begin_boolean(b_identical_gop_flag) BOZO_begin_boolean(b_identical_gop_flag)
BOZO_DOJOB(IBP); BOZO_DOJOB(mpeg_ibp);
BOZO_check_boolean(b_identical_gop_flag) BOZO_check_boolean(b_identical_gop_flag)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_identical_gop_flag) BOZO_end_boolean(b_identical_gop_flag)
...@@ -768,7 +768,7 @@ static int main_ibp_(void) ...@@ -768,7 +768,7 @@ static int main_ibp_(void)
BOZO_init_boolean(b_identical_gop_flag, 0); BOZO_init_boolean(b_identical_gop_flag, 0);
BOZO_init_integer(i_max_gop_length, 1); BOZO_init_integer(i_max_gop_length, 1);
BOZO_begin_integer(i_max_gop_length, 14) BOZO_begin_integer(i_max_gop_length, 14)
BOZO_DOJOB(IBP); BOZO_DOJOB(mpeg_ibp);
BOZO_check_integer(i_max_gop_length, 14) BOZO_check_integer(i_max_gop_length, 14)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_max_gop_length, 14) BOZO_end_integer(i_max_gop_length, 14)
...@@ -780,19 +780,19 @@ static int main_ibp_(void) ...@@ -780,19 +780,19 @@ static int main_ibp_(void)
} }
/* MPEG-4 video */ /* MPEG-4 video */
static int main_mpeg4_video_(void) static int main_mpeg_mpeg4_video_(void)
{ {
BOZO_VARS(mpeg4_video); BOZO_VARS(mpeg_mpeg4_video);
BOZO_START(MPEG-4 video); BOZO_START(MPEG-4 video);
#define dvbpsi_GenMPEG4VideoDr(x,y) \ #define dvbpsi_gen_mpeg_mpeg4_video_dr(x,y) \
dvbpsi_GenMPEG4VideoDr(x) dvbpsi_gen_mpeg_mpeg4_video_dr(x)
/* check i_mpeg4_visual_profile_and_level */ /* check i_mpeg4_visual_profile_and_level */
BOZO_init_integer(i_mpeg4_visual_profile_and_level, 0); BOZO_init_integer(i_mpeg4_visual_profile_and_level, 0);
BOZO_begin_integer(i_mpeg4_visual_profile_and_level, 8) BOZO_begin_integer(i_mpeg4_visual_profile_and_level, 8)
BOZO_DOJOB(MPEG4Video); BOZO_DOJOB(mpeg_mpeg4_video);
BOZO_check_integer(i_mpeg4_visual_profile_and_level, 8) BOZO_check_integer(i_mpeg4_visual_profile_and_level, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_mpeg4_visual_profile_and_level, 8) BOZO_end_integer(i_mpeg4_visual_profile_and_level, 8)
...@@ -804,19 +804,19 @@ static int main_mpeg4_video_(void) ...@@ -804,19 +804,19 @@ static int main_mpeg4_video_(void)
} }
/* MPEG-4 audio */ /* MPEG-4 audio */
static int main_mpeg4_audio_(void) static int main_mpeg_mpeg4_audio_(void)
{ {
BOZO_VARS(mpeg4_audio); BOZO_VARS(mpeg_mpeg4_audio);
BOZO_START(MPEG-4 audio); BOZO_START(MPEG-4 audio);
#define dvbpsi_GenMPEG4AudioDr(x,y) \ #define dvbpsi_gen_mpeg_mpeg4_audio_dr(x,y) \
dvbpsi_GenMPEG4AudioDr(x) dvbpsi_gen_mpeg_mpeg4_audio_dr(x)
/* check i_mpeg4_audio_profile_and_level */ /* check i_mpeg4_audio_profile_and_level */
BOZO_init_integer(i_mpeg4_audio_profile_and_level, 0); BOZO_init_integer(i_mpeg4_audio_profile_and_level, 0);
BOZO_begin_integer(i_mpeg4_audio_profile_and_level, 8) BOZO_begin_integer(i_mpeg4_audio_profile_and_level, 8)
BOZO_DOJOB(MPEG4Audio); BOZO_DOJOB(mpeg_mpeg4_audio);
BOZO_check_integer(i_mpeg4_audio_profile_and_level, 8) BOZO_check_integer(i_mpeg4_audio_profile_and_level, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_mpeg4_audio_profile_and_level, 8) BOZO_end_integer(i_mpeg4_audio_profile_and_level, 8)
...@@ -828,9 +828,9 @@ static int main_mpeg4_audio_(void) ...@@ -828,9 +828,9 @@ static int main_mpeg4_audio_(void)
} }
/* network name */ /* network name */
static int main_network_name_(void) static int main_dvb_network_name_(void)
{ {
BOZO_VARS(network_name); BOZO_VARS(dvb_network_name);
BOZO_START(network name); BOZO_START(network name);
...@@ -838,7 +838,7 @@ static int main_network_name_(void) ...@@ -838,7 +838,7 @@ static int main_network_name_(void)
BOZO_init_array(i_name_length); BOZO_init_array(i_name_length);
BOZO_begin_array(i_name_byte) BOZO_begin_array(i_name_byte)
BOZO_loop_array_begin(i_name_byte, i_name_length, 0) BOZO_loop_array_begin(i_name_byte, i_name_length, 0)
BOZO_DOJOB(NetworkName); BOZO_DOJOB(dvb_network_name);
BOZO_check_array_begin(i_name_byte, i_name_length) BOZO_check_array_begin(i_name_byte, i_name_length)
BOZO_check_array_gen(i_name_byte, i_name_length) BOZO_check_array_gen(i_name_byte, i_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -852,9 +852,9 @@ static int main_network_name_(void) ...@@ -852,9 +852,9 @@ static int main_network_name_(void)
} }
/* service list */ /* service list */
static int main_service_list_(void) static int main_dvb_service_list_(void)
{ {
BOZO_VARS(service_list); BOZO_VARS(dvb_service_list);
BOZO_START(service list); BOZO_START(service list);
...@@ -862,7 +862,7 @@ static int main_service_list_(void) ...@@ -862,7 +862,7 @@ static int main_service_list_(void)
BOZO_init_array(i_service_count); BOZO_init_array(i_service_count);
BOZO_begin_array(i_service) BOZO_begin_array(i_service)
BOZO_loop_array_begin(i_service, i_service_count, 1) BOZO_loop_array_begin(i_service, i_service_count, 1)
BOZO_DOJOB(ServiceList); BOZO_DOJOB(dvb_service_list);
BOZO_check_array_begin(i_service, i_service_count) BOZO_check_array_begin(i_service, i_service_count)
BOZO_check_array_cmp(i_service, i_service_count, dvbpsi_service_list_service_s) BOZO_check_array_cmp(i_service, i_service_count, dvbpsi_service_list_service_s)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -876,9 +876,9 @@ static int main_service_list_(void) ...@@ -876,9 +876,9 @@ static int main_service_list_(void)
} }
/* stuffing */ /* stuffing */
static int main_stuffing_(void) static int main_dvb_stuffing_(void)
{ {
BOZO_VARS(stuffing); BOZO_VARS(dvb_stuffing);
BOZO_START(stuffing); BOZO_START(stuffing);
...@@ -886,7 +886,7 @@ static int main_stuffing_(void) ...@@ -886,7 +886,7 @@ static int main_stuffing_(void)
BOZO_init_array(i_stuffing_length); BOZO_init_array(i_stuffing_length);
BOZO_begin_array(i_stuffing_byte) BOZO_begin_array(i_stuffing_byte)
BOZO_loop_array_begin(i_stuffing_byte, i_stuffing_length, 0) BOZO_loop_array_begin(i_stuffing_byte, i_stuffing_length, 0)
BOZO_DOJOB(Stuffing); BOZO_DOJOB(dvb_stuffing);
BOZO_check_array_begin(i_stuffing_byte, i_stuffing_length) BOZO_check_array_begin(i_stuffing_byte, i_stuffing_length)
BOZO_check_array_gen(i_stuffing_byte, i_stuffing_length) BOZO_check_array_gen(i_stuffing_byte, i_stuffing_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -900,9 +900,9 @@ static int main_stuffing_(void) ...@@ -900,9 +900,9 @@ static int main_stuffing_(void)
} }
/* satellite delivery system */ /* satellite delivery system */
static int main_sat_deliv_sys_(void) static int main_dvb_sat_deliv_sys_(void)
{ {
BOZO_VARS(sat_deliv_sys); BOZO_VARS(dvb_sat_deliv_sys);
BOZO_START(satellite delivery system); BOZO_START(satellite delivery system);
...@@ -917,7 +917,7 @@ static int main_sat_deliv_sys_(void) ...@@ -917,7 +917,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_frequency, 32) BOZO_begin_integer(i_frequency, 32)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_frequency, 32) BOZO_check_integer(i_frequency, 32)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_frequency, 32) BOZO_end_integer(i_frequency, 32)
...@@ -933,7 +933,7 @@ static int main_sat_deliv_sys_(void) ...@@ -933,7 +933,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_orbital_position, 16) BOZO_begin_integer(i_orbital_position, 16)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_orbital_position, 16) BOZO_check_integer(i_orbital_position, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_orbital_position, 16) BOZO_end_integer(i_orbital_position, 16)
...@@ -949,7 +949,7 @@ static int main_sat_deliv_sys_(void) ...@@ -949,7 +949,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_west_east_flag, 1) BOZO_begin_integer(i_west_east_flag, 1)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_west_east_flag, 1) BOZO_check_integer(i_west_east_flag, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_west_east_flag, 1) BOZO_end_integer(i_west_east_flag, 1)
...@@ -965,7 +965,7 @@ static int main_sat_deliv_sys_(void) ...@@ -965,7 +965,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_polarization, 2) BOZO_begin_integer(i_polarization, 2)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_polarization, 2) BOZO_check_integer(i_polarization, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_polarization, 2) BOZO_end_integer(i_polarization, 2)
...@@ -981,7 +981,7 @@ static int main_sat_deliv_sys_(void) ...@@ -981,7 +981,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_roll_off, 2) BOZO_begin_integer(i_roll_off, 2)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_roll_off, 2) BOZO_check_integer(i_roll_off, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_roll_off, 2) BOZO_end_integer(i_roll_off, 2)
...@@ -997,7 +997,7 @@ static int main_sat_deliv_sys_(void) ...@@ -997,7 +997,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_modulation_system, 1) BOZO_begin_integer(i_modulation_system, 1)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_modulation_system, 1) BOZO_check_integer(i_modulation_system, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_modulation_system, 1) BOZO_end_integer(i_modulation_system, 1)
...@@ -1013,7 +1013,7 @@ static int main_sat_deliv_sys_(void) ...@@ -1013,7 +1013,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_modulation_type, 2) BOZO_begin_integer(i_modulation_type, 2)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_modulation_type, 2) BOZO_check_integer(i_modulation_type, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_modulation_type, 2) BOZO_end_integer(i_modulation_type, 2)
...@@ -1029,7 +1029,7 @@ static int main_sat_deliv_sys_(void) ...@@ -1029,7 +1029,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_symbol_rate, 28) BOZO_begin_integer(i_symbol_rate, 28)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_symbol_rate, 28) BOZO_check_integer(i_symbol_rate, 28)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_symbol_rate, 28) BOZO_end_integer(i_symbol_rate, 28)
...@@ -1045,7 +1045,7 @@ static int main_sat_deliv_sys_(void) ...@@ -1045,7 +1045,7 @@ static int main_sat_deliv_sys_(void)
BOZO_init_integer(i_symbol_rate, 0); BOZO_init_integer(i_symbol_rate, 0);
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_begin_integer(i_fec_inner, 4) BOZO_begin_integer(i_fec_inner, 4)
BOZO_DOJOB(SatDelivSys); BOZO_DOJOB(dvb_sat_deliv_sys);
BOZO_check_integer(i_fec_inner, 4) BOZO_check_integer(i_fec_inner, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_fec_inner, 4) BOZO_end_integer(i_fec_inner, 4)
...@@ -1057,9 +1057,9 @@ static int main_sat_deliv_sys_(void) ...@@ -1057,9 +1057,9 @@ static int main_sat_deliv_sys_(void)
} }
/* cable delivery system */ /* cable delivery system */
static int main_cable_deliv_sys_(void) static int main_dvb_cable_deliv_sys_(void)
{ {
BOZO_VARS(cable_deliv_sys); BOZO_VARS(dvb_cable_deliv_sys);
BOZO_START(cable delivery system); BOZO_START(cable delivery system);
...@@ -1070,7 +1070,7 @@ static int main_cable_deliv_sys_(void) ...@@ -1070,7 +1070,7 @@ static int main_cable_deliv_sys_(void)
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_init_integer(i_fec_outer, 0); BOZO_init_integer(i_fec_outer, 0);
BOZO_begin_integer(i_frequency, 32) BOZO_begin_integer(i_frequency, 32)
BOZO_DOJOB(CableDelivSys); BOZO_DOJOB(dvb_cable_deliv_sys);
BOZO_check_integer(i_frequency, 32) BOZO_check_integer(i_frequency, 32)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_frequency, 32) BOZO_end_integer(i_frequency, 32)
...@@ -1082,7 +1082,7 @@ static int main_cable_deliv_sys_(void) ...@@ -1082,7 +1082,7 @@ static int main_cable_deliv_sys_(void)
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_init_integer(i_fec_outer, 0); BOZO_init_integer(i_fec_outer, 0);
BOZO_begin_integer(i_modulation, 8) BOZO_begin_integer(i_modulation, 8)
BOZO_DOJOB(CableDelivSys); BOZO_DOJOB(dvb_cable_deliv_sys);
BOZO_check_integer(i_modulation, 8) BOZO_check_integer(i_modulation, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_modulation, 8) BOZO_end_integer(i_modulation, 8)
...@@ -1094,7 +1094,7 @@ static int main_cable_deliv_sys_(void) ...@@ -1094,7 +1094,7 @@ static int main_cable_deliv_sys_(void)
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_init_integer(i_fec_outer, 0); BOZO_init_integer(i_fec_outer, 0);
BOZO_begin_integer(i_symbol_rate, 28) BOZO_begin_integer(i_symbol_rate, 28)
BOZO_DOJOB(CableDelivSys); BOZO_DOJOB(dvb_cable_deliv_sys);
BOZO_check_integer(i_symbol_rate, 28) BOZO_check_integer(i_symbol_rate, 28)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_symbol_rate, 28) BOZO_end_integer(i_symbol_rate, 28)
...@@ -1106,7 +1106,7 @@ static int main_cable_deliv_sys_(void) ...@@ -1106,7 +1106,7 @@ static int main_cable_deliv_sys_(void)
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_init_integer(i_fec_outer, 0); BOZO_init_integer(i_fec_outer, 0);
BOZO_begin_integer(i_fec_inner, 4) BOZO_begin_integer(i_fec_inner, 4)
BOZO_DOJOB(CableDelivSys); BOZO_DOJOB(dvb_cable_deliv_sys);
BOZO_check_integer(i_fec_inner, 4) BOZO_check_integer(i_fec_inner, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_fec_inner, 4) BOZO_end_integer(i_fec_inner, 4)
...@@ -1118,7 +1118,7 @@ static int main_cable_deliv_sys_(void) ...@@ -1118,7 +1118,7 @@ static int main_cable_deliv_sys_(void)
BOZO_init_integer(i_fec_inner, 0); BOZO_init_integer(i_fec_inner, 0);
BOZO_init_integer(i_fec_outer, 0); BOZO_init_integer(i_fec_outer, 0);
BOZO_begin_integer(i_fec_outer, 4) BOZO_begin_integer(i_fec_outer, 4)
BOZO_DOJOB(CableDelivSys); BOZO_DOJOB(dvb_cable_deliv_sys);
BOZO_check_integer(i_fec_outer, 4) BOZO_check_integer(i_fec_outer, 4)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_fec_outer, 4) BOZO_end_integer(i_fec_outer, 4)
...@@ -1130,9 +1130,9 @@ static int main_cable_deliv_sys_(void) ...@@ -1130,9 +1130,9 @@ static int main_cable_deliv_sys_(void)
} }
/* bouquet name */ /* bouquet name */
static int main_bouquet_name_(void) static int main_dvb_bouquet_name_(void)
{ {
BOZO_VARS(bouquet_name); BOZO_VARS(dvb_bouquet_name);
BOZO_START(bouquet name); BOZO_START(bouquet name);
...@@ -1140,7 +1140,7 @@ static int main_bouquet_name_(void) ...@@ -1140,7 +1140,7 @@ static int main_bouquet_name_(void)
BOZO_init_array(i_name_length); BOZO_init_array(i_name_length);
BOZO_begin_array(i_char) BOZO_begin_array(i_char)
BOZO_loop_array_begin(i_char, i_name_length, 0) BOZO_loop_array_begin(i_char, i_name_length, 0)
BOZO_DOJOB(BouquetName); BOZO_DOJOB(dvb_bouquet_name);
BOZO_check_array_begin(i_char, i_name_length) BOZO_check_array_begin(i_char, i_name_length)
BOZO_check_array_gen(i_char, i_name_length) BOZO_check_array_gen(i_char, i_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1154,9 +1154,9 @@ static int main_bouquet_name_(void) ...@@ -1154,9 +1154,9 @@ static int main_bouquet_name_(void)
} }
/* service (i_service_provider_name) */ /* service (i_service_provider_name) */
static int main_service_1(void) static int main_dvb_service_1(void)
{ {
BOZO_VARS(service); BOZO_VARS(dvb_service);
BOZO_START(service (i_service_provider_name)); BOZO_START(service (i_service_provider_name));
...@@ -1165,7 +1165,7 @@ static int main_service_1(void) ...@@ -1165,7 +1165,7 @@ static int main_service_1(void)
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_provider_name_length); BOZO_init_array(i_service_provider_name_length);
BOZO_begin_integer(i_service_type, 8) BOZO_begin_integer(i_service_type, 8)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_integer(i_service_type, 8) BOZO_check_integer(i_service_type, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_type, 8) BOZO_end_integer(i_service_type, 8)
...@@ -1176,7 +1176,7 @@ static int main_service_1(void) ...@@ -1176,7 +1176,7 @@ static int main_service_1(void)
BOZO_init_array(i_service_provider_name_length); BOZO_init_array(i_service_provider_name_length);
BOZO_begin_array(i_service_provider_name) BOZO_begin_array(i_service_provider_name)
BOZO_loop_array_begin(i_service_provider_name, i_service_provider_name_length, 0) BOZO_loop_array_begin(i_service_provider_name, i_service_provider_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length) BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length)
BOZO_check_array_gen(i_service_provider_name, i_service_provider_name_length) BOZO_check_array_gen(i_service_provider_name, i_service_provider_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1190,9 +1190,9 @@ static int main_service_1(void) ...@@ -1190,9 +1190,9 @@ static int main_service_1(void)
} }
/* service (i_service_name) */ /* service (i_service_name) */
static int main_service_2(void) static int main_dvb_service_2(void)
{ {
BOZO_VARS(service); BOZO_VARS(dvb_service);
BOZO_START(service (i_service_name)); BOZO_START(service (i_service_name));
...@@ -1201,7 +1201,7 @@ static int main_service_2(void) ...@@ -1201,7 +1201,7 @@ static int main_service_2(void)
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_name_length); BOZO_init_array(i_service_name_length);
BOZO_begin_integer(i_service_type, 8) BOZO_begin_integer(i_service_type, 8)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_integer(i_service_type, 8) BOZO_check_integer(i_service_type, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_type, 8) BOZO_end_integer(i_service_type, 8)
...@@ -1212,7 +1212,7 @@ static int main_service_2(void) ...@@ -1212,7 +1212,7 @@ static int main_service_2(void)
BOZO_init_array(i_service_name_length); BOZO_init_array(i_service_name_length);
BOZO_begin_array(i_service_name) BOZO_begin_array(i_service_name)
BOZO_loop_array_begin(i_service_name, i_service_name_length, 0) BOZO_loop_array_begin(i_service_name, i_service_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_array_begin(i_service_name, i_service_name_length) BOZO_check_array_begin(i_service_name, i_service_name_length)
BOZO_check_array_gen(i_service_name, i_service_name_length) BOZO_check_array_gen(i_service_name, i_service_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1226,9 +1226,9 @@ static int main_service_2(void) ...@@ -1226,9 +1226,9 @@ static int main_service_2(void)
} }
/* service (both names) */ /* service (both names) */
static int main_service_3(void) static int main_dvb_service_3(void)
{ {
BOZO_VARS(service); BOZO_VARS(dvb_service);
BOZO_START(service (both names)); BOZO_START(service (both names));
...@@ -1238,7 +1238,7 @@ static int main_service_3(void) ...@@ -1238,7 +1238,7 @@ static int main_service_3(void)
BOZO_init_array(i_service_name_length); BOZO_init_array(i_service_name_length);
BOZO_init_array(i_service_provider_name_length); BOZO_init_array(i_service_provider_name_length);
BOZO_begin_integer(i_service_type, 8) BOZO_begin_integer(i_service_type, 8)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_integer(i_service_type, 8) BOZO_check_integer(i_service_type, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_type, 8) BOZO_end_integer(i_service_type, 8)
...@@ -1250,7 +1250,7 @@ static int main_service_3(void) ...@@ -1250,7 +1250,7 @@ static int main_service_3(void)
BOZO_init_array(i_service_provider_name_length); BOZO_init_array(i_service_provider_name_length);
BOZO_begin_array(i_service_name) BOZO_begin_array(i_service_name)
BOZO_loop_array_begin(i_service_name, i_service_name_length, 0) BOZO_loop_array_begin(i_service_name, i_service_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_array_begin(i_service_name, i_service_name_length) BOZO_check_array_begin(i_service_name, i_service_name_length)
BOZO_check_array_gen(i_service_name, i_service_name_length) BOZO_check_array_gen(i_service_name, i_service_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1264,7 +1264,7 @@ static int main_service_3(void) ...@@ -1264,7 +1264,7 @@ static int main_service_3(void)
BOZO_init_array(i_service_provider_name_length); BOZO_init_array(i_service_provider_name_length);
BOZO_begin_array(i_service_provider_name) BOZO_begin_array(i_service_provider_name)
BOZO_loop_array_begin(i_service_provider_name, i_service_provider_name_length, 0) BOZO_loop_array_begin(i_service_provider_name, i_service_provider_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(dvb_service);
BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length) BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length)
BOZO_check_array_gen(i_service_provider_name, i_service_provider_name_length) BOZO_check_array_gen(i_service_provider_name, i_service_provider_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1278,9 +1278,9 @@ static int main_service_3(void) ...@@ -1278,9 +1278,9 @@ static int main_service_3(void)
} }
/* linkage (information service) */ /* linkage (information service) */
static int main_linkage_0(void) static int main_dvb_linkage_0(void)
{ {
BOZO_VARS(linkage); BOZO_VARS(dvb_linkage);
BOZO_START(linkage (information service)); BOZO_START(linkage (information service));
...@@ -1292,7 +1292,7 @@ static int main_linkage_0(void) ...@@ -1292,7 +1292,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transport_stream_id, 16) BOZO_end_integer(i_transport_stream_id, 16)
...@@ -1305,7 +1305,7 @@ static int main_linkage_0(void) ...@@ -1305,7 +1305,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_original_network_id, 16) BOZO_end_integer(i_original_network_id, 16)
...@@ -1318,7 +1318,7 @@ static int main_linkage_0(void) ...@@ -1318,7 +1318,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_id, 16) BOZO_end_integer(i_service_id, 16)
...@@ -1332,7 +1332,7 @@ static int main_linkage_0(void) ...@@ -1332,7 +1332,7 @@ static int main_linkage_0(void)
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_data_length, 0) BOZO_loop_array_begin(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
BOZO_check_array_gen(i_private_data, i_private_data_length) BOZO_check_array_gen(i_private_data, i_private_data_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1346,9 +1346,9 @@ static int main_linkage_0(void) ...@@ -1346,9 +1346,9 @@ static int main_linkage_0(void)
} }
/* linkage (mobile handover, no extra data) */ /* linkage (mobile handover, no extra data) */
static int main_linkage_1(void) static int main_dvb_linkage_1(void)
{ {
BOZO_VARS(linkage); BOZO_VARS(dvb_linkage);
BOZO_START(linkage (mobile handover, no extra data)); BOZO_START(linkage (mobile handover, no extra data));
...@@ -1362,7 +1362,7 @@ static int main_linkage_1(void) ...@@ -1362,7 +1362,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transport_stream_id, 16) BOZO_end_integer(i_transport_stream_id, 16)
...@@ -1377,7 +1377,7 @@ static int main_linkage_1(void) ...@@ -1377,7 +1377,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_original_network_id, 16) BOZO_end_integer(i_original_network_id, 16)
...@@ -1392,7 +1392,7 @@ static int main_linkage_1(void) ...@@ -1392,7 +1392,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_id, 16) BOZO_end_integer(i_service_id, 16)
...@@ -1408,7 +1408,7 @@ static int main_linkage_1(void) ...@@ -1408,7 +1408,7 @@ static int main_linkage_1(void)
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_data_length, 0) BOZO_loop_array_begin(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
BOZO_check_array_gen(i_private_data, i_private_data_length) BOZO_check_array_gen(i_private_data, i_private_data_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1422,9 +1422,9 @@ static int main_linkage_1(void) ...@@ -1422,9 +1422,9 @@ static int main_linkage_1(void)
} }
/* linkage (mobile handover, extra network_id) */ /* linkage (mobile handover, extra network_id) */
static int main_linkage_2(void) static int main_dvb_linkage_2(void)
{ {
BOZO_VARS(linkage); BOZO_VARS(dvb_linkage);
BOZO_START(linkage (mobile handover, extra network_id)); BOZO_START(linkage (mobile handover, extra network_id));
...@@ -1439,7 +1439,7 @@ static int main_linkage_2(void) ...@@ -1439,7 +1439,7 @@ static int main_linkage_2(void)
BOZO_init_integer(i_network_id, 0); BOZO_init_integer(i_network_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transport_stream_id, 16) BOZO_end_integer(i_transport_stream_id, 16)
...@@ -1455,7 +1455,7 @@ static int main_linkage_2(void) ...@@ -1455,7 +1455,7 @@ static int main_linkage_2(void)
BOZO_init_integer(i_network_id, 0); BOZO_init_integer(i_network_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_original_network_id, 16) BOZO_end_integer(i_original_network_id, 16)
...@@ -1471,7 +1471,7 @@ static int main_linkage_2(void) ...@@ -1471,7 +1471,7 @@ static int main_linkage_2(void)
BOZO_init_integer(i_network_id, 0); BOZO_init_integer(i_network_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_id, 16) BOZO_end_integer(i_service_id, 16)
...@@ -1487,7 +1487,7 @@ static int main_linkage_2(void) ...@@ -1487,7 +1487,7 @@ static int main_linkage_2(void)
BOZO_init_integer(i_network_id, 0); BOZO_init_integer(i_network_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_network_id, 16) BOZO_begin_integer(i_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_network_id, 16) BOZO_check_integer(i_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_network_id, 16) BOZO_end_integer(i_network_id, 16)
...@@ -1504,7 +1504,7 @@ static int main_linkage_2(void) ...@@ -1504,7 +1504,7 @@ static int main_linkage_2(void)
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_data_length, 0) BOZO_loop_array_begin(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
BOZO_check_array_gen(i_private_data, i_private_data_length) BOZO_check_array_gen(i_private_data, i_private_data_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1518,9 +1518,9 @@ static int main_linkage_2(void) ...@@ -1518,9 +1518,9 @@ static int main_linkage_2(void)
} }
/* linkage (mobile handover, extra initial_service_id) */ /* linkage (mobile handover, extra initial_service_id) */
static int main_linkage_3(void) static int main_dvb_linkage_3(void)
{ {
BOZO_VARS(linkage); BOZO_VARS(dvb_linkage);
BOZO_START(linkage (mobile handover, extra initial_service_id)); BOZO_START(linkage (mobile handover, extra initial_service_id));
...@@ -1535,7 +1535,7 @@ static int main_linkage_3(void) ...@@ -1535,7 +1535,7 @@ static int main_linkage_3(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transport_stream_id, 16) BOZO_end_integer(i_transport_stream_id, 16)
...@@ -1551,7 +1551,7 @@ static int main_linkage_3(void) ...@@ -1551,7 +1551,7 @@ static int main_linkage_3(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_original_network_id, 16) BOZO_end_integer(i_original_network_id, 16)
...@@ -1567,7 +1567,7 @@ static int main_linkage_3(void) ...@@ -1567,7 +1567,7 @@ static int main_linkage_3(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_id, 16) BOZO_end_integer(i_service_id, 16)
...@@ -1583,7 +1583,7 @@ static int main_linkage_3(void) ...@@ -1583,7 +1583,7 @@ static int main_linkage_3(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_initial_service_id, 16) BOZO_begin_integer(i_initial_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_initial_service_id, 16) BOZO_check_integer(i_initial_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_initial_service_id, 16) BOZO_end_integer(i_initial_service_id, 16)
...@@ -1600,7 +1600,7 @@ static int main_linkage_3(void) ...@@ -1600,7 +1600,7 @@ static int main_linkage_3(void)
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_data_length, 0) BOZO_loop_array_begin(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
BOZO_check_array_gen(i_private_data, i_private_data_length) BOZO_check_array_gen(i_private_data, i_private_data_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1614,9 +1614,9 @@ static int main_linkage_3(void) ...@@ -1614,9 +1614,9 @@ static int main_linkage_3(void)
} }
/* linkage (mobile handover, extra network_id and initial_service_id) */ /* linkage (mobile handover, extra network_id and initial_service_id) */
static int main_linkage_4(void) static int main_dvb_linkage_4(void)
{ {
BOZO_VARS(linkage); BOZO_VARS(dvb_linkage);
BOZO_START(linkage (mobile handover, extra network_id and initial_service_id)); BOZO_START(linkage (mobile handover, extra network_id and initial_service_id));
...@@ -1632,7 +1632,7 @@ static int main_linkage_4(void) ...@@ -1632,7 +1632,7 @@ static int main_linkage_4(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transport_stream_id, 16) BOZO_end_integer(i_transport_stream_id, 16)
...@@ -1649,7 +1649,7 @@ static int main_linkage_4(void) ...@@ -1649,7 +1649,7 @@ static int main_linkage_4(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_original_network_id, 16) BOZO_end_integer(i_original_network_id, 16)
...@@ -1666,7 +1666,7 @@ static int main_linkage_4(void) ...@@ -1666,7 +1666,7 @@ static int main_linkage_4(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_id, 16) BOZO_end_integer(i_service_id, 16)
...@@ -1683,7 +1683,7 @@ static int main_linkage_4(void) ...@@ -1683,7 +1683,7 @@ static int main_linkage_4(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_network_id, 16) BOZO_begin_integer(i_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_network_id, 16) BOZO_check_integer(i_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_network_id, 16) BOZO_end_integer(i_network_id, 16)
...@@ -1700,7 +1700,7 @@ static int main_linkage_4(void) ...@@ -1700,7 +1700,7 @@ static int main_linkage_4(void)
BOZO_init_integer(i_initial_service_id, 0); BOZO_init_integer(i_initial_service_id, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_initial_service_id, 16) BOZO_begin_integer(i_initial_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_initial_service_id, 16) BOZO_check_integer(i_initial_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_initial_service_id, 16) BOZO_end_integer(i_initial_service_id, 16)
...@@ -1718,7 +1718,7 @@ static int main_linkage_4(void) ...@@ -1718,7 +1718,7 @@ static int main_linkage_4(void)
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_data_length, 0) BOZO_loop_array_begin(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
BOZO_check_array_gen(i_private_data, i_private_data_length) BOZO_check_array_gen(i_private_data, i_private_data_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1732,9 +1732,9 @@ static int main_linkage_4(void) ...@@ -1732,9 +1732,9 @@ static int main_linkage_4(void)
} }
/* linkage (event linkage) */ /* linkage (event linkage) */
static int main_linkage_5(void) static int main_dvb_linkage_5(void)
{ {
BOZO_VARS(linkage); BOZO_VARS(dvb_linkage);
BOZO_START(linkage (event linkage)); BOZO_START(linkage (event linkage));
...@@ -1749,7 +1749,7 @@ static int main_linkage_5(void) ...@@ -1749,7 +1749,7 @@ static int main_linkage_5(void)
BOZO_init_boolean(b_event_simulcast, 0); BOZO_init_boolean(b_event_simulcast, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transport_stream_id, 16) BOZO_end_integer(i_transport_stream_id, 16)
...@@ -1765,7 +1765,7 @@ static int main_linkage_5(void) ...@@ -1765,7 +1765,7 @@ static int main_linkage_5(void)
BOZO_init_boolean(b_event_simulcast, 0); BOZO_init_boolean(b_event_simulcast, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_original_network_id, 16) BOZO_end_integer(i_original_network_id, 16)
...@@ -1781,7 +1781,7 @@ static int main_linkage_5(void) ...@@ -1781,7 +1781,7 @@ static int main_linkage_5(void)
BOZO_init_boolean(b_event_simulcast, 0); BOZO_init_boolean(b_event_simulcast, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_service_id, 16) BOZO_end_integer(i_service_id, 16)
...@@ -1797,7 +1797,7 @@ static int main_linkage_5(void) ...@@ -1797,7 +1797,7 @@ static int main_linkage_5(void)
BOZO_init_boolean(b_event_simulcast, 0); BOZO_init_boolean(b_event_simulcast, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_target_event_id, 16) BOZO_begin_integer(i_target_event_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_integer(i_target_event_id, 16) BOZO_check_integer(i_target_event_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_target_event_id, 16) BOZO_end_integer(i_target_event_id, 16)
...@@ -1813,7 +1813,7 @@ static int main_linkage_5(void) ...@@ -1813,7 +1813,7 @@ static int main_linkage_5(void)
BOZO_init_boolean(b_event_simulcast, 0); BOZO_init_boolean(b_event_simulcast, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_boolean(b_target_listed) BOZO_begin_boolean(b_target_listed)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_boolean(b_target_listed) BOZO_check_boolean(b_target_listed)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_target_listed) BOZO_end_boolean(b_target_listed)
...@@ -1829,7 +1829,7 @@ static int main_linkage_5(void) ...@@ -1829,7 +1829,7 @@ static int main_linkage_5(void)
BOZO_init_boolean(b_event_simulcast, 0); BOZO_init_boolean(b_event_simulcast, 0);
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_boolean(b_event_simulcast) BOZO_begin_boolean(b_event_simulcast)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_boolean(b_event_simulcast) BOZO_check_boolean(b_event_simulcast)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_boolean(b_event_simulcast) BOZO_end_boolean(b_event_simulcast)
...@@ -1846,7 +1846,7 @@ static int main_linkage_5(void) ...@@ -1846,7 +1846,7 @@ static int main_linkage_5(void)
BOZO_init_array(i_private_data_length); BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data) BOZO_begin_array(i_private_data)
BOZO_loop_array_begin(i_private_data, i_private_data_length, 0) BOZO_loop_array_begin(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(dvb_linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
BOZO_check_array_gen(i_private_data, i_private_data_length) BOZO_check_array_gen(i_private_data, i_private_data_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1860,9 +1860,9 @@ static int main_linkage_5(void) ...@@ -1860,9 +1860,9 @@ static int main_linkage_5(void)
} }
/* Near Video On Demand reference */ /* Near Video On Demand reference */
static int main_nvod_ref_(void) static int main_dvb_nvod_ref_(void)
{ {
BOZO_VARS(nvod_ref); BOZO_VARS(dvb_nvod_ref);
BOZO_START(Near Video On Demand reference); BOZO_START(Near Video On Demand reference);
...@@ -1870,7 +1870,7 @@ static int main_nvod_ref_(void) ...@@ -1870,7 +1870,7 @@ static int main_nvod_ref_(void)
BOZO_init_array(i_references); BOZO_init_array(i_references);
BOZO_begin_array(p_nvod_refs) BOZO_begin_array(p_nvod_refs)
BOZO_loop_array_begin(p_nvod_refs, i_references, 1) BOZO_loop_array_begin(p_nvod_refs, i_references, 1)
BOZO_DOJOB(NVODReference); BOZO_DOJOB(dvb_nvod_ref);
BOZO_check_array_begin(p_nvod_refs, i_references) BOZO_check_array_begin(p_nvod_refs, i_references)
BOZO_check_array_cmp(p_nvod_refs, i_references, dvbpsi_nvod_ref_t) BOZO_check_array_cmp(p_nvod_refs, i_references, dvbpsi_nvod_ref_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1884,16 +1884,16 @@ static int main_nvod_ref_(void) ...@@ -1884,16 +1884,16 @@ static int main_nvod_ref_(void)
} }
/* time shifted service */ /* time shifted service */
static int main_tshifted_service_(void) static int main_dvb_tshifted_service_(void)
{ {
BOZO_VARS(tshifted_service); BOZO_VARS(dvb_tshifted_service);
BOZO_START(time shifted service); BOZO_START(time shifted service);
/* check i_ref_service_id */ /* check i_ref_service_id */
BOZO_init_integer(i_ref_service_id, 0); BOZO_init_integer(i_ref_service_id, 0);
BOZO_begin_integer(i_ref_service_id, 16) BOZO_begin_integer(i_ref_service_id, 16)
BOZO_DOJOB(TimeShiftedService); BOZO_DOJOB(dvb_tshifted_service);
BOZO_check_integer(i_ref_service_id, 16) BOZO_check_integer(i_ref_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_ref_service_id, 16) BOZO_end_integer(i_ref_service_id, 16)
...@@ -1905,9 +1905,9 @@ static int main_tshifted_service_(void) ...@@ -1905,9 +1905,9 @@ static int main_tshifted_service_(void)
} }
/* short event (event_name) */ /* short event (event_name) */
static int main_short_event_0(void) static int main_dvb_short_event_0(void)
{ {
BOZO_VARS(short_event); BOZO_VARS(dvb_short_event);
BOZO_START(short event (event_name)); BOZO_START(short event (event_name));
...@@ -1918,7 +1918,7 @@ static int main_short_event_0(void) ...@@ -1918,7 +1918,7 @@ static int main_short_event_0(void)
BOZO_init_array(i_event_name_length); BOZO_init_array(i_event_name_length);
i_loop_count = 0; i_loop_count = 0;
BOZO_begin_array(i_iso_639_code) BOZO_begin_array(i_iso_639_code)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_carray(i_iso_639_code) BOZO_check_carray(i_iso_639_code)
BOZO_end_array BOZO_end_array
...@@ -1929,7 +1929,7 @@ static int main_short_event_0(void) ...@@ -1929,7 +1929,7 @@ static int main_short_event_0(void)
BOZO_init_array(i_event_name_length); BOZO_init_array(i_event_name_length);
BOZO_begin_array(i_event_name) BOZO_begin_array(i_event_name)
BOZO_loop_array_begin(i_event_name, i_event_name_length, 0) BOZO_loop_array_begin(i_event_name, i_event_name_length, 0)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_array_begin(i_event_name, i_event_name_length) BOZO_check_array_begin(i_event_name, i_event_name_length)
BOZO_check_array_gen(i_event_name, i_event_name_length) BOZO_check_array_gen(i_event_name, i_event_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1943,9 +1943,9 @@ static int main_short_event_0(void) ...@@ -1943,9 +1943,9 @@ static int main_short_event_0(void)
} }
/* short event (i_text) */ /* short event (i_text) */
static int main_short_event_1(void) static int main_dvb_short_event_1(void)
{ {
BOZO_VARS(short_event); BOZO_VARS(dvb_short_event);
BOZO_START(short event (i_text)); BOZO_START(short event (i_text));
...@@ -1956,7 +1956,7 @@ static int main_short_event_1(void) ...@@ -1956,7 +1956,7 @@ static int main_short_event_1(void)
BOZO_init_array(i_text_length); BOZO_init_array(i_text_length);
i_loop_count = 0; i_loop_count = 0;
BOZO_begin_array(i_iso_639_code) BOZO_begin_array(i_iso_639_code)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_carray(i_iso_639_code) BOZO_check_carray(i_iso_639_code)
BOZO_end_array BOZO_end_array
...@@ -1967,7 +1967,7 @@ static int main_short_event_1(void) ...@@ -1967,7 +1967,7 @@ static int main_short_event_1(void)
BOZO_init_array(i_text_length); BOZO_init_array(i_text_length);
BOZO_begin_array(i_text) BOZO_begin_array(i_text)
BOZO_loop_array_begin(i_text, i_text_length, 0) BOZO_loop_array_begin(i_text, i_text_length, 0)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_array_begin(i_text, i_text_length) BOZO_check_array_begin(i_text, i_text_length)
BOZO_check_array_gen(i_text, i_text_length) BOZO_check_array_gen(i_text, i_text_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -1981,9 +1981,9 @@ static int main_short_event_1(void) ...@@ -1981,9 +1981,9 @@ static int main_short_event_1(void)
} }
/* short event (both) */ /* short event (both) */
static int main_short_event_2(void) static int main_dvb_short_event_2(void)
{ {
BOZO_VARS(short_event); BOZO_VARS(dvb_short_event);
BOZO_START(short event (both)); BOZO_START(short event (both));
...@@ -1993,7 +1993,7 @@ static int main_short_event_2(void) ...@@ -1993,7 +1993,7 @@ static int main_short_event_2(void)
BOZO_init_array(i_event_name_length); BOZO_init_array(i_event_name_length);
i_loop_count = 0; i_loop_count = 0;
BOZO_begin_array(i_iso_639_code) BOZO_begin_array(i_iso_639_code)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_carray(i_iso_639_code) BOZO_check_carray(i_iso_639_code)
BOZO_end_array BOZO_end_array
...@@ -2003,7 +2003,7 @@ static int main_short_event_2(void) ...@@ -2003,7 +2003,7 @@ static int main_short_event_2(void)
BOZO_init_array(i_event_name_length); BOZO_init_array(i_event_name_length);
BOZO_begin_array(i_text) BOZO_begin_array(i_text)
BOZO_loop_array_begin(i_text, i_text_length, 0) BOZO_loop_array_begin(i_text, i_text_length, 0)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_array_begin(i_text, i_text_length) BOZO_check_array_begin(i_text, i_text_length)
BOZO_check_array_gen(i_text, i_text_length) BOZO_check_array_gen(i_text, i_text_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2016,7 +2016,7 @@ static int main_short_event_2(void) ...@@ -2016,7 +2016,7 @@ static int main_short_event_2(void)
BOZO_init_array(i_event_name_length); BOZO_init_array(i_event_name_length);
BOZO_begin_array(i_event_name) BOZO_begin_array(i_event_name)
BOZO_loop_array_begin(i_event_name, i_event_name_length, 0) BOZO_loop_array_begin(i_event_name, i_event_name_length, 0)
BOZO_DOJOB(ShortEvent); BOZO_DOJOB(dvb_short_event);
BOZO_check_array_begin(i_event_name, i_event_name_length) BOZO_check_array_begin(i_event_name, i_event_name_length)
BOZO_check_array_gen(i_event_name, i_event_name_length) BOZO_check_array_gen(i_event_name, i_event_name_length)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2030,9 +2030,9 @@ static int main_short_event_2(void) ...@@ -2030,9 +2030,9 @@ static int main_short_event_2(void)
} }
/* time shifted event */ /* time shifted event */
static int main_tshifted_ev_(void) static int main_dvb_tshifted_ev_(void)
{ {
BOZO_VARS(tshifted_ev); BOZO_VARS(dvb_tshifted_ev);
BOZO_START(time shifted event); BOZO_START(time shifted event);
...@@ -2040,7 +2040,7 @@ static int main_tshifted_ev_(void) ...@@ -2040,7 +2040,7 @@ static int main_tshifted_ev_(void)
BOZO_init_integer(i_ref_service_id, 0); BOZO_init_integer(i_ref_service_id, 0);
BOZO_init_integer(i_ref_event_id, 0); BOZO_init_integer(i_ref_event_id, 0);
BOZO_begin_integer(i_ref_service_id, 16) BOZO_begin_integer(i_ref_service_id, 16)
BOZO_DOJOB(TimeShiftedEvent); BOZO_DOJOB(dvb_tshifted_ev);
BOZO_check_integer(i_ref_service_id, 16) BOZO_check_integer(i_ref_service_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_ref_service_id, 16) BOZO_end_integer(i_ref_service_id, 16)
...@@ -2049,7 +2049,7 @@ static int main_tshifted_ev_(void) ...@@ -2049,7 +2049,7 @@ static int main_tshifted_ev_(void)
BOZO_init_integer(i_ref_service_id, 0); BOZO_init_integer(i_ref_service_id, 0);
BOZO_init_integer(i_ref_event_id, 0); BOZO_init_integer(i_ref_event_id, 0);
BOZO_begin_integer(i_ref_event_id, 16) BOZO_begin_integer(i_ref_event_id, 16)
BOZO_DOJOB(TimeShiftedEvent); BOZO_DOJOB(dvb_tshifted_ev);
BOZO_check_integer(i_ref_event_id, 16) BOZO_check_integer(i_ref_event_id, 16)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_ref_event_id, 16) BOZO_end_integer(i_ref_event_id, 16)
...@@ -2061,16 +2061,16 @@ static int main_tshifted_ev_(void) ...@@ -2061,16 +2061,16 @@ static int main_tshifted_ev_(void)
} }
/* stream identifier */ /* stream identifier */
static int main_stream_identifier_(void) static int main_dvb_stream_identifier_(void)
{ {
BOZO_VARS(stream_identifier); BOZO_VARS(dvb_stream_identifier);
BOZO_START(stream identifier); BOZO_START(stream identifier);
/* check i_component_tag */ /* check i_component_tag */
BOZO_init_integer(i_component_tag, 0); BOZO_init_integer(i_component_tag, 0);
BOZO_begin_integer(i_component_tag, 8) BOZO_begin_integer(i_component_tag, 8)
BOZO_DOJOB(StreamIdentifier); BOZO_DOJOB(dvb_stream_identifier);
BOZO_check_integer(i_component_tag, 8) BOZO_check_integer(i_component_tag, 8)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_component_tag, 8) BOZO_end_integer(i_component_tag, 8)
...@@ -2082,9 +2082,9 @@ static int main_stream_identifier_(void) ...@@ -2082,9 +2082,9 @@ static int main_stream_identifier_(void)
} }
/* CA identifier */ /* CA identifier */
static int main_ca_identifier_(void) static int main_dvb_ca_identifier_(void)
{ {
BOZO_VARS(ca_identifier); BOZO_VARS(dvb_ca_identifier);
BOZO_START(CA identifier); BOZO_START(CA identifier);
...@@ -2092,7 +2092,7 @@ static int main_ca_identifier_(void) ...@@ -2092,7 +2092,7 @@ static int main_ca_identifier_(void)
BOZO_init_array(i_number); BOZO_init_array(i_number);
BOZO_begin_array(p_system) BOZO_begin_array(p_system)
BOZO_loop_array_begin(p_system, i_number, 1) BOZO_loop_array_begin(p_system, i_number, 1)
BOZO_DOJOB(CAIdentifier); BOZO_DOJOB(dvb_ca_identifier);
BOZO_check_array_begin(p_system, i_number) BOZO_check_array_begin(p_system, i_number)
BOZO_check_array_cmp(p_system, i_number, dvbpsi_ca_system_t) BOZO_check_array_cmp(p_system, i_number, dvbpsi_ca_system_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2106,9 +2106,9 @@ static int main_ca_identifier_(void) ...@@ -2106,9 +2106,9 @@ static int main_ca_identifier_(void)
} }
/* content */ /* content */
static int main_content_(void) static int main_dvb_content_(void)
{ {
BOZO_VARS(content); BOZO_VARS(dvb_content);
BOZO_START(content); BOZO_START(content);
...@@ -2116,7 +2116,7 @@ static int main_content_(void) ...@@ -2116,7 +2116,7 @@ static int main_content_(void)
BOZO_init_array(i_contents_number); BOZO_init_array(i_contents_number);
BOZO_begin_array(p_content) BOZO_begin_array(p_content)
BOZO_loop_array_begin(p_content, i_contents_number, 1) BOZO_loop_array_begin(p_content, i_contents_number, 1)
BOZO_DOJOB(Content); BOZO_DOJOB(dvb_content);
BOZO_check_array_begin(p_content, i_contents_number) BOZO_check_array_begin(p_content, i_contents_number)
BOZO_check_array_cmp(p_content, i_contents_number, dvbpsi_content_t) BOZO_check_array_cmp(p_content, i_contents_number, dvbpsi_content_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2130,9 +2130,9 @@ static int main_content_(void) ...@@ -2130,9 +2130,9 @@ static int main_content_(void)
} }
/* parental rating */ /* parental rating */
static int main_parental_rating_(void) static int main_dvb_parental_rating_(void)
{ {
BOZO_VARS(parental_rating); BOZO_VARS(dvb_parental_rating);
BOZO_START(parental rating); BOZO_START(parental rating);
...@@ -2140,7 +2140,7 @@ static int main_parental_rating_(void) ...@@ -2140,7 +2140,7 @@ static int main_parental_rating_(void)
BOZO_init_array(i_ratings_number); BOZO_init_array(i_ratings_number);
BOZO_begin_array(p_parental_rating) BOZO_begin_array(p_parental_rating)
BOZO_loop_array_begin(p_parental_rating, i_ratings_number, 1) BOZO_loop_array_begin(p_parental_rating, i_ratings_number, 1)
BOZO_DOJOB(ParentalRating); BOZO_DOJOB(dvb_parental_rating);
BOZO_check_array_begin(p_parental_rating, i_ratings_number) BOZO_check_array_begin(p_parental_rating, i_ratings_number)
BOZO_check_array_cmp(p_parental_rating, i_ratings_number, dvbpsi_parental_rating_t) BOZO_check_array_cmp(p_parental_rating, i_ratings_number, dvbpsi_parental_rating_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2154,9 +2154,9 @@ static int main_parental_rating_(void) ...@@ -2154,9 +2154,9 @@ static int main_parental_rating_(void)
} }
/* teletext */ /* teletext */
static int main_teletext_(void) static int main_dvb_teletext_(void)
{ {
BOZO_VARS(teletext); BOZO_VARS(dvb_teletext);
BOZO_START(teletext); BOZO_START(teletext);
...@@ -2164,7 +2164,7 @@ static int main_teletext_(void) ...@@ -2164,7 +2164,7 @@ static int main_teletext_(void)
BOZO_init_array(i_pages_number); BOZO_init_array(i_pages_number);
BOZO_begin_array(p_pages) BOZO_begin_array(p_pages)
BOZO_loop_array_begin(p_pages, i_pages_number, 1) BOZO_loop_array_begin(p_pages, i_pages_number, 1)
BOZO_DOJOB(Teletext); BOZO_DOJOB(dvb_teletext);
BOZO_check_array_begin(p_pages, i_pages_number) BOZO_check_array_begin(p_pages, i_pages_number)
BOZO_check_array_cmp(p_pages, i_pages_number, dvbpsi_teletextpage_t) BOZO_check_array_cmp(p_pages, i_pages_number, dvbpsi_teletextpage_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2178,9 +2178,9 @@ static int main_teletext_(void) ...@@ -2178,9 +2178,9 @@ static int main_teletext_(void)
} }
/* local time offset */ /* local time offset */
static int main_local_time_offset_(void) static int main_dvb_local_time_offset_(void)
{ {
BOZO_VARS(local_time_offset); BOZO_VARS(dvb_local_time_offset);
BOZO_START(local time offset); BOZO_START(local time offset);
...@@ -2188,7 +2188,7 @@ static int main_local_time_offset_(void) ...@@ -2188,7 +2188,7 @@ static int main_local_time_offset_(void)
BOZO_init_array(i_local_time_offsets_number); BOZO_init_array(i_local_time_offsets_number);
BOZO_begin_array(p_local_time_offset) BOZO_begin_array(p_local_time_offset)
BOZO_loop_array_begin(p_local_time_offset, i_local_time_offsets_number, 1) BOZO_loop_array_begin(p_local_time_offset, i_local_time_offsets_number, 1)
BOZO_DOJOB(LocalTimeOffset); BOZO_DOJOB(dvb_local_time_offset);
BOZO_check_array_begin(p_local_time_offset, i_local_time_offsets_number) BOZO_check_array_begin(p_local_time_offset, i_local_time_offsets_number)
BOZO_check_array_cmp(p_local_time_offset, i_local_time_offsets_number, dvbpsi_local_time_offset_t) BOZO_check_array_cmp(p_local_time_offset, i_local_time_offsets_number, dvbpsi_local_time_offset_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2202,9 +2202,9 @@ static int main_local_time_offset_(void) ...@@ -2202,9 +2202,9 @@ static int main_local_time_offset_(void)
} }
/* subtitling */ /* subtitling */
static int main_subtitling_(void) static int main_dvb_subtitling_(void)
{ {
BOZO_VARS(subtitling); BOZO_VARS(dvb_subtitling);
BOZO_START(subtitling); BOZO_START(subtitling);
...@@ -2212,7 +2212,7 @@ static int main_subtitling_(void) ...@@ -2212,7 +2212,7 @@ static int main_subtitling_(void)
BOZO_init_array(i_subtitles_number); BOZO_init_array(i_subtitles_number);
BOZO_begin_array(p_subtitle) BOZO_begin_array(p_subtitle)
BOZO_loop_array_begin(p_subtitle, i_subtitles_number, 1) BOZO_loop_array_begin(p_subtitle, i_subtitles_number, 1)
BOZO_DOJOB(Subtitling); BOZO_DOJOB(dvb_subtitling);
BOZO_check_array_begin(p_subtitle, i_subtitles_number) BOZO_check_array_begin(p_subtitle, i_subtitles_number)
BOZO_check_array_cmp(p_subtitle, i_subtitles_number, dvbpsi_subtitle_t) BOZO_check_array_cmp(p_subtitle, i_subtitles_number, dvbpsi_subtitle_t)
BOZO_CLEAN(); BOZO_CLEAN();
...@@ -2226,9 +2226,9 @@ static int main_subtitling_(void) ...@@ -2226,9 +2226,9 @@ static int main_subtitling_(void)
} }
/* terrestial delivery system */ /* terrestial delivery system */
static int main_terr_deliv_sys_(void) static int main_dvb_terr_deliv_sys_(void)
{ {
BOZO_VARS(terr_deliv_sys); BOZO_VARS(dvb_terr_deliv_sys);
BOZO_START(terrestial delivery system); BOZO_START(terrestial delivery system);
...@@ -2246,7 +2246,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2246,7 +2246,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_centre_frequency, 32) BOZO_begin_integer(i_centre_frequency, 32)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_centre_frequency, 32) BOZO_check_integer(i_centre_frequency, 32)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_centre_frequency, 32) BOZO_end_integer(i_centre_frequency, 32)
...@@ -2265,7 +2265,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2265,7 +2265,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_bandwidth, 3) BOZO_begin_integer(i_bandwidth, 3)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_bandwidth, 3) BOZO_check_integer(i_bandwidth, 3)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_bandwidth, 3) BOZO_end_integer(i_bandwidth, 3)
...@@ -2284,7 +2284,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2284,7 +2284,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_priority, 1) BOZO_begin_integer(i_priority, 1)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_priority, 1) BOZO_check_integer(i_priority, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_priority, 1) BOZO_end_integer(i_priority, 1)
...@@ -2303,7 +2303,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2303,7 +2303,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_time_slice_indicator, 1) BOZO_begin_integer(i_time_slice_indicator, 1)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_time_slice_indicator, 1) BOZO_check_integer(i_time_slice_indicator, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_time_slice_indicator, 1) BOZO_end_integer(i_time_slice_indicator, 1)
...@@ -2322,7 +2322,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2322,7 +2322,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_mpe_fec_indicator, 1) BOZO_begin_integer(i_mpe_fec_indicator, 1)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_mpe_fec_indicator, 1) BOZO_check_integer(i_mpe_fec_indicator, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_mpe_fec_indicator, 1) BOZO_end_integer(i_mpe_fec_indicator, 1)
...@@ -2341,7 +2341,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2341,7 +2341,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_constellation, 2) BOZO_begin_integer(i_constellation, 2)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_constellation, 2) BOZO_check_integer(i_constellation, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_constellation, 2) BOZO_end_integer(i_constellation, 2)
...@@ -2360,7 +2360,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2360,7 +2360,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_hierarchy_information, 3) BOZO_begin_integer(i_hierarchy_information, 3)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_hierarchy_information, 3) BOZO_check_integer(i_hierarchy_information, 3)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_hierarchy_information, 3) BOZO_end_integer(i_hierarchy_information, 3)
...@@ -2379,7 +2379,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2379,7 +2379,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_code_rate_hp_stream, 3) BOZO_begin_integer(i_code_rate_hp_stream, 3)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_code_rate_hp_stream, 3) BOZO_check_integer(i_code_rate_hp_stream, 3)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_code_rate_hp_stream, 3) BOZO_end_integer(i_code_rate_hp_stream, 3)
...@@ -2398,7 +2398,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2398,7 +2398,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_code_rate_lp_stream, 3) BOZO_begin_integer(i_code_rate_lp_stream, 3)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_code_rate_lp_stream, 3) BOZO_check_integer(i_code_rate_lp_stream, 3)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_code_rate_lp_stream, 3) BOZO_end_integer(i_code_rate_lp_stream, 3)
...@@ -2417,7 +2417,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2417,7 +2417,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_guard_interval, 2) BOZO_begin_integer(i_guard_interval, 2)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_guard_interval, 2) BOZO_check_integer(i_guard_interval, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_guard_interval, 2) BOZO_end_integer(i_guard_interval, 2)
...@@ -2436,7 +2436,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2436,7 +2436,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_transmission_mode, 2) BOZO_begin_integer(i_transmission_mode, 2)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_transmission_mode, 2) BOZO_check_integer(i_transmission_mode, 2)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_transmission_mode, 2) BOZO_end_integer(i_transmission_mode, 2)
...@@ -2455,7 +2455,7 @@ static int main_terr_deliv_sys_(void) ...@@ -2455,7 +2455,7 @@ static int main_terr_deliv_sys_(void)
BOZO_init_integer(i_transmission_mode, 0); BOZO_init_integer(i_transmission_mode, 0);
BOZO_init_integer(i_other_frequency_flag, 0); BOZO_init_integer(i_other_frequency_flag, 0);
BOZO_begin_integer(i_other_frequency_flag, 1) BOZO_begin_integer(i_other_frequency_flag, 1)
BOZO_DOJOB(TerrDelivSys); BOZO_DOJOB(dvb_terr_deliv_sys);
BOZO_check_integer(i_other_frequency_flag, 1) BOZO_check_integer(i_other_frequency_flag, 1)
BOZO_CLEAN(); BOZO_CLEAN();
BOZO_end_integer(i_other_frequency_flag, 1) BOZO_end_integer(i_other_frequency_flag, 1)
...@@ -2473,55 +2473,55 @@ int main(void) ...@@ -2473,55 +2473,55 @@ int main(void)
int i_err = 0; int i_err = 0;
srand(time(NULL)); srand(time(NULL));
i_err |= main_vstream_1(); i_err |= main_mpeg_vstream_1();
i_err |= main_vstream_2(); i_err |= main_mpeg_vstream_2();
i_err |= main_astream_(); i_err |= main_mpeg_astream_();
i_err |= main_hierarchy_(); i_err |= main_mpeg_hierarchy_();
i_err |= main_registration_(); i_err |= main_mpeg_registration_();
i_err |= main_ds_alignment_(); i_err |= main_mpeg_ds_alignment_();
i_err |= main_target_bg_grid_(); i_err |= main_mpeg_target_bg_grid_();
i_err |= main_vwindow_(); i_err |= main_mpeg_vwindow_();
i_err |= main_ca_(); i_err |= main_mpeg_ca_();
i_err |= main_iso639_(); i_err |= main_mpeg_iso639_();
i_err |= main_system_clock_(); i_err |= main_mpeg_system_clock_();
i_err |= main_mx_buff_utilization_(); i_err |= main_mpeg_mx_buff_utilization_();
i_err |= main_copyright_(); i_err |= main_mpeg_copyright_();
i_err |= main_max_bitrate_(); i_err |= main_mpeg_max_bitrate_();
i_err |= main_private_data_(); i_err |= main_mpeg_private_data_();
i_err |= main_smoothing_buffer_(); i_err |= main_mpeg_smoothing_buffer_();
i_err |= main_std_(); i_err |= main_mpeg_std_();
i_err |= main_ibp_(); i_err |= main_mpeg_ibp_();
i_err |= main_mpeg4_video_(); i_err |= main_mpeg_mpeg4_video_();
i_err |= main_mpeg4_audio_(); i_err |= main_mpeg_mpeg4_audio_();
i_err |= main_network_name_(); i_err |= main_dvb_network_name_();
i_err |= main_service_list_(); i_err |= main_dvb_service_list_();
i_err |= main_stuffing_(); i_err |= main_dvb_stuffing_();
i_err |= main_sat_deliv_sys_(); i_err |= main_dvb_sat_deliv_sys_();
i_err |= main_cable_deliv_sys_(); i_err |= main_dvb_cable_deliv_sys_();
i_err |= main_bouquet_name_(); i_err |= main_dvb_bouquet_name_();
i_err |= main_service_1(); i_err |= main_dvb_service_1();
i_err |= main_service_2(); i_err |= main_dvb_service_2();
i_err |= main_service_3(); i_err |= main_dvb_service_3();
i_err |= main_linkage_0(); i_err |= main_dvb_linkage_0();
i_err |= main_linkage_1(); i_err |= main_dvb_linkage_1();
i_err |= main_linkage_2(); i_err |= main_dvb_linkage_2();
i_err |= main_linkage_3(); i_err |= main_dvb_linkage_3();
i_err |= main_linkage_4(); i_err |= main_dvb_linkage_4();
i_err |= main_linkage_5(); i_err |= main_dvb_linkage_5();
i_err |= main_nvod_ref_(); i_err |= main_dvb_nvod_ref_();
i_err |= main_tshifted_service_(); i_err |= main_dvb_tshifted_service_();
i_err |= main_short_event_0(); i_err |= main_dvb_short_event_0();
i_err |= main_short_event_1(); i_err |= main_dvb_short_event_1();
i_err |= main_short_event_2(); i_err |= main_dvb_short_event_2();
i_err |= main_tshifted_ev_(); i_err |= main_dvb_tshifted_ev_();
i_err |= main_stream_identifier_(); i_err |= main_dvb_stream_identifier_();
i_err |= main_ca_identifier_(); i_err |= main_dvb_ca_identifier_();
i_err |= main_content_(); i_err |= main_dvb_content_();
i_err |= main_parental_rating_(); i_err |= main_dvb_parental_rating_();
i_err |= main_teletext_(); i_err |= main_dvb_teletext_();
i_err |= main_local_time_offset_(); i_err |= main_dvb_local_time_offset_();
i_err |= main_subtitling_(); i_err |= main_dvb_subtitling_();
i_err |= main_terr_deliv_sys_(); i_err |= main_dvb_terr_deliv_sys_();
if(i_err) if(i_err)
fprintf(stderr, "At least one test has FAILED !!!\n"); fprintf(stderr, "At least one test has FAILED !!!\n");
......
misc/test_dr.h
View file @ b43c6fc2
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
#define BOZO_CLEAN() \ #define BOZO_CLEAN() \
dvbpsi_DeleteDescriptors(p_descriptor); dvbpsi_DeleteDescriptors(p_descriptor);
#define BOZO_DOJOB(fname) \ #define BOZO_DOJOB(sname) \
if(!(i_loop_count & 0xffff)) \ if(!(i_loop_count & 0xffff)) \
fprintf(stdout, "\r iteration count: %22"PRI64d, i_loop_count); \ fprintf(stdout, "\r iteration count: %22"PRI64d, i_loop_count); \
i_loop_count++; \ i_loop_count++; \
p_descriptor = dvbpsi_Gen##fname##Dr(&s_decoded, 0); \ p_descriptor = dvbpsi_gen_##sname##_dr(&s_decoded, 0); \
p_new_decoded = dvbpsi_Decode##fname##Dr(p_descriptor); p_new_decoded = dvbpsi_decode_##sname##_dr(p_descriptor);
#define BOZO_START(name) \ #define BOZO_START(name) \
fprintf(stdout, "\"%s\" descriptor check:\n", #name); fprintf(stdout, "\"%s\" descriptor check:\n", #name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment