har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve upon dynamic arrays- movtext subtitles

Browse Source 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
This commit is contained in:
Niklesh 2015-05-25 22:46:04 +05:30 committed by Philip Langdale
parent e48a9ac9af
commit 9aabc926ca
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/movtextdec.c
View File

@ -32,14 +32,13 @@
#define STYLE_FLAG_UNDERLINE 4 #define STYLE_FLAG_UNDERLINE 4
static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end, static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
int **style_start, int **style_end, char **style_start, char **style_end,
int **style_flags, int style_entries) uint8_t **style_flags, int style_entries)
{ {
int i = 0; int i = 0;
int style_pos = 0;
while (text < text_end) { while (text < text_end) {
for (i = 0; i < style_entries; i++) { for (i = 0; i < style_entries; i++) {
if (*style_flags[i] && style_pos == *style_start[i]) { if (*style_flags[i] && text == style_start[i]) {
if (*style_flags[i] & STYLE_FLAG_BOLD) if (*style_flags[i] & STYLE_FLAG_BOLD)
av_bprintf(buf, "{\\b1}"); av_bprintf(buf, "{\\b1}");
if (*style_flags[i] & STYLE_FLAG_ITALIC) if (*style_flags[i] & STYLE_FLAG_ITALIC)
@ -61,7 +60,7 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
} }
for (i = 0; i < style_entries; i++) { for (i = 0; i < style_entries; i++) {
if (*style_flags[i] && style_pos == *style_end[i]) { if (*style_flags[i] && text == style_end[i]) {
if (*style_flags[i] & STYLE_FLAG_BOLD) if (*style_flags[i] & STYLE_FLAG_BOLD)
av_bprintf(buf, "{\\b0}"); av_bprintf(buf, "{\\b0}");
if (*style_flags[i] & STYLE_FLAG_ITALIC) if (*style_flags[i] & STYLE_FLAG_ITALIC)
@ -71,7 +70,6 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
} }
} }
text++; text++;
style_pos++;
} }
return 0; return 0;
@ -98,13 +96,13 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
//char *ptr_temp; //char *ptr_temp;
int text_length, tsmb_type, style_entries; int text_length, tsmb_type, style_entries;
uint64_t tsmb_size, tracksize; uint64_t tsmb_size, tracksize;
int **style_start = {0,}; char **style_start = { 0, };
int **style_end = {0,}; char **style_end = { 0, };
int **style_flags = {0,}; uint8_t **style_flags = { 0, };
const uint8_t *tsmb; const uint8_t *tsmb;
int index, i, size_var; int index, i, size_var;
int *flag; uint8_t *flag;
int *style_pos; char *style_pos;
if (!ptr || avpkt->size < 2) if (!ptr || avpkt->size < 2)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -172,19 +170,19 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
break; break;
for(i = 0; i < style_entries; i++) { for(i = 0; i < style_entries; i++) {
style_pos = av_malloc(4); style_pos = ptr + AV_RB16(tsmb);
*style_pos = AV_RB16(tsmb);
index = i; index = i;
av_dynarray_add(&style_start, &index, style_pos); av_dynarray_add(&style_start, &index, style_pos);
tsmb += 2; tsmb += 2;
style_pos = av_malloc(4); style_pos = ptr + AV_RB16(tsmb);
*style_pos = AV_RB16(tsmb);
index = i; index = i;
av_dynarray_add(&style_end, &index, style_pos); av_dynarray_add(&style_end, &index, style_pos);
tsmb += 2; tsmb += 2;
// fontID = AV_RB16(tsmb); // fontID = AV_RB16(tsmb);
tsmb += 2; tsmb += 2;
flag = av_malloc(4); flag = av_malloc(1);
if (!flag)
return AVERROR(ENOMEM);
*flag = AV_RB8(tsmb); *flag = AV_RB8(tsmb);
index = i; index = i;
av_dynarray_add(&style_flags, &index, flag); av_dynarray_add(&style_flags, &index, flag);
@ -194,6 +192,10 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
tsmb += 4; tsmb += 4;
} }
text_to_ass(&buf, ptr, end, style_start, style_end, style_flags, style_entries); text_to_ass(&buf, ptr, end, style_start, style_end, style_flags, style_entries);
for(i = 0; i < style_entries; i++) {
av_freep(&style_flags[i]);
}
av_freep(&style_start); av_freep(&style_start);
av_freep(&style_end); av_freep(&style_end);
av_freep(&style_flags); av_freep(&style_flags);