Index: lib/libdvben50221/en50221_hlci.c =================================================================== RCS file: /cvs/linuxtv/dvb-apps/lib/libdvben50221/en50221_hlci.c,v retrieving revision 1.3 diff -p -u -b -r1.3 en50221_hlci.c --- lib/libdvben50221/en50221_hlci.c 23 Oct 2005 20:59:34 -0000 1.3 +++ lib/libdvben50221/en50221_hlci.c 24 Oct 2005 18:03:49 -0000 @@ -66,7 +66,7 @@ static uint16_t copy_en50221_descriptor_ p_en50221_descriptor->descriptor_tag = p_descriptor->descriptor_tag; p_en50221_descriptor->descriptor_length = p_descriptor->descriptor_length; - if(p_descriptor->descriptor_tag != 0x09) { + if(p_descriptor->descriptor_tag != TAG_CA_DESCRIPTOR) { printf("ERROR::Trying to copy a CA descriptor with incorrect tag [%d]. Bailing out.\n", p_descriptor->descriptor_tag); return 16; @@ -129,7 +129,7 @@ static uint16_t copy_en50221_stream_obje &p_en50221_streams_desc[p_en50221_stream->streams_desc_count]; struct descriptor *p_stream_desc = &p_streams->p_descriptors[descriptor_count]; - if (p_stream_desc && p_stream_desc->descriptor_tag == 0x09) { // Copy only CA descriptors + if (p_stream_desc && p_stream_desc->descriptor_tag == TAG_CA_DESCRIPTOR) { // Copy only CA descriptors object_length += copy_en50221_descriptor_object(p_en50221_stream_desc, p_stream_desc); p_en50221_stream->streams_desc_count++; } @@ -168,7 +168,7 @@ static void try_move_ca_descriptors(stru p_stream1 = &p_si->p_pmt->p_streams[i]; for(j = 0; j < p_stream1->streams_desc_count; j++) { p_desc1 = &p_stream1->p_descriptors[j]; - if (p_desc1->descriptor_tag == 0x09) { + if (p_desc1->descriptor_tag == TAG_CA_DESCRIPTOR) { ca_descriptors++; } } @@ -187,7 +187,7 @@ static void try_move_ca_descriptors(stru num_ca1 = 0; for(j = 0; j < p_stream1->streams_desc_count; j++) { p_desc1 = &p_stream1->p_descriptors[j]; - if(p_desc1->descriptor_tag == 0x09) { + if(p_desc1->descriptor_tag == TAG_CA_DESCRIPTOR) { num_ca1++; } } @@ -198,7 +198,7 @@ static void try_move_ca_descriptors(stru num_ca2 = 0; for(j = 0; j < p_stream2->streams_desc_count; j++) { p_desc2 = &p_stream2->p_descriptors[j]; - if(p_desc2->descriptor_tag == 0x09) { + if(p_desc2->descriptor_tag == TAG_CA_DESCRIPTOR) { num_ca2++; } } @@ -207,7 +207,7 @@ static void try_move_ca_descriptors(stru if(num_ca1 == num_ca2) { for(j = 0; j < p_stream1->streams_desc_count; j++) { p_desc1 = &p_stream1->p_descriptors[j]; - if(p_desc1->descriptor_tag == 0x09) { + if(p_desc1->descriptor_tag == TAG_CA_DESCRIPTOR) { found_match = 0; for(l = 0; l < p_stream2->streams_desc_count; l++) { p_desc2 = &p_stream2->p_descriptors[l]; @@ -242,7 +242,7 @@ static void try_move_ca_descriptors(stru p_desc1 = &p_stream1->p_descriptors[j]; // Copy only CA descriptors - if (p_desc1->descriptor_tag == 0x09) { + if (p_desc1->descriptor_tag == TAG_CA_DESCRIPTOR) { // Check that this descriptor has not already been copied found = 0; for(k = 0; k < p_si->p_pmt->program_desc_count; k++) { @@ -326,7 +326,7 @@ static uint16_t copy_en50221_pmt_object( printf("%s: CA descriptor=[%02x] found, @ [%p], descriptor length=[%02x]\n", __FUNCTION__, p_prog_desc->descriptor_tag, &p_prog_desc, p_prog_desc->descriptor_length); - if (p_prog_desc->descriptor_tag == 0x09) { // Copy only CA descriptors + if (p_prog_desc->descriptor_tag == TAG_CA_DESCRIPTOR) { // Copy only CA descriptors p_en50221_descriptor = (struct descriptor *) &p_descriptor_objects[ca_descriptors]; object_length += copy_en50221_descriptor_object(p_en50221_descriptor, p_prog_desc); printf("%s: [%d] CA descriptor copied\n", __FUNCTION__, ca_descriptors); Index: lib/libdvbsi/descriptor.c =================================================================== RCS file: /cvs/linuxtv/dvb-apps/lib/libdvbsi/descriptor.c,v retrieving revision 1.4 diff -p -u -b -r1.4 descriptor.c --- lib/libdvbsi/descriptor.c 23 Oct 2005 20:59:34 -0000 1.4 +++ lib/libdvbsi/descriptor.c 24 Oct 2005 18:04:08 -0000 @@ -1531,193 +1531,193 @@ void deallocate_descriptor_storage(struc { switch(p_descriptor->descriptor_tag) { - case 0x02: + case TAG_VIDEO_STREAM_DESCRIPTOR: deallocate_video_stream_descriptor(p_descriptor); break; - case 0x03: + case TAG_AUDIO_STREAM_DESCRIPTOR: deallocate_audio_stream_descriptor(p_descriptor); break; - case 0x04: + case TAG_HIERARCHY_DESCRIPTOR: deallocate_hierarchy_descriptor(p_descriptor); break; - case 0x05: + case TAG_REGISTRATION_DESCRIPTOR: deallocate_registration_descriptor(p_descriptor); break; - case 0x06: + case TAG_DATA_STREAM_ALIGNMENT_DESCRIPTOR: deallocate_data_stream_alignment_descriptor(p_descriptor); break; - case 0x07: + case TAG_TARGET_BACKGROUND_GRID_DESCRIPTOR: deallocate_target_background_grid_descriptor(p_descriptor); break; - case 0x08: + case TAG_VIDEO_WINDOW_DESCRIPTOR: deallocate_video_window_descriptor(p_descriptor); break; - case 0x09: /* CA descriptor */ + case TAG_CA_DESCRIPTOR: /* CA descriptor */ deallocate_ca_descriptor(p_descriptor); break; - case 0x0a: + case TAG_ISO_639_LANGUAGE_DESCRIPTOR: deallocate_iso_639_language_descriptor(p_descriptor); break; - case 0x0b: + case TAG_SYSTEM_CLOCK_DESCRIPTOR: deallocate_system_clock_descriptor(p_descriptor); break; - case 0x0c: + case TAG_MULTIPLEX_BUFFER_UTILIZATION_DESCRIPTOR: deallocate_multiplex_buffer_utilization_descriptor(p_descriptor); break; - case 0x0d: + case TAG_COPYRIGHT_DESCRIPTOR: deallocate_copyright_descriptor(p_descriptor); break; - case 0x0e: + case TAG_MAXIMUM_BITRATE_DESCRIPTOR: deallocate_maximum_bitrate_descriptor(p_descriptor); break; - case 0x0f: + case TAG_PRIVATE_DATA_INDICATOR_DESCRIPTOR: deallocate_private_data_indicator_descriptor(p_descriptor); break; - case 0x10: + case TAG_SMOOTHING_BUFFER_DESCRIPTOR: deallocate_smoothing_buffer_descriptor(p_descriptor); break; - case 0x11: + case TAG_STD_DESCRIPTOR: deallocate_std_descriptor(p_descriptor); break; - case 0x12: + case TAG_IBP_DESCRIPTOR: deallocate_ibp_descriptor(p_descriptor); break; - case 0x1b: + case TAG_MPEG_4_VIDEO_DESCRIPTOR: deallocate_mpeg_4_video_descriptor(p_descriptor); break; - case 0x1c: + case TAG_MPEG_4_AUDIO_DESCRIPTOR: deallocate_mpeg_4_audio_descriptor(p_descriptor); break; - case 0x1d: + case TAG_IOD_DESCRIPTOR: deallocate_iod_descriptor(p_descriptor); break; - case 0x1e: + case TAG_SL_DESCRIPTOR: deallocate_sl_descriptor(p_descriptor); break; - case 0x1f: + case TAG_FMC_DESCRIPTOR: deallocate_fmc_descriptor(p_descriptor); break; - case 0x20: + case TAG_EXTERNAL_ES_ID_DESCRIPTOR: deallocate_external_es_id_descriptor(p_descriptor); break; - case 0x21: + case TAG_MUXCODE_DESCRIPTOR: deallocate_muxcode_descriptor(p_descriptor); break; - case 0x22: + case TAG_FMX_BUFFER_SIZE_DESCRIPTOR: deallocate_fmxbuffer_size_descriptor(p_descriptor); break; - case 0x23: + case TAG_MULTIPLEX_BUFFER_DESCRIPTOR: deallocate_multiplex_buffer_descriptor(p_descriptor); break; - case 0x40: + case TAG_NETWORK_NAME_DESCRIPTOR: deallocate_network_name_descriptor(p_descriptor); break; - case 0x41: + case TAG_SERVICE_LIST_DESCRIPTOR: deallocate_service_list_descriptor(p_descriptor); break; - case 0x42: + case TAG_STUFFING_DESCRIPTOR: deallocate_stuffing_descriptor(p_descriptor); break; - case 0x43: + case TAG_SATTELITE_DELIVERY_SYSTEM_DESCRIPTOR: deallocate_satellite_delivery_system(p_descriptor); break; - case 0x44: + case TAG_CABLE_DELIVERY_SYSTEM_DESCRIPTOR: deallocate_cable_delivery_system(p_descriptor); break; - case 0x47: + case TAG_BOUQUET_NAME_DESCRIPTOR: deallocate_bouquet_name_descriptor(p_descriptor); break; - case 0x48: + case TAG_SERVICE_DESCRIPTOR: deallocate_service_descriptor(p_descriptor); break; - case 0x49: + case TAG_COUNTRY_AVAILABILITY_DESCRIPTOR: deallocate_country_availability_descriptor(p_descriptor); break; - case 0x4a: + case TAG_LINKAGE_DESCRIPTOR: deallocate_linkage_descriptor(p_descriptor); break; - case 0x4b: + case TAG_NVOD_REFERENCE_DESCRIPTOR: deallocate_nvod_reference_descriptor(p_descriptor); break; - case 0x4c: + case TAG_TIME_SHIFTED_SERVICE_DESCRIPTOR: deallocate_time_shifted_service_descriptor(p_descriptor); break; - case 0x4d: + case TAG_SHORT_EVENT_DESCRIPTOR: deallocate_short_event_descriptor(p_descriptor); break; - case 0x4e: + case TAG_EXTENDED_EVENT_DESCRIPTOR: deallocate_extended_event_descriptor(p_descriptor); break; - case 0x4f: + case TAG_TIME_SHIFTED_EVENT_DESCRIPTOR: deallocate_time_shifted_event_descriptor(p_descriptor); break; - case 0x50: + case TAG_COMPONENT_DESCRIPTOR: deallocate_component_descriptor(p_descriptor); break; - case 0x51: + case TAG_MOSAIC_DESCRIPTOR: deallocate_mosaic_descriptor(p_descriptor); break; - case 0x52: + case TAG_STREAM_IDENTIFIER_DESCRIPTOR: deallocate_stream_identifier_descriptor(p_descriptor); break; - case 0x53: + case TAG_CA_IDENTIFIER_DESCRIPTOR: deallocate_ca_identifier_descriptor(p_descriptor); break; - case 0x54: + case TAG_CONTENT_DESCRIPTOR: deallocate_content_descriptor(p_descriptor); break; - case 0x55: + case TAG_PARENTAL_RATING_DESCRIPTOR: deallocate_parental_rating_descriptor(p_descriptor); break; - case 0x56: + case TAG_TELETEXT_DESCRIPTOR: deallocate_teletext_descriptor(p_descriptor); break; - case 0x57: + case TAG_TELEPHONE_DESCRIPTOR: deallocate_telephone_descriptor(p_descriptor); break; - case 0x58: + case TAG_LOCAL_TIME_OFFSET_DESCRIPTOR: deallocate_local_time_offset_descriptor(p_descriptor); break; - case 0x59: + case TAG_SUBTITLING_DESCRIPTOR: deallocate_subtitling_descriptor(p_descriptor); break; - case 0x5a: + case TAG_TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR: deallocate_terrestrial_delivery_system(p_descriptor); break; - case 0x5b: + case TAG_MULTILINGUAL_NETWORK_NAME_DESCRIPTOR: deallocate_multilingual_network_name_descriptor(p_descriptor); break; - case 0x5c: + case TAG_MULTILINGUAL_BOUQUET_NAME_DESCRIPTOR: deallocate_multilingual_bouquet_name_descriptor(p_descriptor); break; -/* case 0x5d: */ +/* case TAG_MULTILINGUAL_SERVICE_NAME_DESCRIPTOR: */ /* deallocate_multilingual_service_name_descriptor(p_descriptor); */ /* break; */ -/* case 0x5e: */ +/* case TAG_MULTILINGUAL_COMPONENT_DESCRIPTOR: */ /* deallocate_multilingual_component_descriptor(p_descriptor); */ /* break; */ -/* case 0x5f: */ +/* case TAG_PRIVATE_DATA_SPECIFIER_DESCRIPTOR: */ /* deallocate_private_data_specifier_descriptor(p_descriptor); */ /* break; */ -/* case 0x60: */ +/* case TAG_SERVICE_MOVE_DESCRIPTOR: */ /* deallocate_service_move_descriptor(p_descriptor); */ /* break; */ -/* case 0x61: */ +/* case TAG_SHORT_SMOOTHING_BUFFER_DESCRIPTOR: */ /* deallocate_short_smoothing_buffer_descriptor(p_descriptor); */ /* break; */ -/* case 0x62: */ +/* case TAG_FREQUENCY_LIST_DESCRIPTOR: */ /* deallocate_frequency_list_descriptor(p_descriptor); */ /* break; */ -/* case 0x63: */ +/* case TAG_PARTIAL_TRANSPORT_DESCRIPTOR: */ /* dealloc_partial_transport_stream(p_descriptor); */ /* break; */ -/* case 0x64: */ +/* case TAG_DATA_BROADCAST_DESCRIPTOR: */ /* deallocate_data_broadcast_descriptor(p_descriptor); */ /* break; */ -/* case 0x65: */ +/* case TAG_CA_SYSTEM_DESCRIPTOR: */ /* dealloc_ca_system_descriptor(p_descriptor); */ /* break; */ -/* case 0x66: */ +/* case TAG_DATA_BROADCAST_ID_DESCRIPTOR: */ /* deallocate_data_broadcast_id_descriptor(p_descriptor); */ /* break; */ default: /* parse an unknown */ @@ -1739,193 +1739,193 @@ uint16_t parse_descriptor(struct descrip p_descriptor->descriptor_tag, p_descriptor->descriptor_length); switch (p_descriptor->descriptor_tag) { - case 0x02: + case TAG_VIDEO_STREAM_DESCRIPTOR: pos = parse_video_stream_descriptor(p_descriptor, buf, pos); break; - case 0x03: + case TAG_AUDIO_STREAM_DESCRIPTOR: pos = parse_audio_stream_descriptor(p_descriptor, buf, pos); break; - case 0x04: + case TAG_HIERARCHY_DESCRIPTOR: pos = parse_hierarchy_descriptor(p_descriptor, buf, pos); break; - case 0x05: + case TAG_REGISTRATION_DESCRIPTOR: pos = parse_registration_descriptor(p_descriptor, buf, pos); break; - case 0x06: + case TAG_DATA_STREAM_ALIGNMENT_DESCRIPTOR: pos = parse_data_stream_alignment_descriptor(p_descriptor, buf, pos); break; - case 0x07: + case TAG_TARGET_BACKGROUND_GRID_DESCRIPTOR: pos = parse_target_background_grid_descriptor(p_descriptor, buf, pos); break; - case 0x08: + case TAG_VIDEO_WINDOW_DESCRIPTOR: pos = parse_video_window_descriptor(p_descriptor, buf, pos); break; - case 0x09: /* CA descriptor */ + case TAG_CA_DESCRIPTOR: /* CA descriptor */ pos = parse_ca_descriptor(p_descriptor, buf, pos); break; - case 0x0a: + case TAG_ISO_639_LANGUAGE_DESCRIPTOR: pos = parse_iso_639_language_descriptor(p_descriptor, buf, pos); break; - case 0x0b: + case TAG_SYSTEM_CLOCK_DESCRIPTOR: pos = parse_system_clock_descriptor(p_descriptor, buf, pos); break; - case 0x0c: + case TAG_MULTIPLEX_BUFFER_UTILIZATION_DESCRIPTOR: pos = parse_multiplex_buffer_utilization_descriptor(p_descriptor, buf, pos); break; - case 0x0d: + case TAG_COPYRIGHT_DESCRIPTOR: pos = parse_copyright_descriptor(p_descriptor, buf, pos); break; - case 0x0e: + case TAG_MAXIMUM_BITRATE_DESCRIPTOR: pos = parse_maximum_bitrate_descriptor(p_descriptor, buf, pos); break; - case 0x0f: + case TAG_PRIVATE_DATA_INDICATOR_DESCRIPTOR: pos = parse_private_data_indicator_descriptor(p_descriptor, buf, pos); break; - case 0x10: + case TAG_SMOOTHING_BUFFER_DESCRIPTOR: pos = parse_smoothing_buffer_descriptor(p_descriptor, buf, pos); break; - case 0x11: + case TAG_STD_DESCRIPTOR: pos = parse_std_descriptor(p_descriptor, buf, pos); break; - case 0x12: + case TAG_IBP_DESCRIPTOR: pos = parse_ibp_descriptor(p_descriptor, buf, pos); break; - case 0x1b: + case TAG_MPEG_4_VIDEO_DESCRIPTOR: pos = parse_mpeg_4_video_descriptor(p_descriptor, buf, pos); break; - case 0x1c: + case TAG_MPEG_4_AUDIO_DESCRIPTOR: pos = parse_mpeg_4_audio_descriptor(p_descriptor, buf, pos); break; - case 0x1d: + case TAG_IOD_DESCRIPTOR: pos = parse_iod_descriptor(p_descriptor, buf, pos); break; - case 0x1e: + case TAG_SL_DESCRIPTOR: pos = parse_sl_descriptor(p_descriptor, buf, pos); break; - case 0x1f: + case TAG_FMC_DESCRIPTOR: pos = parse_fmc_descriptor(p_descriptor, buf, pos); break; - case 0x20: + case TAG_EXTERNAL_ES_ID_DESCRIPTOR: pos = parse_external_es_id_descriptor(p_descriptor, buf, pos); break; - case 0x21: + case TAG_MUXCODE_DESCRIPTOR: pos = parse_muxcode_descriptor(p_descriptor, buf, pos); break; - case 0x22: + case TAG_FMX_BUFFER_SIZE_DESCRIPTOR: pos = parse_fmxbuffer_size_descriptor(p_descriptor, buf, pos); break; - case 0x23: + case TAG_MULTIPLEX_BUFFER_DESCRIPTOR: pos = parse_multiplex_buffer_descriptor(p_descriptor, buf, pos); break; - case 0x40: + case TAG_NETWORK_NAME_DESCRIPTOR: pos = parse_network_name_descriptor(p_descriptor, buf, pos); break; - case 0x41: + case TAG_SERVICE_LIST_DESCRIPTOR: pos = parse_service_list_descriptor(p_descriptor, buf, pos); break; - case 0x42: + case TAG_STUFFING_DESCRIPTOR: pos = parse_stuffing_descriptor(p_descriptor, buf, pos); break; - case 0x43: + case TAG_SATTELITE_DELIVERY_SYSTEM_DESCRIPTOR: pos = parse_satellite_delivery_system(p_descriptor, buf, pos); break; - case 0x44: + case TAG_CABLE_DELIVERY_SYSTEM_DESCRIPTOR: pos = parse_cable_delivery_system(p_descriptor, buf, pos); break; - case 0x47: + case TAG_BOUQUET_NAME_DESCRIPTOR: pos = parse_bouquet_name_descriptor(p_descriptor, buf, pos); break; - case 0x48: + case TAG_SERVICE_DESCRIPTOR: pos = parse_service_descriptor(p_descriptor, buf, pos); break; - case 0x49: + case TAG_COUNTRY_AVAILABILITY_DESCRIPTOR: pos = parse_country_availability_descriptor(p_descriptor, buf, pos); break; - case 0x4a: + case TAG_LINKAGE_DESCRIPTOR: pos = parse_linkage_descriptor(p_descriptor, buf, pos); break; - case 0x4b: + case TAG_NVOD_REFERENCE_DESCRIPTOR: pos = parse_nvod_reference_descriptor(p_descriptor, buf, pos); break; - case 0x4c: + case TAG_TIME_SHIFTED_SERVICE_DESCRIPTOR: pos = parse_time_shifted_service_descriptor(p_descriptor, buf, pos); break; - case 0x4d: + case TAG_SHORT_EVENT_DESCRIPTOR: pos = parse_short_event_descriptor(p_descriptor, buf, pos); break; - case 0x4e: + case TAG_EXTENDED_EVENT_DESCRIPTOR: pos = parse_extended_event_descriptor(p_descriptor, buf, pos); break; - case 0x4f: + case TAG_TIME_SHIFTED_EVENT_DESCRIPTOR: pos = parse_time_shifted_event_descriptor(p_descriptor, buf, pos); break; - case 0x50: + case TAG_COMPONENT_DESCRIPTOR: pos = parse_component_descriptor(p_descriptor, buf, pos); break; - case 0x51: + case TAG_MOSAIC_DESCRIPTOR: pos = parse_mosaic_descriptor(p_descriptor, buf, pos); break; - case 0x52: + case TAG_STREAM_IDENTIFIER_DESCRIPTOR: pos = parse_stream_identifier_descriptor(p_descriptor, buf, pos); break; - case 0x53: + case TAG_CA_IDENTIFIER_DESCRIPTOR: pos = parse_ca_identifier_descriptor(p_descriptor, buf, pos); break; - case 0x54: + case TAG_CONTENT_DESCRIPTOR: pos = parse_content_descriptor(p_descriptor, buf, pos); break; - case 0x55: + case TAG_PARENTAL_RATING_DESCRIPTOR: pos = parse_parental_rating_descriptor(p_descriptor, buf, pos); break; - case 0x56: + case TAG_TELETEXT_DESCRIPTOR: pos = parse_teletext_descriptor(p_descriptor, buf, pos); break; - case 0x57: + case TAG_TELEPHONE_DESCRIPTOR: pos = parse_telephone_descriptor(p_descriptor, buf, pos); break; - case 0x58: + case TAG_LOCAL_TIME_OFFSET_DESCRIPTOR: pos = parse_local_time_offset_descriptor(p_descriptor, buf, pos); break; - case 0x59: + case TAG_SUBTITLING_DESCRIPTOR: pos = parse_subtitling_descriptor(p_descriptor, buf, pos); break; - case 0x5a: + case TAG_TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR: pos = parse_terrestrial_delivery_system(p_descriptor, buf, pos); break; - case 0x5b: + case TAG_MULTILINGUAL_NETWORK_NAME_DESCRIPTOR: pos = parse_multilingual_network_name_descriptor(p_descriptor, buf, pos); break; - case 0x5c: + case TAG_MULTILINGUAL_BOUQUET_NAME_DESCRIPTOR: pos = parse_multilingual_bouquet_name_descriptor(p_descriptor, buf, pos); break; -/* case 0x5d: */ +/* case TAG_MULTILINGUAL_SERVICE_NAME_DESCRIPTOR: */ /* pos = parse_multilingual_service_name_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x5e: */ +/* case TAG_MULTILINGUAL_COMPONENT_DESCRIPTOR: */ /* pos = parse_multilingual_component_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x5f: */ +/* case TAG_PRIVATE_DATA_SPECIFIER_DESCRIPTOR: */ /* pos = parse_private_data_specifier_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x60: */ +/* case TAG_SERVICE_MOVE_DESCRIPTOR: */ /* pos = parse_service_move_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x61: */ +/* case TAG_SHORT_SMOOTHING_BUFFER_DESCRIPTOR: */ /* pos = parse_short_smoothing_buffer_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x62: */ +/* case TAG_FREQUENCY_LIST_DESCRIPTOR: */ /* pos = parse_frequency_list_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x63: */ +/* case TAG_PARTIAL_TRANSPORT_DESCRIPTOR: */ /* pos = pars_partial_transport_stream(p_descriptor, buf, pos); */ /* break; */ -/* case 0x64: */ +/* case TAG_DATA_BROADCAST_DESCRIPTOR: */ /* pos = parse_data_broadcast_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x65: */ +/* case TAG_CA_SYSTEM_DESCRIPTOR: */ /* pos = parse_ca_system_descriptor(p_descriptor, buf, pos); */ /* break; */ -/* case 0x66: */ +/* case TAG_DATA_BROADCAST_ID_DESCRIPTOR: */ /* pos = parse_data_broadcast_id_descriptor(p_descriptor, buf, pos); */ /* break; */ default: /* parse an unknown */ Index: lib/libdvbsi/descriptor.h =================================================================== RCS file: /cvs/linuxtv/dvb-apps/lib/libdvbsi/descriptor.h,v retrieving revision 1.3 diff -p -u -b -r1.3 descriptor.h --- lib/libdvbsi/descriptor.h 23 Oct 2005 20:59:34 -0000 1.3 +++ lib/libdvbsi/descriptor.h 24 Oct 2005 18:04:09 -0000 @@ -26,6 +26,70 @@ #include #include "pmt.h" +#define TAG_VIDEO_STREAM_DESCRIPTOR 0x02 +#define TAG_AUDIO_STREAM_DESCRIPTOR 0x03 +#define TAG_HIERARCHY_DESCRIPTOR 0x04 +#define TAG_REGISTRATION_DESCRIPTOR 0x05 +#define TAG_DATA_STREAM_ALIGNMENT_DESCRIPTOR 0x06 +#define TAG_TARGET_BACKGROUND_GRID_DESCRIPTOR 0x07 +#define TAG_VIDEO_WINDOW_DESCRIPTOR 0x08 +#define TAG_CA_DESCRIPTOR 0x09 +#define TAG_ISO_639_LANGUAGE_DESCRIPTOR 0x0a +#define TAG_SYSTEM_CLOCK_DESCRIPTOR 0x0b +#define TAG_MULTIPLEX_BUFFER_UTILIZATION_DESCRIPTOR 0x0c +#define TAG_COPYRIGHT_DESCRIPTOR 0x0d +#define TAG_MAXIMUM_BITRATE_DESCRIPTOR 0x0e +#define TAG_PRIVATE_DATA_INDICATOR_DESCRIPTOR 0x0f +#define TAG_SMOOTHING_BUFFER_DESCRIPTOR 0x10 +#define TAG_STD_DESCRIPTOR 0x11 +#define TAG_IBP_DESCRIPTOR 0x12 +#define TAG_MPEG_4_VIDEO_DESCRIPTOR 0x1b +#define TAG_MPEG_4_AUDIO_DESCRIPTOR 0x1c +#define TAG_IOD_DESCRIPTOR 0x1d +#define TAG_SL_DESCRIPTOR 0x1e +#define TAG_FMC_DESCRIPTOR 0x1f +#define TAG_EXTERNAL_ES_ID_DESCRIPTOR 0x20 +#define TAG_MUXCODE_DESCRIPTOR 0x21 +#define TAG_FMX_BUFFER_SIZE_DESCRIPTOR 0x22 +#define TAG_MULTIPLEX_BUFFER_DESCRIPTOR 0x23 +#define TAG_NETWORK_NAME_DESCRIPTOR 0x40 +#define TAG_SERVICE_LIST_DESCRIPTOR 0x41 +#define TAG_STUFFING_DESCRIPTOR 0x42 +#define TAG_SATTELITE_DELIVERY_SYSTEM_DESCRIPTOR 0x43 +#define TAG_CABLE_DELIVERY_SYSTEM_DESCRIPTOR 0x44 +#define TAG_BOUQUET_NAME_DESCRIPTOR 0x47 +#define TAG_SERVICE_DESCRIPTOR 0x48 +#define TAG_COUNTRY_AVAILABILITY_DESCRIPTOR 0x49 +#define TAG_LINKAGE_DESCRIPTOR 0x4a +#define TAG_NVOD_REFERENCE_DESCRIPTOR 0x4b +#define TAG_TIME_SHIFTED_SERVICE_DESCRIPTOR 0x4c +#define TAG_SHORT_EVENT_DESCRIPTOR 0x4d +#define TAG_EXTENDED_EVENT_DESCRIPTOR 0x4e +#define TAG_TIME_SHIFTED_EVENT_DESCRIPTOR 0x4f +#define TAG_COMPONENT_DESCRIPTOR 0x50 +#define TAG_MOSAIC_DESCRIPTOR 0x51 +#define TAG_STREAM_IDENTIFIER_DESCRIPTOR 0x52 +#define TAG_CA_IDENTIFIER_DESCRIPTOR 0x53 +#define TAG_CONTENT_DESCRIPTOR 0x54 +#define TAG_PARENTAL_RATING_DESCRIPTOR 0x55 +#define TAG_TELETEXT_DESCRIPTOR 0x56 +#define TAG_TELEPHONE_DESCRIPTOR 0x57 +#define TAG_LOCAL_TIME_OFFSET_DESCRIPTOR 0x58 +#define TAG_SUBTITLING_DESCRIPTOR 0x59 +#define TAG_TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR 0x5a +#define TAG_MULTILINGUAL_NETWORK_NAME_DESCRIPTOR 0x5b +#define TAG_MULTILINGUAL_BOUQUET_NAME_DESCRIPTOR 0x5c +#define TAG_MULTILINGUAL_SERVICE_NAME_DESCRIPTOR 0x5d +#define TAG_MULTILINGUAL_COMPONENT_DESCRIPTOR 0x5e +#define TAG_PRIVATE_DATA_SPECIFIER_DESCRIPTOR 0x5f +#define TAG_SERVICE_MOVE_DESCRIPTOR 0x60 +#define TAG_SHORT_SMOOTHING_BUFFER_DESCRIPTOR 0x61 +#define TAG_FREQUENCY_LIST_DESCRIPTOR 0x62 +#define TAG_PARTIAL_TRANSPORT_DESCRIPTOR 0x63 +#define TAG_DATA_BROADCAST_DESCRIPTOR 0x64 +#define TAG_CA_SYSTEM_DESCRIPTOR 0x65 +#define TAG_DATA_BROADCAST_ID_DESCRIPTOR 0x66 + struct iso_639_language_code { unsigned iso_639_language_code: 24; unsigned audio_type: 8;