Download-Tools/ccextractor
1
0
Fork 0
mirror of https://github.com/CCExtractor/ccextractor.git synced 2025-01-24 02:41:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #725 from Amey-Jain/master

Browse Source 
Issue 699 solved
This commit is contained in:
Carlos Fernandez Sanz 2017-04-11 09:23:03 -07:00 committed by GitHub
commit fdd5b6bf9d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib_ccx/general_loop.c
View File

@ -1102,7 +1102,7 @@ int rcwt_loop(struct lib_ccx_ctx *ctx)
int caps = 0; int caps = 0;
LLONG result; LLONG result;
struct encoder_ctx *enc_ctx = update_encoder_list(ctx); struct encoder_ctx *enc_ctx = update_encoder_list(ctx);
struct Teletext *telctx;
// As BUFSIZE is a macro this is just a reminder // As BUFSIZE is a macro this is just a reminder
if (BUFSIZE < (3*0xFFFF + 10)) if (BUFSIZE < (3*0xFFFF + 10))
fatal (CCX_COMMON_EXIT_BUG_BUG, "BUFSIZE too small for RCWT caption block.\n"); fatal (CCX_COMMON_EXIT_BUG_BUG, "BUFSIZE too small for RCWT caption block.\n");
@ -1143,6 +1143,7 @@ int rcwt_loop(struct lib_ccx_ctx *ctx)
dec_ctx->private_data = telxcc_init(); dec_ctx->private_data = telxcc_init();
} }
dec_sub = &dec_ctx->dec_sub; dec_sub = &dec_ctx->dec_sub;
telctx =dec_ctx->private_data;
/* Set minimum and current pts since rcwt has correct time */ /* Set minimum and current pts since rcwt has correct time */
dec_ctx->timing->min_pts = 0; dec_ctx->timing->min_pts = 0;
@ -1155,9 +1156,10 @@ int rcwt_loop(struct lib_ccx_ctx *ctx)
{ {
result = buffered_read(ctx->demux_ctx, buf, TELETEXT_CHUNK_LEN); result = buffered_read(ctx->demux_ctx, buf, TELETEXT_CHUNK_LEN);
ctx->demux_ctx->past += result; ctx->demux_ctx->past += result;
if (result != TELETEXT_CHUNK_LEN) if (result != TELETEXT_CHUNK_LEN){
telxcc_dump_prev_page(telctx,dec_sub);
break; break;
}
tlt_read_rcwt(dec_ctx->private_data, buf, dec_sub); tlt_read_rcwt(dec_ctx->private_data, buf, dec_sub);
if(dec_sub->got_output == CCX_TRUE) if(dec_sub->got_output == CCX_TRUE)
{ {

2
src/lib_ccx/lib_ccx.c
View File

@ -215,7 +215,7 @@ void dinit_libraries( struct lib_ccx_ctx **ctx)
dvbsub_close_decoder(&dec_ctx->private_data); dvbsub_close_decoder(&dec_ctx->private_data);
//Test memory for teletext //Test memory for teletext
else if (dec_ctx->codec == CCX_CODEC_TELETEXT) else if (dec_ctx->codec == CCX_CODEC_TELETEXT)
telxcc_close(&dec_ctx->private_data, NULL); telxcc_close(&dec_ctx->private_data, &dec_ctx->dec_sub);
else if (dec_ctx->codec == CCX_CODEC_ISDB_CC) else if (dec_ctx->codec == CCX_CODEC_ISDB_CC)
delete_isdb_decoder(&dec_ctx->private_data); delete_isdb_decoder(&dec_ctx->private_data);

15
src/lib_ccx/telxcc.c
View File

@ -50,7 +50,7 @@ int _CRT_fmode = _O_BINARY;
#endif #endif
long long int last_pes_pts = 0; // PTS of last PES packet (debug purposes) long long int last_pes_pts = 0; // PTS of last PES packet (debug purposes)
static int de_ctr = 0; // a keeps count of packets with flag subtitle ON and data packets
typedef struct { typedef struct {
uint64_t show_timestamp; // show at timestamp (in ms) uint64_t show_timestamp; // show at timestamp (in ms)
uint64_t hide_timestamp; // hide at timestamp (in ms) uint64_t hide_timestamp; // hide at timestamp (in ms)
@ -955,7 +955,7 @@ void process_telx_packet(struct TeletextCtx *ctx, data_unit_t data_unit_id, tele
if (m == 0) m = 8; if (m == 0) m = 8;
y = (address >> 3) & 0x1f; y = (address >> 3) & 0x1f;
designation_code = (y > 25) ? unham_8_4(packet->data[0]) : 0x00; designation_code = (y > 25) ? unham_8_4(packet->data[0]) : 0x00;
uint8_t flag_subtitle;
if (y == 0) if (y == 0)
{ {
@ -983,7 +983,7 @@ void process_telx_packet(struct TeletextCtx *ctx, data_unit_t data_unit_id, tele
{ {
tlt_config.page = (m << 8) | (unham_8_4(packet->data[1]) << 4) | unham_8_4(packet->data[0]); tlt_config.page = (m << 8) | (unham_8_4(packet->data[1]) << 4) | unham_8_4(packet->data[0]);
mprint ("- No teletext page specified, first received suitable page is %03x, not guaranteed\n", tlt_config.page); mprint ("- No teletext page specified, first received suitable page is %03x, not guaranteed\n", tlt_config.page);
} }
// Page number and control bits // Page number and control bits
page_number = (m << 8) | (unham_8_4(packet->data[1]) << 4) | unham_8_4(packet->data[0]); page_number = (m << 8) | (unham_8_4(packet->data[1]) << 4) | unham_8_4(packet->data[0]);
@ -1002,18 +1002,19 @@ void process_telx_packet(struct TeletextCtx *ctx, data_unit_t data_unit_id, tele
ctx->transmission_mode = (transmission_mode_t) (unham_8_4(packet->data[7]) & 0x01); ctx->transmission_mode = (transmission_mode_t) (unham_8_4(packet->data[7]) & 0x01);
// FIXME: Well, this is not ETS 300 706 kosher, however we are interested in DATA_UNIT_EBU_TELETEXT_SUBTITLE only // FIXME: Well, this is not ETS 300 706 kosher, however we are interested in DATA_UNIT_EBU_TELETEXT_SUBTITLE only
if ((ctx->transmission_mode == TRANSMISSION_MODE_PARALLEL) && (data_unit_id != DATA_UNIT_EBU_TELETEXT_SUBTITLE)) return; if ((ctx->transmission_mode == TRANSMISSION_MODE_PARALLEL) && (data_unit_id != DATA_UNIT_EBU_TELETEXT_SUBTITLE) && !(de_ctr && flag_subtitle && ctx->receiving_data == YES)) return;
if ((ctx->receiving_data == YES) && ( if ((ctx->receiving_data == YES) && (
((ctx->transmission_mode == TRANSMISSION_MODE_SERIAL) && (PAGE(page_number) != PAGE(tlt_config.page))) || ((ctx->transmission_mode == TRANSMISSION_MODE_SERIAL) && (PAGE(page_number) != PAGE(tlt_config.page))) ||
((ctx->transmission_mode == TRANSMISSION_MODE_PARALLEL) && (PAGE(page_number) != PAGE(tlt_config.page)) && (m == MAGAZINE(tlt_config.page))))) ((ctx->transmission_mode == TRANSMISSION_MODE_PARALLEL) && (PAGE(page_number) != PAGE(tlt_config.page)) && (m == MAGAZINE(tlt_config.page)))))
{ {
ctx->receiving_data = NO; ctx->receiving_data = NO;
return; if(!(de_ctr && flag_subtitle))
return;
} }
// Page transmission is terminated, however now we are waiting for our new page // Page transmission is terminated, however now we are waiting for our new page
if (page_number != tlt_config.page) if (page_number != tlt_config.page && !(de_ctr && flag_subtitle && ctx->receiving_data == YES))
return; return;
@ -1036,6 +1037,7 @@ void process_telx_packet(struct TeletextCtx *ctx, data_unit_t data_unit_id, tele
ctx->page_buffer.hide_timestamp = 0; ctx->page_buffer.hide_timestamp = 0;
} }
process_page(ctx, &ctx->page_buffer, sub); process_page(ctx, &ctx->page_buffer, sub);
de_ctr = 0;
} }
ctx->page_buffer.show_timestamp = timestamp; ctx->page_buffer.show_timestamp = timestamp;
@ -1072,6 +1074,7 @@ void process_telx_packet(struct TeletextCtx *ctx, data_unit_t data_unit_id, tele
ctx->page_buffer.text[y][i] = packet->data[i]; ctx->page_buffer.text[y][i] = packet->data[i];
} }
ctx->page_buffer.tainted = YES; ctx->page_buffer.tainted = YES;
--de_ctr;
} }
else if ((m == MAGAZINE(tlt_config.page)) && (y == 26) && (ctx->receiving_data == YES)) else if ((m == MAGAZINE(tlt_config.page)) && (y == 26) && (ctx->receiving_data == YES))
{ {