@@ -13,6 +13,7 @@ mod window;
1313use log:: debug as log_debug;
1414
1515use lib_ccxr:: {
16+ common:: DTVCC_MAX_SERVICES ,
1617 debug, fatal,
1718 util:: log:: { DebugMessageFlag , ExitCause } ,
1819} ;
@@ -26,9 +27,6 @@ const CCX_DTVCC_SCREENGRID_COLUMNS: u8 = 210;
2627const CCX_DTVCC_MAX_ROWS : u8 = 15 ;
2728const CCX_DTVCC_MAX_COLUMNS : u8 = 32 * 2 ;
2829
29- /// Maximum number of CEA-708 services
30- pub const CCX_DTVCC_MAX_SERVICES : usize = 63 ;
31-
3230/// Context required for processing 708 data
3331pub struct Dtvcc < ' a > {
3432 pub is_active : bool ,
@@ -229,7 +227,7 @@ pub struct DtvccRust {
229227 pub services_active : Vec < i32 > ,
230228 pub report_enabled : bool ,
231229 pub report : * mut ccx_decoder_dtvcc_report ,
232- pub decoders : [ Option < Box < dtvcc_service_decoder > > ; CCX_DTVCC_MAX_SERVICES ] ,
230+ pub decoders : [ Option < Box < dtvcc_service_decoder > > ; DTVCC_MAX_SERVICES ] ,
233231 pub packet : Vec < u8 > ,
234232 pub packet_length : u8 ,
235233 pub is_header_parsed : bool ,
@@ -274,7 +272,7 @@ impl DtvccRust {
274272 // directly on the heap to avoid stack overflow.
275273 let decoders = {
276274 const INIT : Option < Box < dtvcc_service_decoder > > = None ;
277- let mut decoders = [ INIT ; CCX_DTVCC_MAX_SERVICES ] ;
275+ let mut decoders = [ INIT ; DTVCC_MAX_SERVICES ] ;
278276
279277 for ( i, d) in decoders. iter_mut ( ) . enumerate ( ) {
280278 if i >= opts. services_enabled . len ( ) || !is_true ( opts. services_enabled [ i] ) {
@@ -416,11 +414,7 @@ impl DtvccRust {
416414 /// Process current packet into service blocks
417415 fn process_current_packet ( & mut self , len : u8 ) {
418416 let seq = ( self . packet [ 0 ] & 0xC0 ) >> 6 ;
419- log_debug ! (
420- "dtvcc_process_current_packet: Sequence: {}, packet length: {}" ,
421- seq,
422- len
423- ) ;
417+ log_debug ! ( "dtvcc_process_current_packet: Sequence: {seq}, packet length: {len}" ) ;
424418 if self . packet_length == 0 {
425419 return ;
426420 }
@@ -441,21 +435,15 @@ impl DtvccRust {
441435 while pos < len {
442436 let mut service_number = ( self . packet [ pos as usize ] & 0xE0 ) >> 5 ; // 3 more significant bits
443437 let block_length = self . packet [ pos as usize ] & 0x1F ; // 5 less significant bits
444- log_debug ! (
445- "dtvcc_process_current_packet: Standard header Service number: {}, Block length: {}" ,
446- service_number, block_length
447- ) ;
438+ log_debug ! ( "dtvcc_process_current_packet: Standard header Service number: {service_number}, Block length: {block_length}" ) ;
448439
449440 if service_number == 7 {
450441 // There is an extended header
451442 // CEA-708-E 6.2.2 Extended Service Block Header
452443 pos += 1 ;
453444 service_number = self . packet [ pos as usize ] & 0x3F ; // 6 more significant bits
454445 if service_number > 7 {
455- log_debug ! (
456- "dtvcc_process_current_packet: Illegal service number in extended header: {}" ,
457- service_number
458- ) ;
446+ log_debug ! ( "dtvcc_process_current_packet: Illegal service number in extended header: {service_number}" ) ;
459447 }
460448 }
461449
@@ -518,7 +506,7 @@ impl DtvccRust {
518506 return ;
519507 }
520508
521- for i in 0 ..CCX_DTVCC_MAX_SERVICES {
509+ for i in 0 ..DTVCC_MAX_SERVICES {
522510 if i >= self . services_active . len ( ) || !is_true ( self . services_active [ i] ) {
523511 continue ;
524512 }
0 commit comments