From ec8488499943085490b280b7065e20e8a14c4319 Mon Sep 17 00:00:00 2001
From: yan yan<yan.yan@amlogic.com>
Date: Fri, 15  Dec  2017  06:07:27  +0000
Subject: ATVCC: fix pop-on issue

PD# NONE

Change-Id: Iad614d109f68fc1d1baa06d93edd9a331176c364
---
diff --git a/src/caption.c b/src/caption.c
index b96a8d6..d7aca7b 100644
--- a/src/caption.c
+++ b/src/caption.c
@@ -912,16 +912,12 @@ set_cursor(cc_channel *ch, int col, int row)
 {
 	if (row < ch->row1) {
 		ch->row1 = row;
-		//clear_roll(ch);
-		//update_all(ch);
 		if (ch->mode == MODE_ROLL_UP) {
 			clear_roll(ch);
 			update_all(ch);
 		}
 	} else if (row >= ch->row1 + ch->roll) {
 		ch->row1 = row - ch->roll + 1;
-		//clear_roll(ch);
-		//update_all(ch);
 		if (ch->mode == MODE_ROLL_UP) {
 			clear_roll(ch);
 			update_all(ch);
@@ -1158,9 +1154,12 @@ caption_command(vbi_decoder *vbi, struct caption *cc,
 		case 0:		/* Resume Caption Loading	001 c10f  010 0000 */
 			ch = switch_channel(cc, ch, chan & 3);
 
-			ch->mode = MODE_POP_ON;
+			if (ch->mode != MODE_POP_ON) {
+				erase_memory(cc, ch, ch->hidden);
+				erase_memory(cc, ch, ch->hidden ^ 1);
+			}
 
-// no?			erase_memory(cc, ch);
+			ch->mode = MODE_POP_ON;
 
 			return;
 
@@ -1192,6 +1191,9 @@ caption_command(vbi_decoder *vbi, struct caption *cc,
 		case 9:		/* Resume Direct Captioning	001 c10f  010 1001 */
 // not verified
 			ch = switch_channel(cc, ch, chan & 3);
+			if (ch->edm_flag) {
+				erase_memory(cc, ch, ch->hidden);
+			}
 			ch->mode = MODE_PAINT_ON;
 			return;
 
--
cgit