Skip to content

Commit 599ad7c

Browse files
fix: rust build
1 parent 0e00666 commit 599ad7c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/rust/src/decoder/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const CCX_DTVCC_SCREENGRID_ROWS: u8 = 75;
2323
const CCX_DTVCC_SCREENGRID_COLUMNS: u8 = 210;
2424
const CCX_DTVCC_MAX_ROWS: u8 = 15;
2525
const CCX_DTVCC_MAX_COLUMNS: u8 = 32 * 2;
26-
const CCX_DTVCC_MAX_SERVICES: usize = 63;
26+
pub const CCX_DTVCC_MAX_SERVICES: usize = 63;
2727

2828
/// Context required for processing 708 data
2929
pub struct Dtvcc<'a> {
@@ -233,9 +233,10 @@ impl<'a> Dtvcc<'a> {
233233
let decoder = &mut self.decoders[(service_number - 1) as usize]
234234
.as_mut()
235235
.unwrap();
236+
let encoder = &mut unsafe { self.encoder.read() };
236237
decoder.process_service_block(
237238
&self.packet[pos as usize..(pos + block_length) as usize],
238-
self.encoder,
239+
encoder,
239240
self.timing,
240241
self.no_rollup,
241242
);

src/rust/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ extern "C" fn ccxr_dtvcc_free(dtvcc_rust: *mut Dtvcc) {
7777
continue;
7878
}
7979

80-
let decoder = unsafe { &mut dtvcc.decoders[i].read() };
80+
let decoder = &mut dtvcc.decoders[i].to_owned().unwrap();
8181

8282
decoder.windows.iter_mut().for_each(|window| {
8383
if utils::is_false(window.memory_reserved) {

0 commit comments

Comments
 (0)