Skip to content
Closed
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
8 changes: 8 additions & 0 deletions keyfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABBRaxmcA0
hFC03ODPJJ4e1PAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIHETyvjOv9vv2uBQ
Jmy295Kfsp9Ey2FeR7WRUHpoSDtnAAAAoOYsFHc6DEKDe+RfvMVjkeKcdrertILTbyDba4
VI+P849BiNcqOztbH98Z6nTy1XE00EcAXYhRI4B8mEPTLa6rcpXKymrDFj8UrWt1VLFPh1
ruJp1ATVSBVd9THMve0kFyWVF0PXtojCMItZjcgqIEdCloDrUAefMUH4+rhIiEqu9R3+aC
FMABxkQ0jTwJAPAT0EltKF+K6gYTqE79MGDsQ=
-----END OPENSSH PRIVATE KEY-----
1 change: 1 addition & 0 deletions keyfile.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHETyvjOv9vv2uBQJmy295Kfsp9Ey2FeR7WRUHpoSDtn [email protected]
34 changes: 0 additions & 34 deletions linux/pre-build.sh

This file was deleted.

2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ configure_file (

add_definitions(-DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP)

add_definitions(-DENABLE_HEVC)

if(CMAKE_SIZEOF_VOID_P EQUAL 8)
add_definitions(-DGPAC_64_BITS)
endif()
Expand Down
2 changes: 2 additions & 0 deletions src/lib_ccx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ endif(WIN32)
find_package(PkgConfig)
pkg_check_modules (GPAC REQUIRED gpac)

list(APPEND EXTRA_INCLUDES "${PROJECT_SOURCE_DIR}/lib_ccx")
set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${GPAC_INCLUDE_DIRS})
set (EXTRA_LIBS ${EXTRA_LIBS} ${GPAC_LIBRARIES})

Expand Down Expand Up @@ -60,6 +61,7 @@ if (WITH_SHARING)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING")
endif (WITH_SHARING)

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HEVC")
aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_ccx/" SOURCEFILE)

add_library (ccx ${SOURCEFILE} ccx_dtvcc.h ccx_dtvcc.c ccx_encoders_mcc.c ccx_encoders_mcc.h)
Expand Down
607 changes: 374 additions & 233 deletions src/lib_ccx/ccx_common_constants.h

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions src/lib_ccx/general_loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "ccx_gxf.h"
#include "dvd_subtitle_decoder.h"
#include "ccx_demuxer_mxf.h"
#include "hevc_functions.h" // Add this include

int end_of_file = 0; // End of file?

Expand Down Expand Up @@ -720,6 +721,12 @@ int process_data(struct encoder_ctx *enc_ctx, struct lib_cc_decode *dec_ctx, str
dec_ctx->in_bufferdatatype = CCX_H264;
got = process_avc(enc_ctx, dec_ctx, data_node->buffer, data_node->len, dec_sub);
}
// *** ADDED HEVC SUPPORT HERE: ***
else if (data_node->bufferdatatype == CCX_HEVC) // HEVC data from TS file
{
dec_ctx->in_bufferdatatype = CCX_HEVC; // Set decoder context to HEVC mode
got = process_hevc(enc_ctx, dec_ctx, data_node->buffer, data_node->len, dec_sub);
}
else if (data_node->bufferdatatype == CCX_RAW_TYPE)
{
got = process_raw_with_field(dec_ctx, dec_sub, data_node->buffer, data_node->len);
Expand Down
Loading
Loading