From 7d74b4aa68476c9ee0f16dea870f1b4b5441b424 Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Thu, 3 Nov 2011 16:14:47 +0200
Subject: [PATCH] dvb/si: Fix for descriptor 0x6b (Ancillary data descriptor).

The bits were reversed, now they are where they should be.
---
 dvb/si/desc_6b.h                 | 20 ++++++++++----------
 examples/dvb_print_si.output.txt |  2 +-
 examples/dvb_print_si.output.xml |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dvb/si/desc_6b.h b/dvb/si/desc_6b.h
index 9194e33..94f53cd 100644
--- a/dvb/si/desc_6b.h
+++ b/dvb/si/desc_6b.h
@@ -50,7 +50,7 @@ static inline void desc6b_init(uint8_t *p_desc)
 {
     desc_set_tag(p_desc, 0x6b);
     desc_set_length(p_desc, (DESC6B_HEADER_SIZE - DESC_HEADER_SIZE));
-    p_desc[2] = 0x01;
+    p_desc[2] = 0x80;
 }
 
 static inline uint8_t desc6b_get_ancillary_data_indentifier(const uint8_t *p_desc)
@@ -60,7 +60,7 @@ static inline uint8_t desc6b_get_ancillary_data_indentifier(const uint8_t *p_des
 
 static inline void desc6b_set_ancillary_data_indentifier(uint8_t *p_desc, uint8_t i_data)
 {
-    p_desc[2] = i_data | 0x01;
+    p_desc[2] = i_data | 0x80;
 }
 
 #define __DEFINE_FLAG(FLAGNAME, bit) \
@@ -74,13 +74,13 @@ static inline void desc6b_set_ancillary_data_indentifier(uint8_t *p_desc, uint8_
         p_desc[2] = b_##FLAGNAME ? (p_desc[2] | bit) : (p_desc[2] &~ bit); \
     }
 
-__DEFINE_FLAG (dvd_video_ancillary_data     , 0x80)
-__DEFINE_FLAG (extended_ancillary_data      , 0x40)
-__DEFINE_FLAG (announcement_switching_data  , 0x20)
-__DEFINE_FLAG (dab_ancillary_data           , 0x10)
-__DEFINE_FLAG (scale_factor_error_check     , 0x08)
-__DEFINE_FLAG (mpeg4_ancillary_data         , 0x04)
-__DEFINE_FLAG (rds_via_uecp                 , 0x02)
+__DEFINE_FLAG (dvd_video_ancillary_data     , 0x01)
+__DEFINE_FLAG (extended_ancillary_data      , 0x02)
+__DEFINE_FLAG (announcement_switching_data  , 0x04)
+__DEFINE_FLAG (dab_ancillary_data           , 0x08)
+__DEFINE_FLAG (scale_factor_error_check     , 0x10)
+__DEFINE_FLAG (mpeg4_ancillary_data         , 0x20)
+__DEFINE_FLAG (rds_via_uecp                 , 0x40)
 
 #undef __DEFINE_FLAG
 
@@ -95,7 +95,7 @@ static inline void desc6b_print(const uint8_t *p_desc, f_print pf_print,
     switch (i_print_type) {
     case PRINT_XML:
         pf_print(opaque,
-                 "<ANCILLARY_DATA_DESC "
+                 "<ANCILLARY_DATA_DESC"
                  " ancillary_data_indentifier=\"0x%02x\""
                  " dvd_video_ancillary_data_flag=\"%u\""
                  " extended_ancillary_data_flag=\"%u\""
diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt
index 5cedec5..31150f3 100644
--- a/examples/dvb_print_si.output.txt
+++ b/examples/dvb_print_si.output.txt
@@ -327,7 +327,7 @@ new PMT program=20000 version=1 pcrpid=110
     - desc 26 metadata metadata_application_format=0xffff metadata_application_format_identifier=0x00112233 metadata_format=0xff metadata_format_identifier=0xdeadbeaf metadata_service_id=0x88 dsm_cc_flag=1 service_identification_record_length=3 service_identification_record="616263" decoder_config_flags=3 dec_config_identification_record_length=3 dec_config_identification_record_data="414243" decoder_config_metadata_service_id=0
     - desc 28 avc_video profile_idc=0x12 constraint_set0_flag=1 constraint_set1_flag=1 constraint_set2_flag=0 AVC_compatible_flags=0x0a level_idc=0x34 AVC_still_present=0 AVC_24_hour_picture_flag=0
     - desc 2a avc_timing_and_hrd hrd_management_valid_flag=0 picture_and_timing_info_present=1 flag_90khz=0 N=12345678 K=34567890 num_units_in_tick=456789 fixed_frame_rate_flag=1 temporal_poc_flag=0 picture_to_display_conversion_flag=1
-    - desc 6b ancillary_data ancillary_data_indentifier=0xab dvd_video_ancillary_data_flag=1 extended_ancillary_data_flag=0 announcement_switching_data_flag=1 dab_ancillary_data_flag=0 scale_factor_error_check_flag=1 mpeg4_ancillary_data_flag=0 rds_via_uecp_flag=1
+    - desc 6b ancillary_data ancillary_data_indentifier=0xd5 dvd_video_ancillary_data_flag=1 extended_ancillary_data_flag=0 announcement_switching_data_flag=1 dab_ancillary_data_flag=0 scale_factor_error_check_flag=1 mpeg4_ancillary_data_flag=0 rds_via_uecp_flag=1
   * ES pid=127 streamtype=0x0f streamtype_txt="13818-7 Audio with ADTS transport syntax"
     - desc 42 stuffing length=4
     - desc 2b mpeg2_aac_audio profile=0x12 channel_config=0x05 additional_info=0x00
diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml
index 21d7cea..7aadf87 100644
--- a/examples/dvb_print_si.output.xml
+++ b/examples/dvb_print_si.output.xml
@@ -592,8 +592,8 @@
 <DESC id="0x2a" length="15" value="7f7f00bc614e020f76d20006f855bf">
 <AVC_TIMING_AND_HRD_DESC hrd_management_valid_flag="0" picture_and_timing_info_present="1" flag_90khz="0" N="12345678" K="34567890" num_units_in_tick="456789" fixed_frame_rate_flag="1" temporal_poc_flag="0" picture_to_display_conversion_flag="1"/>
 </DESC>
-<DESC id="0x6b" length="1" value="ab">
-<ANCILLARY_DATA_DESC  ancillary_data_indentifier="0xab" dvd_video_ancillary_data_flag="1" extended_ancillary_data_flag="0" announcement_switching_data_flag="1" dab_ancillary_data_flag="0" scale_factor_error_check_flag="1" mpeg4_ancillary_data_flag="0" rds_via_uecp_flag="1"/>
+<DESC id="0x6b" length="1" value="d5">
+<ANCILLARY_DATA_DESC ancillary_data_indentifier="0xd5" dvd_video_ancillary_data_flag="1" extended_ancillary_data_flag="0" announcement_switching_data_flag="1" dab_ancillary_data_flag="0" scale_factor_error_check_flag="1" mpeg4_ancillary_data_flag="0" rds_via_uecp_flag="1"/>
 </DESC>
 </ES>
 <ES pid="127" streamtype="0x0f" streamtype_txt="13818-7 Audio with ADTS transport syntax">