File tree Expand file tree Collapse file tree 2 files changed +17
-8
lines changed Expand file tree Collapse file tree 2 files changed +17
-8
lines changed Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ impl<'a> Dtvcc<'a> {
95
95
w. memory_reserved = 0 ;
96
96
} ) ;
97
97
98
- unsafe { dtvcc_windows_reset ( decoder. as_mut ( ) ) } ;
98
+ decoder. handle_reset ( ) ;
99
99
100
100
* d = Some ( decoder) ;
101
101
} ) ;
@@ -326,8 +326,8 @@ mod test {
326
326
327
327
#[ test]
328
328
fn test_process_cc_data ( ) {
329
- let mut dtvcc_ctx = get_zero_allocated_obj :: < dtvcc_ctx > ( ) ;
330
- let mut decoder = Dtvcc :: new ( & mut dtvcc_ctx ) ;
329
+ let mut dtvcc_settings = get_zero_allocated_obj :: < ccx_decoder_dtvcc_settings > ( ) ;
330
+ let mut decoder = Dtvcc :: new ( & mut dtvcc_settings ) ;
331
331
332
332
// Case 1: cc_type = 2
333
333
let mut dtvcc_report = ccx_decoder_dtvcc_report:: default ( ) ;
@@ -369,8 +369,8 @@ mod test {
369
369
370
370
#[ test]
371
371
fn test_process_current_packet ( ) {
372
- let mut dtvcc_ctx = get_zero_allocated_obj :: < dtvcc_ctx > ( ) ;
373
- let mut decoder = Dtvcc :: new ( & mut dtvcc_ctx ) ;
372
+ let mut dtvcc_settings = get_zero_allocated_obj :: < ccx_decoder_dtvcc_settings > ( ) ;
373
+ let mut decoder = Dtvcc :: new ( & mut dtvcc_settings ) ;
374
374
375
375
// Case 1: Without providing last_sequence
376
376
let mut dtvcc_report = ccx_decoder_dtvcc_report:: default ( ) ;
Original file line number Diff line number Diff line change @@ -347,6 +347,10 @@ pub unsafe extern "C" fn ccxr_parse_parameters(
347
347
348
348
#[ cfg( test) ]
349
349
mod test {
350
+ use std:: ffi:: c_void;
351
+
352
+ use utils:: get_zero_allocated_obj;
353
+
350
354
use super :: * ;
351
355
352
356
#[ test]
@@ -381,13 +385,18 @@ mod test {
381
385
382
386
#[ test]
383
387
fn test_do_cb ( ) {
384
- let mut dtvcc_ctx = utils:: get_zero_allocated_obj :: < dtvcc_ctx > ( ) ;
385
- let mut dtvcc = Dtvcc :: new ( & mut dtvcc_ctx) ;
388
+ // Setting up `Dtvcc` & `lib_cc_decode`
389
+ let mut dtvcc_settings = get_zero_allocated_obj :: < ccx_decoder_dtvcc_settings > ( ) ;
390
+ dtvcc_settings. report = Box :: into_raw ( Box :: new ( ccx_decoder_dtvcc_report:: default ( ) ) ) ;
391
+ println ! ( "THK" ) ;
392
+ let dtvcc = Dtvcc :: new ( & mut dtvcc_settings) ;
386
393
394
+ println ! ( "THK" ) ;
387
395
let mut decoder_ctx = lib_cc_decode:: default ( ) ;
396
+ decoder_ctx. dtvcc_rust = Box :: into_raw ( Box :: new ( dtvcc) ) as * mut c_void ;
388
397
let cc_block = [ 0x97 , 0x1F , 0x3C ] ;
389
398
390
- assert ! ( do_cb( & mut decoder_ctx, & mut dtvcc , & cc_block) ) ;
399
+ assert ! ( do_cb( & mut decoder_ctx, & cc_block) ) ;
391
400
assert_eq ! ( decoder_ctx. current_field, 3 ) ;
392
401
assert_eq ! ( decoder_ctx. cc_stats[ 3 ] , 1 ) ;
393
402
assert_eq ! ( decoder_ctx. processed_enough, 0 ) ;
You can’t perform that action at this time.
0 commit comments