diff options
| author | Aman Gupta <aman@tmm1.net> | 2016-01-08 19:52:09 -0800 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-01-09 12:32:27 +0100 |
| commit | b7e64be8fbf48c6ded06130146209040c0b32919 (patch) | |
| tree | 1810b0ed39f1d6041d25ded85b5263fdc355e613 | |
| parent | 086093c77c71e665f17fe697bf1c254bf0e529e9 (diff) | |
| download | ffmpeg-b7e64be8fbf48c6ded06130146209040c0b32919.tar.gz | |
lavc/ccaption_dec: implement font styles
| -rw-r--r-- | libavcodec/ccaption_dec.c | 55 | ||||
| -rw-r--r-- | tests/ref/fate/sub-cc | 4 |
2 files changed, 52 insertions, 7 deletions
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 603b162188..971561a701 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -172,9 +172,11 @@ static int write_char(CCaptionSubContext *ctx, struct Screen *screen, char ch) { uint8_t col = ctx->cursor_column; char *row = screen->characters[ctx->cursor_row]; + char *font = screen->fonts[ctx->cursor_row]; if (col < SCREEN_COLUMNS) { row[col] = ch; + font[col] = ctx->cursor_font; if (ch) ctx->cursor_column++; return 0; } @@ -283,17 +285,60 @@ static int capture_screen(CCaptionSubContext *ctx) int i; int ret = 0; struct Screen *screen = ctx->screen + ctx->active_screen; + enum cc_font prev_font = CCFONT_REGULAR; av_bprint_clear(&ctx->buffer); for (i = 0; screen->row_used && i < SCREEN_ROWS; i++) { if (CHECK_FLAG(screen->row_used, i)) { - char *str = screen->characters[i]; - /* skip space */ - while (*str == ' ') - str++; + char *row = screen->characters[i]; + char *font = screen->fonts[i]; + int j = 0; + + /* skip leading space */ + while (row[j] == ' ') + j++; + + for (; j < SCREEN_COLUMNS; j++) { + if (row[j] == 0) + break; + + const char *e_tag = "", *s_tag = ""; + if (prev_font != font[j]) { + switch (prev_font) { + case CCFONT_ITALICS: + e_tag = "{/i0}"; + break; + case CCFONT_UNDERLINED: + e_tag = "{/u0}"; + break; + case CCFONT_UNDERLINED_ITALICS: + e_tag = "{/u0}{/i0}"; + break; + } + switch (font[j]) { + case CCFONT_ITALICS: + s_tag = "{/i1}"; + break; + case CCFONT_UNDERLINED: + s_tag = "{/u1}"; + break; + case CCFONT_UNDERLINED_ITALICS: + s_tag = "{/u1}{/i1}"; + break; + } + } + prev_font = font[j]; + + av_bprintf(&ctx->buffer, "%s%s%c", e_tag, s_tag, row[j]); + ret = av_bprint_is_complete(&ctx->buffer); + if (ret == 0) { + ret = AVERROR(ENOMEM); + break; + } + } - av_bprintf(&ctx->buffer, "%s\\N", str); + av_bprintf(&ctx->buffer, "\\N"); ret = av_bprint_is_complete(&ctx->buffer); if (ret == 0) { ret = AVERROR(ENOMEM); diff --git a/tests/ref/fate/sub-cc b/tests/ref/fate/sub-cc index 3d8c764200..8583e184fa 100644 --- a/tests/ref/fate/sub-cc +++ b/tests/ref/fate/sub-cc @@ -10,5 +10,5 @@ Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10 [Events]
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,( inaudible radio chatter )
-Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,( inaudible radio chatter )\N>> Safety remains our number one
+Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,({/i1} inaudible radio chatter{/i0} )
+Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,({/i1} inaudible radio chatter{/i0} )\N>> Safety remains our number one
|