From 90305affd4fbe187cf27de5874e8fdbf8591d866 Mon Sep 17 00:00:00 2001
From: Yan Yan<yan.yan@amlogic.com>
Date: Thu, 07  Dec  2017  05:36:19  +0000
Subject: ATVCC:

1. entire line display in pop-up mode instead of words jump
2. Fix color mismatch issue

PD# NONE

Change-Id: Ieffd45ba963eecf5386a3601a2eaaf865b60ca29
---
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;
 
--
cgit