fix(dvb): Enable OCR for all DVB subtitle streams, not just first

Author: cfsmp3

src/lib_ccx/ccx_demuxer.c

@@ -348,7 +348,6 @@ struct ccx_demuxer *init_demuxer(void *parent, struct demuxer_cfg *cfg)
 		{
 			ctx->pinfo[i].got_important_streams_min_pts[j] = UINT64_MAX;
 		}
-		ctx->pinfo[i].initialized_ocr = 0;
 		ctx->pinfo[i].version = 0xFF; // Not real in a real stream since it's 5 bits. FF => Not initialized
 	}
 

src/lib_ccx/ccx_demuxer.h

@@ -35,7 +35,6 @@ struct program_info
 {
 	int pid;
 	int program_number;
-	int initialized_ocr; // Avoid initializing the OCR more than once
 	uint8_t analysed_PMT_once : 1;
 	uint8_t version;
 	uint8_t saved_section[1021];

src/lib_ccx/dvb_subtitle_decoder.c

@@ -418,7 +418,7 @@ static void delete_regions(DVBSubContext *ctx)
  * @return DVB context kept as void* for abstraction
  *
  */
-void *dvbsub_init_decoder(struct dvb_config *cfg, int initialized_ocr)
+void *dvbsub_init_decoder(struct dvb_config *cfg)
 {
 	int i, r, g, b, a = 0;
 	DVBSubContext *ctx = (DVBSubContext *)malloc(sizeof(DVBSubContext));
@@ -442,8 +442,7 @@ void *dvbsub_init_decoder(struct dvb_config *cfg, int initialized_ocr)
 	}
 
 #ifdef ENABLE_OCR
-	if (!initialized_ocr)
-		ctx->ocr_ctx = init_ocr(ctx->lang_index);
+	ctx->ocr_ctx = init_ocr(ctx->lang_index);
 #endif
 	ctx->version = -1;
 

src/lib_ccx/dvb_subtitle_decoder.h

@@ -42,7 +42,7 @@ extern "C"
 	 * @return DVB context kept as void* for abstraction
 	 *
 	 */
-	void *dvbsub_init_decoder(struct dvb_config *cfg, int initialized_ocr);
+	void *dvbsub_init_decoder(struct dvb_config *cfg);
 
 	int dvbsub_close_decoder(void **dvb_ctx);
 

src/lib_ccx/matroska.c

@@ -1173,7 +1173,7 @@ void parse_private_codec_data(struct matroska_ctx *mkv_ctx, char *codec_id_strin
 		memset((void *)&cnf, 0, sizeof(struct dvb_config));
 
 		parse_dvb_description(&cnf, codec_data, 8);
-		dec_ctx->private_data = dvbsub_init_decoder(&cnf, 0);
+		dec_ctx->private_data = dvbsub_init_decoder(&cnf);
 
 		free(codec_data);
 	}

src/lib_ccx/ts_info.c

@@ -173,7 +173,7 @@ static void *init_private_data(enum ccx_code_type codec)
 		case CCX_CODEC_TELETEXT:
 			return telxcc_init();
 		case CCX_CODEC_DVB:
-			return dvbsub_init_decoder(NULL, 0);
+			return dvbsub_init_decoder(NULL);
 		default:
 			return NULL;
 	}

src/lib_ccx/ts_tables.c

@@ -399,9 +399,7 @@ int parse_PMT(struct ccx_demuxer *ctx, unsigned char *buf, int len, struct progr
 					ret = parse_dvb_description(&cnf, es_info, desc_len);
 					if (ret < 0)
 						break;
-					ptr = dvbsub_init_decoder(&cnf, pinfo->initialized_ocr);
-					if (!pinfo->initialized_ocr)
-						pinfo->initialized_ocr = 1;
+					ptr = dvbsub_init_decoder(&cnf);
 					if (ptr == NULL)
 						break;
 					update_capinfo(ctx, elementary_PID, stream_type, CCX_CODEC_DVB, program_number, ptr);

src/rust/src/common.rs

@@ -1070,7 +1070,6 @@ impl CType<program_info> for ProgramInfo {
         program_info {
             pid: self.pid,
             program_number: self.program_number,
-            initialized_ocr: self.initialized_ocr as c_int,
             _bitfield_align_1: [],
             _bitfield_1: bf1,
             version: self.version,

src/rust/src/ctorust.rs

@@ -540,7 +540,6 @@ impl FromCType<program_info> for ProgramInfo {
         Some(ProgramInfo {
             pid: info.pid,
             program_number: info.program_number,
-            initialized_ocr: info.initialized_ocr != 0,
             analysed_pmt_once: info._bitfield_1.get_bit(0) as u8,
             version: info.version,
             saved_section: info.saved_section,

src/rust/src/demuxer/common_types.rs

@@ -50,7 +50,6 @@ pub struct FileReport {
 pub struct ProgramInfo {
     pub pid: i32,
     pub program_number: i32,
-    pub initialized_ocr: bool, // Avoid initializing the OCR more than once
     pub analysed_pmt_once: u8, // 1-bit field
     pub version: u8,
     pub saved_section: [u8; SAVED_SECTIONS_PROGRAMINFO],
@@ -301,7 +300,6 @@ impl Default for ProgramInfo {
         ProgramInfo {
             pid: -1,
             program_number: 0,
-            initialized_ocr: false,
             analysed_pmt_once: 0,
             version: 0,
             saved_section: [0; SAVED_SECTIONS_PROGRAMINFO],