| author | Yan Yan <yan.yan@amlogic.com> | 2017-12-07 05:36:19 (GMT) |
|---|---|---|
| committer | Yan Yan <yan.yan@amlogic.com> | 2017-12-07 05:36:19 (GMT) |
| commit | 90305affd4fbe187cf27de5874e8fdbf8591d866 (patch) | |
| tree | bfffa1cc3ab3eb6be1adcbdce54b75d6e0205d5f | |
| parent | 38450fcb8a6086f668e3ec4d9c46aa38c25ec897 (diff) | |
| download | libzvbi-90305affd4fbe187cf27de5874e8fdbf8591d866.zip libzvbi-90305affd4fbe187cf27de5874e8fdbf8591d866.tar.gz libzvbi-90305affd4fbe187cf27de5874e8fdbf8591d866.tar.bz2 | |
ATVCC:
1. entire line display in pop-up mode instead of words jump
2. Fix color mismatch issue
PD# NONE
Change-Id: Ieffd45ba963eecf5386a3601a2eaaf865b60ca29
| -rw-r--r-- | src/caption.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/caption.c b/src/caption.c index 407bea8..9c823de 100644 --- a/src/caption.c +++ b/src/caption.c @@ -889,6 +889,8 @@ put_char(struct caption *cc, cc_channel *ch, vbi_char c) ch->line[COLUMNS - 2] = c; } + if (ch->mode == MODE_POP_ON) + return; ch->update = 1; //if ((c.unicode & 0x7F) == 0x20) // word_break(cc, ch, 1); @@ -1219,7 +1221,8 @@ caption_command(vbi_decoder *vbi, struct caption *cc, word_break(cc, ch, 1); ch->update = 1; - if (ch->mode == MODE_ROLL_UP) { + /*if (ch->mode == MODE_ROLL_UP) */ + { memmove(acp, acp + COLUMNS, sizeof(*acp) * (ch->roll - 1) * COLUMNS); for (i = 0; i <= COLUMNS; i++) { memset(&ch->line[i], 0, sizeof(vbi_char)); @@ -1233,6 +1236,12 @@ caption_command(vbi_decoder *vbi, struct caption *cc, ch->col1 = ch->col = 1; } + ch->attr.underline = FALSE; + ch->attr.background = VBI_BLACK; + ch->attr.opacity = VBI_OPAQUE; + ch->attr.flash = FALSE; + ch->attr.italic = FALSE; + ch->attr.foreground = VBI_WHITE; return; |