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

Rebasing

Browse Source
This commit is contained in:
Diptanshu8 2017-03-15 00:33:12 +05:30
parent c0a40529a9
commit 7feb705d73
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib_ccx/matroska.c
View File

@ -618,11 +618,10 @@ void parse_segment_track_entry(struct matroska_ctx* mkv_ctx) {
sub_track->codec_id = codec_id;
sub_track->sentence_count = 0;
for (int i = 0; i < mkv_ctx->sub_tracks_count; i++)
if (strcmp((const char *)mkv_ctx->sub_tracks[i]->lang, (const char *)lang) == 0)
sub_track->lang_index++;
mkv_ctx->sub_tracks[mkv_ctx->sub_tracks_count] = sub_track;
for (int i = 0; i < mkv_ctx->sub_tracks_count; i++)
if (strcmp((const char *)mkv_ctx->sub_tracks[i]->lang, (const char *)lang) == 0)
sub_track->lang_index++;
mkv_ctx->sub_tracks[mkv_ctx->sub_tracks_count] = sub_track;
mkv_ctx->sub_tracks_count++;
}
else
@ -644,8 +643,10 @@ void parse_segment_tracks(struct matroska_ctx* mkv_ctx)
switch (code) {
/* Tracks ids*/
case MATROSKA_SEGMENT_TRACK_ENTRY:
parse_segment_track_entry(mkv_ctx);
MATROSKA_SWITCH_BREAK(code, code_len);
parse_segment_track_entry(mkv_ctx);
MATROSKA_SWITCH_BREAK(code, code_len);
/* Misc ids */
case MATROSKA_VOID:
@ -779,8 +780,7 @@ void save_sub_track(struct matroska_ctx* mkv_ctx, struct matroska_sub_track* tra
{
char number[9];
sprintf(number, "%d", i + 1);
char *timestamp_start = malloc(sizeof(char) * 80); //being generous
char *timestamp_start = malloc(sizeof(char) * 80); //being generous
timestamp_to_srttime(sentence->time_start, timestamp_start);
ULLONG time_end = sentence->time_end;
if (i + 1 < track->sentence_count)
@ -864,7 +864,7 @@ void matroska_parse(struct matroska_ctx* mkv_ctx)
code_len++;
switch (code) {
/* Header ids*/
/* Header ids*/
case MATROSKA_EBML_HEADER:
parse_ebml(file);
MATROSKA_SWITCH_BREAK(code, code_len);
@ -921,6 +921,7 @@ int matroska_loop(struct lib_ccx_ctx *ctx)
mkv_ctx->current_second = 0;
mkv_ctx->filename = ctx->inputfile[ctx->current_file];
mkv_ctx->file = create_file(ctx);
mkv_ctx->sub_tracks = malloc(MATROSKA_MAX_TRACKS*sizeof(struct matroska_sub_track*));
matroska_parse(mkv_ctx);

4
src/lib_ccx/matroska.h
View File

@ -207,7 +207,7 @@ struct matroska_sub_track {
};
struct matroska_ctx {
struct matroska_sub_track* sub_tracks[MATROSKA_MAX_TRACKS];
struct matroska_sub_track** sub_tracks;
struct lib_ccx_ctx* ctx;
int sub_tracks_count;
int sentence_count;
@ -244,7 +244,7 @@ void parse_segment(struct matroska_ctx* mkv_ctx);
char* generate_timestamp_utf8(ULLONG milliseconds);
char* generate_timestamp_ass_ssa(ULLONG milliseconds);
int find_sub_track_index(struct matroska_ctx* mkv_ctx, ULLONG track_number);
char* get_track_entry_type_description(enum matroska_track_entry_type type);
char* get_track_entry_type_description(enum matroska_track_entry_type type);
enum matroska_track_subtitle_codec_id get_track_subtitle_codec_id(char* codec_id);
char* generate_filename_from_track(struct matroska_ctx* mkv_ctx, struct matroska_sub_track* track);
char* ass_ssa_sentence_erase_read_order(char* text);