Memory Cleanup

Signed-off-by: Anshul Maheshwari <[email protected]>

Author: anshul1912

src/lib_ccx/ccx_decoders_isdb.c

@@ -279,10 +279,28 @@ typedef struct
 }ISDBSubContext;
 
 
-void delete_isdb_caption(void *isdb_ctx)
+/**
+ * Find way to put remaining data
+ */
+void delete_isdb_decoder(void **isdb_ctx)
 {
-	ISDBSubContext *ctx = isdb_ctx;
-	free(ctx);
+	ISDBSubContext *ctx = *isdb_ctx;
+	struct ISDBText *text = NULL;
+	struct ISDBText *text1 = NULL;
+	list_for_each_entry_safe(text, text1, &ctx->text_list_head, list, struct ISDBText)
+	{
+		list_del(&text->list);
+		free(text->buf);
+		free(text);
+	}
+
+	list_for_each_entry_safe(text, text1, &ctx->buffered_text, list, struct ISDBText)
+	{
+		list_del(&text->list);
+		free(text->buf);
+		free(text);
+	}
+	freep(isdb_ctx);
 }
 
 static void init_layout(ISDBSubLayout *ls)
@@ -295,7 +313,8 @@ static void init_layout(ISDBSubLayout *ls)
 	ls->font_scale.fscy = 100; 
 
 }
-void *init_isdb_caption(void)
+
+void *init_isdb_decoder(void)
 {
 	ISDBSubContext *ctx;
 

src/lib_ccx/ccx_decoders_isdb.h

@@ -6,8 +6,8 @@
 
 int isdb_set_global_time(struct lib_cc_decode *dec_ctx, uint64_t timestamp);
 int isdbsub_decode(struct lib_cc_decode *dec_ctx, const uint8_t *buf, size_t buf_size, struct cc_subtitle *sub);
-void delete_isdb_caption(void *isdb_ctx);
-void *init_isdb_caption(void);
+void delete_isdb_decoder(void **isdb_ctx);
+void *init_isdb_decoder(void);
 
 
 #endif

src/lib_ccx/ccx_demuxer.c

@@ -249,6 +249,7 @@ void ccx_demuxer_delete(struct ccx_demuxer **ctx)
 			lctx->PID_buffers[i]->buffer=NULL;
 			lctx->PID_buffers[i]->buffer_length=0;
 		}
+		freep(&lctx->PID_buffers[i]);
 	}
 	for (i = 0; i < MAX_PID; i++)
 	{

src/lib_ccx/lib_ccx.c

@@ -4,6 +4,7 @@
 #include "utility.h"
 #include "dvb_subtitle_decoder.h"
 #include "ccx_decoders_708.h"
+#include "ccx_decoders_isdb.h"
 
 struct ccx_common_logging_t ccx_common_logging;
 static struct ccx_decoders_common_settings_t *init_decoder_setting(
@@ -182,6 +183,12 @@ void dinit_libraries( struct lib_ccx_ctx **ctx)
 		LLONG cfts;
 		if (dec_ctx->codec == CCX_CODEC_DVB)
 			dvbsub_close_decoder(&dec_ctx->private_data);
+		//Test memory for teletext
+		//else if (dec_ctx->codec == CCX_CODEC_TELETEXT)
+		//	telxcc_close(&dec_ctx->private_data, NULL);
+		else if (dec_ctx->codec == CCX_CODEC_ISDB_CC)
+			delete_isdb_decoder(&dec_ctx->private_data);
+
 		flush_cc_decode(dec_ctx, &dec_ctx->dec_sub);
 		cfts = get_fts(dec_ctx->timing, dec_ctx->current_field);
 		enc_ctx = get_encoder_by_pn(lctx, dec_ctx->program_number);
@@ -202,6 +209,7 @@ void dinit_libraries( struct lib_ccx_ctx **ctx)
 	// free EPG memory
 	EPG_free(lctx);
 	freep(&lctx->freport.data_from_608);
+	freep(&lctx->freport.data_from_708);
 	ccx_demuxer_delete(&lctx->demux_ctx);
 	dinit_decoder_setting(&lctx->dec_global_setting);
 	freep(&ccx_options.enc_cfg.output_filename);
@@ -294,9 +302,6 @@ struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct ca
 	unsigned char in_format = 1;
 	char *extension;
 
-	extension = get_file_extension(ccx_options.enc_cfg.write_format);
-	if(!extension)
-		return NULL;
 
 	if (ctx->write_format == CCX_OF_NULL)
 		return NULL;
@@ -320,6 +325,9 @@ struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct ca
 			return enc_ctx;
 	}
 
+	extension = get_file_extension(ccx_options.enc_cfg.write_format);
+	if(!extension)
+		return NULL;
 
 	if(ctx->multiprogram == CCX_FALSE)
 	{

src/lib_ccx/ts_functions.c

@@ -4,6 +4,7 @@
 #include "ccx_demuxer.h"
 #include "list.h"
 #include "dvb_subtitle_decoder.h"
+#include "ccx_decoders_isdb.h"
 #include "file_buffer.h"
 
 unsigned char tspacket[188]; // Current packet
@@ -718,6 +719,8 @@ long ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data)
 				case CCX_CODEC_DVB:
 					dvbsub_close_decoder(&cinfo->codec_private_data);
 					break;
+				case CCX_CODEC_ISDB_CC:
+					delete_isdb_decoder(&cinfo->codec_private_data);
 				default:
 					break;
 				}

src/lib_ccx/ts_tables.c

@@ -311,7 +311,7 @@ int parse_PMT (struct ccx_demuxer *ctx, unsigned char *buf, int len,  struct pro
 					if (component_id != 0x08)
 						break;
 					mprint ("*****ISDB subtitles detected\n");
-					ptr = init_isdb_caption();
+					ptr = init_isdb_decoder();
 					if (ptr == NULL)
 						break;
 					update_capinfo(ctx, elementary_PID, stream_type, CCX_CODEC_ISDB_CC, program_number, ptr);