From 521ee29ab819a1f10c11624199b931b21aa740e3 Mon Sep 17 00:00:00 2001 From: Carlos Fernandez Date: Fri, 13 Jan 2017 11:32:11 -0800 Subject: [PATCH] Corrections in dvbcolor help and code comments. --- src/lib_ccx/ccx_common_option.c | 2 +- src/lib_ccx/params.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib_ccx/ccx_common_option.c b/src/lib_ccx/ccx_common_option.c index 06525c3d..1a710c8f 100644 --- a/src/lib_ccx/ccx_common_option.c +++ b/src/lib_ccx/ccx_common_option.c @@ -60,7 +60,7 @@ void init_options (struct ccx_s_options *options) options->append_mode = 0; //By default, files are overwritten. options->ucla = 0; // By default, -UCLA not used options->hardsubx = 0; // By default, don't try to extract hard subtitles - options->dvbcolor = 1; // By default, only text detected in DVB + options->dvbcolor = 1; // By default, attempt to detect both text and color options->dvblang = NULL; // By default, autodetect DVB language options->ocrlang = NULL; // By default, autodetect .traineddata file options->ignore_pts_jumps = 1; diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c index 402b4d10..c40c1e4b 100644 --- a/src/lib_ccx/params.c +++ b/src/lib_ccx/params.c @@ -311,8 +311,9 @@ void print_usage (void) mprint (" used for debugging purposes to see the contents\n"); mprint (" of each PES packet header.\n"); mprint (" -debugdvbsub: Write the DVB subtitle debug traces to console.\n"); - mprint (" -ignoreptsjumps: Ignore PTS jumps. Use this parameter if you\n"); - mprint (" experience timeline resets/jumps in the output.\n\n"); + mprint (" -ignoreptsjumps: Ignore PTS jumps (default).\n"); + mprint (" -fixptsjumps: fix pts jumps. Use this parameter if you\n"); + mprint (" experience timeline resets/jumps in the output.\n"); mprint (" -stdin: Reads input from stdin (console) instead of file.\n"); mprint ("You can pass as many input files as you need. They will be processed in order.\n"); mprint ("If a file name is suffixed by +, ccextractor will try to follow a numerical\n"); @@ -548,10 +549,11 @@ void print_usage (void) mprint (" and delete it on file close.\n"); mprint (" -dvbcolor: For DVB subtitles, also output the color of the\n"); mprint (" subtitles, if the output format is SRT or WebVTT.\n"); + mprint (" -nodvbcolor: In DVB subtitles, disable color in output.\n"); mprint (" -dvblang: For DVB subtitles, select which language's caption\n"); mprint (" stream will be processed. e.g. 'eng' for English.\n"); mprint (" If there are multiple languages, only this specified\n"); - mprint (" language stream will be processed\n"); + mprint (" language stream will be processed (default).\n"); mprint (" -ocrlang: Manually select the name of the Tesseract .traineddata\n"); mprint (" file. Helpful if you want to OCR a caption stream of\n"); mprint (" one language with the data of another language.\n"); @@ -560,8 +562,7 @@ void print_usage (void) mprint (" using the Chinese (Traditional) trained data\n"); mprint (" This option is also helpful when the traineddata file\n"); mprint (" has non standard names that don't follow ISO specs\n"); - mprint (" -fixptsjumps: fix pts jumps\n"); - mprint (" -nodvbcolor: disable colors\n"); + mprint ("\n"); mprint ("Options that affect how ccextractor reads and writes (buffering):\n"); @@ -575,7 +576,7 @@ void print_usage (void) mprint (" -ff --forceflush: Flush the file buffer whenever content is written.\n"); mprint ("\n"); - mprint ("Options that affect the built-in closed caption decoder:\n"); + mprint ("Options that affect the built-in 608 closed caption decoder:\n"); mprint (" -dru: Direct Roll-Up. When in roll-up mode, write character by\n"); mprint (" character instead of line by line. Note that this\n");