summaryrefslogtreecommitdiff
authorKe Gong <ke.gong@amlogic.com>2017-05-27 01:25:25 (GMT)
committer Ke Gong <ke.gong@amlogic.com>2017-05-27 01:25:25 (GMT)
commit0337d35737a852b45266684b373f6a0fe7f537bd (patch)
treec5c754087e679cfe5878cb7013700b1cd261f775
parente24d50f76b0e1ad69a6c2677004ac830a3563ea3 (diff)
downloadlibzvbi-0337d35737a852b45266684b373f6a0fe7f537bd.zip
libzvbi-0337d35737a852b45266684b373f6a0fe7f537bd.tar.gz
libzvbi-0337d35737a852b45266684b373f6a0fe7f537bd.tar.bz2
PD#145089: cc: reset service & seq_num when display window error
Squashed commit of the following: commit 64886f398237a6f963a36464f40918dfd399180c Author: Pengfei Liu <pengfei.liu@amlogic.com> Date: Fri May 26 17:05:54 2017 +0800 PD#145089: cc: reset service & seq_num when display window error Change-Id: I8e34ba1bb75bf3640be947f2729b7776773bbd5d
Diffstat
-rwxr-xr-xsrc/dtvcc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dtvcc.c b/src/dtvcc.c
index f79b54b..33f8d0a 100755
--- a/src/dtvcc.c
+++ b/src/dtvcc.c
@@ -2828,6 +2828,10 @@ dtvcc_display_windows (struct dtvcc_decoder * dc,
unsigned int i;
window_map &= ds->created;
+ if(ds->curr_window == NULL && ds->created == 0) {
+ LOGI("display windows error: cur win is NULL");
+ return FALSE;
+ }
for (i = 0; i < 8; ++i) {
struct dtvcc_window *dw;
@@ -3413,6 +3417,7 @@ dtvcc_decode_packet (struct dtvcc_decoder * dc,
continue;
dtvcc_reset_service (ds);
+ dc->next_sequence_number = -1;
}
return;