From 7a16ba845af88d2bd80f437c65304c08f8d912c5 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Tue, 26 Sep 2023 20:04:17 +0530 Subject: [PATCH] chore: remove unneccesary formatting --- src/lib_ccx/lib_ccx.h | 172 +++++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 85 deletions(-) diff --git a/src/lib_ccx/lib_ccx.h b/src/lib_ccx/lib_ccx.h index bb3ea3071..6b246334e 100644 --- a/src/lib_ccx/lib_ccx.h +++ b/src/lib_ccx/lib_ccx.h @@ -25,7 +25,7 @@ #include #endif -// #include "ccx_decoders_708.h" +//#include "ccx_decoders_708.h" /* Report information */ #define SUB_STREAMS_CNT 10 @@ -45,33 +45,33 @@ struct file_report // Stuff for telxcc.c struct ccx_s_teletext_config { - uint8_t verbose : 1; // should telxcc be verbose? - uint16_t page; // teletext page containing cc we want to filter - uint16_t tid; // 13-bit packet ID for teletext stream - double offset; // time offset in seconds - uint8_t bom : 1; // print UTF-8 BOM characters at the beginning of output - uint8_t nonempty : 1; // produce at least one (dummy) frame + uint8_t verbose : 1; // should telxcc be verbose? + uint16_t page; // teletext page containing cc we want to filter + uint16_t tid; // 13-bit packet ID for teletext stream + double offset; // time offset in seconds + uint8_t bom : 1; // print UTF-8 BOM characters at the beginning of output + uint8_t nonempty : 1; // produce at least one (dummy) frame // uint8_t se_mode : 1; // search engine compatible mode => Uses CCExtractor's write_format // uint64_t utc_refvalue; // UTC referential value => Moved to ccx_decoders_common, so can be used for other decoders (608/xds) too - uint16_t user_page; // Page selected by user, which MIGHT be different to 'page' depending on autodetection stuff - int dolevdist; // 0=Don't attempt to correct errors - int levdistmincnt, levdistmaxpct; // Means 2 fails or less is "the same", 10% or less is also "the same" + uint16_t user_page; // Page selected by user, which MIGHT be different to 'page' depending on autodetection stuff + int dolevdist; // 0=Don't attempt to correct errors + int levdistmincnt, levdistmaxpct; // Means 2 fails or less is "the same", 10% or less is also "the same" struct ccx_boundary_time extraction_start, extraction_end; // Segment we actually process - enum ccx_output_format write_format; // 0=Raw, 1=srt, 2=SMI - int gui_mode_reports; // If 1, output in stderr progress updates so the GUI can grab them + enum ccx_output_format write_format; // 0=Raw, 1=srt, 2=SMI + int gui_mode_reports; // If 1, output in stderr progress updates so the GUI can grab them enum ccx_output_date_format date_format; - int noautotimeref; // Do NOT set time automatically? + int noautotimeref; // Do NOT set time automatically? unsigned send_to_srv; enum ccx_encoding_type encoding; int nofontcolor; int nohtmlescape; char millis_separator; - int latrusmap; + int latrusmap; }; struct ccx_s_mp4Cfg { - unsigned int mp4vidtrack : 1; + unsigned int mp4vidtrack :1; }; struct lib_ccx_ctx @@ -102,24 +102,24 @@ struct lib_ccx_ctx int rawmode; // Broadcast or DVD // See -d from - int cc_to_stdout; // If 1, captions go to stdout instead of file - int pes_header_to_stdout; // If 1, PES Header data will be outputted to console + int cc_to_stdout; // If 1, captions go to stdout instead of file + int pes_header_to_stdout; //If 1, PES Header data will be outputted to console int dvb_debug_traces_to_stdout; // If 1, DVB subtitle debug traces will be outputted to console - int ignore_pts_jumps; // If 1, the program will ignore PTS jumps. Sometimes this parameter is required for DVB subs with > 30s pause time + int ignore_pts_jumps; //If 1, the program will ignore PTS jumps. Sometimes this parameter is required for DVB subs with > 30s pause time LLONG subs_delay; // ms to delay (or advance) subs int startcredits_displayed; int end_credits_displayed; - LLONG last_displayed_subs_ms; // When did the last subs end? - LLONG screens_to_process; // How many screenfuls we want? - char *basefilename; // Input filename without the extension + LLONG last_displayed_subs_ms; // When did the last subs end? + LLONG screens_to_process; // How many screenfuls we want? + char *basefilename; // Input filename without the extension - const char *extension; // Output extension - int current_file; // If current_file!=1, we are processing *inputfile[current_file] + const char *extension; // Output extension + int current_file; // If current_file!=1, we are processing *inputfile[current_file] - char **inputfile; // List of files to process - int num_input_files; // How many? + char **inputfile; // List of files to process + int num_input_files; // How many? unsigned teletext_warning_shown; // Did we detect a possible PAL (with teletext subs) and told the user already? @@ -132,11 +132,11 @@ struct lib_ccx_ctx int epg_last_live_output; struct file_report freport; - unsigned int hauppauge_mode; // If 1, use PID=1003, process specially and so on - int live_stream; /* -1 -> Not a complete file but a live stream, without timeout - 0 -> A regular file - >0 -> Live stream with a timeout of this value in seconds */ - int binary_concat; // Disabled by -ve or --videoedited + unsigned int hauppauge_mode; // If 1, use PID=1003, process specially and so on + int live_stream; /* -1 -> Not a complete file but a live stream, without timeout + 0 -> A regular file + >0 -> Live stream with a timeout of this value in seconds */ + int binary_concat; // Disabled by -ve or --videoedited int multiprogram; enum ccx_output_format write_format; @@ -149,27 +149,28 @@ struct lib_ccx_ctx LLONG system_start_time; }; + struct lib_ccx_ctx *init_libraries(struct ccx_s_options *opt); -void dinit_libraries(struct lib_ccx_ctx **ctx); +void dinit_libraries( struct lib_ccx_ctx **ctx); -// ccextractor.c +//ccextractor.c void print_end_msg(void); -// params.c +//params.c #ifndef DISABLE_RUST extern int ccxr_parse_parameters(struct ccx_s_options *opt, int argc, char *argv[]); #endif -int parse_parameters(struct ccx_s_options *opt, int argc, char *argv[]); -void print_usage(void); -int atoi_hex(char *s); -int stringztoms(const char *s, struct ccx_boundary_time *bt); +int parse_parameters (struct ccx_s_options *opt, int argc, char *argv[]); +void print_usage (void); +int atoi_hex (char *s); +int stringztoms (const char *s, struct ccx_boundary_time *bt); // general_loop.c void position_sanity_check(struct ccx_demuxer *ctx); int init_file_buffer(struct ccx_demuxer *ctx); int ps_get_more_data(struct lib_ccx_ctx *ctx, struct demuxer_data **ppdata); int general_get_more_data(struct lib_ccx_ctx *ctx, struct demuxer_data **data); -int raw_loop(struct lib_ccx_ctx *ctx); +int raw_loop (struct lib_ccx_ctx *ctx); size_t process_raw(struct lib_cc_decode *ctx, struct cc_subtitle *sub, unsigned char *buffer, size_t len); int general_loop(struct lib_ccx_ctx *ctx); void process_hex(struct lib_ccx_ctx *ctx, char *filename); @@ -196,15 +197,15 @@ int user_data(struct encoder_ctx *enc_ctx, struct lib_cc_decode *ctx, struct bit // bitstream.c - see bitstream.h // file_functions.c -LLONG get_file_size(int in); -LLONG get_total_file_size(struct lib_ccx_ctx *ctx); -void prepare_for_new_file(struct lib_ccx_ctx *ctx); -void close_input_file(struct lib_ccx_ctx *ctx); -int switch_to_next_file(struct lib_ccx_ctx *ctx, LLONG bytesinbuffer); -void return_to_buffer(struct ccx_demuxer *ctx, unsigned char *buffer, unsigned int bytes); +LLONG get_file_size (int in); +LLONG get_total_file_size (struct lib_ccx_ctx *ctx); +void prepare_for_new_file (struct lib_ccx_ctx *ctx); +void close_input_file (struct lib_ccx_ctx *ctx); +int switch_to_next_file (struct lib_ccx_ctx *ctx, LLONG bytesinbuffer); +void return_to_buffer (struct ccx_demuxer *ctx, unsigned char *buffer, unsigned int bytes); // sequencing.c -void init_hdcc(struct lib_cc_decode *ctx); +void init_hdcc (struct lib_cc_decode *ctx); void store_hdcc(struct encoder_ctx *enc_ctx, struct lib_cc_decode *ctx, unsigned char *cc_data, int cc_count, int sequence_number, LLONG current_fts_now, struct cc_subtitle *sub); void anchor_hdcc(struct lib_cc_decode *ctx, int seq); void process_hdcc(struct encoder_ctx *enc_ctx, struct lib_cc_decode *ctx, struct cc_subtitle *sub); @@ -218,28 +219,28 @@ void dinit_write(struct ccx_s_write *wb); int temporarily_open_output(struct ccx_s_write *wb); int temporarily_close_output(struct ccx_s_write *wb); int init_write(struct ccx_s_write *wb, char *filename, int with_semaphore); -int writeraw(const unsigned char *data, int length, void *private_data, struct cc_subtitle *sub); -void flushbuffer(struct lib_ccx_ctx *ctx, struct ccx_s_write *wb, int closefile); -void writercwtdata(struct lib_cc_decode *ctx, const unsigned char *data, struct cc_subtitle *sub); +int writeraw (const unsigned char *data, int length, void *private_data, struct cc_subtitle *sub); +void flushbuffer (struct lib_ccx_ctx *ctx, struct ccx_s_write *wb, int closefile); +void writercwtdata (struct lib_cc_decode *ctx, const unsigned char *data, struct cc_subtitle *sub); // stream_functions.c int isValidMP4Box(unsigned char *buffer, size_t position, size_t *nextBoxLocation, int *boxScore); -void detect_stream_type(struct ccx_demuxer *ctx); -int detect_myth(struct ccx_demuxer *ctx); -int read_video_pes_header(struct ccx_demuxer *ctx, struct demuxer_data *data, unsigned char *nextheader, int *headerlength, int sbuflen); +void detect_stream_type (struct ccx_demuxer *ctx); +int detect_myth( struct ccx_demuxer *ctx ); +int read_video_pes_header (struct ccx_demuxer *ctx, struct demuxer_data *data, unsigned char *nextheader, int *headerlength, int sbuflen); // ts_functions.c void init_ts(struct ccx_demuxer *ctx); -int ts_readpacket(struct ccx_demuxer *ctx, struct ts_payload *payload); +int ts_readpacket(struct ccx_demuxer* ctx, struct ts_payload *payload); long ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data); int ts_get_more_data(struct lib_ccx_ctx *ctx, struct demuxer_data **data); -int write_section(struct ccx_demuxer *ctx, struct ts_payload *payload, unsigned char *buf, int size, struct program_info *pinfo); +int write_section(struct ccx_demuxer *ctx, struct ts_payload *payload, unsigned char*buf, int size, struct program_info *pinfo); void ts_buffer_psi_packet(struct ccx_demuxer *ctx); -int parse_PMT(struct ccx_demuxer *ctx, unsigned char *buf, int len, struct program_info *pinfo); -int parse_PAT(struct ccx_demuxer *ctx); -void parse_EPG_packet(struct lib_ccx_ctx *ctx); +int parse_PMT (struct ccx_demuxer *ctx, unsigned char *buf, int len, struct program_info *pinfo); +int parse_PAT (struct ccx_demuxer *ctx); +void parse_EPG_packet (struct lib_ccx_ctx *ctx); void EPG_free(struct lib_ccx_ctx *ctx); -char *EPG_DVB_decode_string(uint8_t *in, size_t size); +char* EPG_DVB_decode_string(uint8_t *in, size_t size); void parse_SDT(struct ccx_demuxer *ctx); // ts_info.c @@ -253,53 +254,54 @@ int matroska_loop(struct lib_ccx_ctx *ctx); // utility.c #if defined(__GNUC__) -__attribute__((noreturn)) +__attribute__ ((noreturn)) #elif defined(_MSC_VER) __declspec(noreturn) #endif -void -fatal(int exit_code, const char *fmt, ...); -void mprint(const char *fmt, ...); -void sleep_secs(int secs); -void dump(LLONG mask, unsigned char *start, int l, unsigned long abs_start, unsigned clear_high_bit); -bool_t in_array(uint16_t *array, uint16_t length, uint16_t element); -int hex_to_int(char high, char low); -int hex_string_to_int(char *string, int len); +void fatal(int exit_code, const char *fmt, ...); +void mprint (const char *fmt, ...); +void sleep_secs (int secs); +void dump (LLONG mask, unsigned char *start, int l, unsigned long abs_start, unsigned clear_high_bit); +bool_t in_array(uint16_t *array, uint16_t length, uint16_t element) ; +int hex_to_int (char high, char low); +int hex_string_to_int(char* string, int len); void timestamp_to_srttime(uint64_t timestamp, char *buffer); -int levenshtein_dist(const uint64_t *s1, const uint64_t *s2, unsigned s1len, unsigned s2len); -void millis_to_date(uint64_t timestamp, char *buffer, enum ccx_output_date_format date_format, char millis_separator); +int levenshtein_dist (const uint64_t *s1, const uint64_t *s2, unsigned s1len, unsigned s2len); +void millis_to_date (uint64_t timestamp, char *buffer, enum ccx_output_date_format date_format, char millis_separator); void signal_handler(int sig_type); -struct encoder_ctx *change_filename(struct encoder_ctx *); +struct encoder_ctx* change_filename(struct encoder_ctx*); #ifndef _WIN32 void m_signal(int sig, void (*func)(int)); #endif -void buffered_seek(struct ccx_demuxer *ctx, int offset); + +void buffered_seek (struct ccx_demuxer *ctx, int offset); extern void build_parity_table(void); int tlt_process_pes_packet(struct lib_cc_decode *dec_ctx, uint8_t *buffer, uint16_t size, struct cc_subtitle *sub, int sentence_cap); -void *telxcc_init(void); +void* telxcc_init(void); void telxcc_close(void **ctx, struct cc_subtitle *sub); void tlt_read_rcwt(void *codec, unsigned char *buf, struct cc_subtitle *sub); -void telxcc_configure(void *codec, struct ccx_s_teletext_config *cfg); +void telxcc_configure (void *codec, struct ccx_s_teletext_config *cfg); void telxcc_update_gt(void *codec, uint32_t global_timestamp); extern int strangeheader; extern const char *desc[256]; + extern long FILEBUFFERSIZE; // Uppercase because it used to be a define extern int firstcall; // From ts_functions -// extern struct ts_payload payload; +//extern struct ts_payload payload; extern unsigned char tspacket[188]; extern unsigned char *last_pat_payload; extern unsigned last_pat_length; extern volatile int terminate_asap; -#define HAUPPAGE_CCPID 1003 // PID for CC's in some Hauppauge recordings +#define HAUPPAGE_CCPID 1003 // PID for CC's in some Hauppauge recordings extern unsigned teletext_mode; @@ -308,19 +310,19 @@ extern unsigned teletext_mode; extern struct ccx_s_teletext_config tlt_config; int is_decoder_processed_enough(struct lib_ccx_ctx *ctx); -struct lib_cc_decode *update_decoder_list_cinfo(struct lib_ccx_ctx *ctx, struct cap_info *cinfo); +struct lib_cc_decode *update_decoder_list_cinfo(struct lib_ccx_ctx *ctx, struct cap_info* cinfo); struct lib_cc_decode *update_decoder_list(struct lib_ccx_ctx *ctx); -struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct cap_info *cinfo); -struct encoder_ctx *update_encoder_list(struct lib_ccx_ctx *ctx); +struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct cap_info* cinfo); +struct encoder_ctx * update_encoder_list(struct lib_ccx_ctx *ctx); struct encoder_ctx *get_encoder_by_pn(struct lib_ccx_ctx *ctx, int pn); -int process_non_multiprogram_general_loop(struct lib_ccx_ctx *ctx, - struct demuxer_data **datalist, - struct demuxer_data **data_node, - struct lib_cc_decode **dec_ctx, - struct encoder_ctx **enc_ctx, - uint64_t *min_pts, - int ret, - int *caps); +int process_non_multiprogram_general_loop(struct lib_ccx_ctx* ctx, + struct demuxer_data **datalist, + struct demuxer_data **data_node, + struct lib_cc_decode **dec_ctx, + struct encoder_ctx **enc_ctx, + uint64_t *min_pts, + int ret, + int *caps); void segment_output_file(struct lib_ccx_ctx *ctx, struct lib_cc_decode *dec_ctx); #endif