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> {
9595 w. memory_reserved = 0 ;
9696 } ) ;
9797
98- unsafe { dtvcc_windows_reset ( decoder. as_mut ( ) ) } ;
98+ decoder. handle_reset ( ) ;
9999
100100 * d = Some ( decoder) ;
101101 } ) ;
@@ -326,8 +326,8 @@ mod test {
326326
327327 #[ test]
328328 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 ) ;
331331
332332 // Case 1: cc_type = 2
333333 let mut dtvcc_report = ccx_decoder_dtvcc_report:: default ( ) ;
@@ -369,8 +369,8 @@ mod test {
369369
370370 #[ test]
371371 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 ) ;
374374
375375 // Case 1: Without providing last_sequence
376376 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(
347347
348348#[ cfg( test) ]
349349mod test {
350+ use std:: ffi:: c_void;
351+
352+ use utils:: get_zero_allocated_obj;
353+
350354 use super :: * ;
351355
352356 #[ test]
@@ -381,13 +385,18 @@ mod test {
381385
382386 #[ test]
383387 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) ;
386393
394+ println ! ( "THK" ) ;
387395 let mut decoder_ctx = lib_cc_decode:: default ( ) ;
396+ decoder_ctx. dtvcc_rust = Box :: into_raw ( Box :: new ( dtvcc) ) as * mut c_void ;
388397 let cc_block = [ 0x97 , 0x1F , 0x3C ] ;
389398
390- assert ! ( do_cb( & mut decoder_ctx, & mut dtvcc , & cc_block) ) ;
399+ assert ! ( do_cb( & mut decoder_ctx, & cc_block) ) ;
391400 assert_eq ! ( decoder_ctx. current_field, 3 ) ;
392401 assert_eq ! ( decoder_ctx. cc_stats[ 3 ] , 1 ) ;
393402 assert_eq ! ( decoder_ctx. processed_enough, 0 ) ;
You can’t perform that action at this time.
0 commit comments