Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- New: Added GXF module
- New: Add demuxer and file_functions module (#1662)
- Fix: Unit Test Rust failing due to changes in Rust Version 1.86.0 (#1694)
- Fix: Elementary stream regressions
- Fix: Segmentation faults on XDS files
- Fix: Clippy Errors Based on Rust 1.88
- IMPROVEMENT: Refactor and optimize Dockerfile
Expand Down
1 change: 1 addition & 0 deletions mac/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ endif
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP

ccextractor_LDFLAGS = $(shell pkg-config --libs gpac)
ccextractor_LDFLAGS += -framework CoreFoundation
GPAC_CPPFLAGS = $(shell pkg-config --cflags gpac)

ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/
Expand Down
2 changes: 1 addition & 1 deletion src/ccextractor.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ int api_start(struct ccx_s_options api_options)
----------------------------------------------------------------- */
switch (stream_mode)
{
// Note: This case is meant to fall through
case CCX_SM_ELEMENTARY_OR_NOT_FOUND:
if (!api_options.use_gop_as_pts) // If !0 then the user selected something
api_options.use_gop_as_pts = 1; // Force GOP timing for ES
ccx_common_timing_settings.is_elementary_stream = 1;
break;
case CCX_SM_TRANSPORT:
case CCX_SM_PROGRAM:
case CCX_SM_ASF:
Expand Down
202 changes: 202 additions & 0 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ memoffset = "0.9.1"
byteorder = "1.5.0"
serial_test = "3.2.0"
encoding_rs = "0.8.35"
chrono = "0.4.41"

[build-dependencies]
bindgen = "0.64.0"
Expand Down
5 changes: 5 additions & 0 deletions src/rust/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ fn main() {
"start_tcp_srv", // shall be removed after NET
"net_tcp_read", // shall be removed after NET
"net_udp_read", // shall be removed after NET
"net_send_epg", // shall be removed after NET
"fopen",
"fclose",
"fprintf",
"fwrite",
#[cfg(windows)]
"_open_osfhandle",
#[cfg(windows)]
Expand Down
4 changes: 4 additions & 0 deletions src/rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ extern "C" {
#[allow(clashing_extern_declarations)]
pub fn ccx_gxf_probe(buf: *const c_uchar, len: c_int) -> c_int;
pub fn ccx_gxf_init(arg: *mut ccx_demuxer) -> *mut ccx_gxf;
pub fn fprintf(__stream: *mut FILE, __format: *const c_char, ...) -> ::std::os::raw::c_int;
pub fn fwrite(__ptr: *const c_void, __size: c_ulong, __n: c_ulong, __s: *mut FILE) -> c_ulong;
pub fn fclose(__stream: *mut FILE) -> c_int;
pub fn fopen(__filename: *const c_char, __modes: *const c_char) -> *mut FILE;
}

/// # Safety
Expand Down
Loading
Loading