summaryrefslogtreecommitdiff
authorYan Yan <yan.yan@amlogic.com>2017-11-12 06:32:28 (GMT)
committer Yan Yan <yan.yan@amlogic.com>2017-11-13 04:36:27 (GMT)
commit709a9dbc1bcd53a183ee636fe0f5b8ea365a2b41 (patch)
tree2ad9b197cfd8fe3a0a2bfacdcb040ece7fbcadd9
parent80b7e2a7cebcf1154f8f2d85b7463950ce1ed376 (diff)
downloadlibzvbi-709a9dbc1bcd53a183ee636fe0f5b8ea365a2b41.zip
libzvbi-709a9dbc1bcd53a183ee636fe0f5b8ea365a2b41.tar.gz
libzvbi-709a9dbc1bcd53a183ee636fe0f5b8ea365a2b41.tar.bz2
cc: change header path to vendor, so openlinux can finish compiling.
PD# 152764 Change-Id: If3cecf62b546d5d196f868e7a6c8b218d56eb446
Diffstat
-rw-r--r--Android.mk2
-rwxr-xr-xsrc/dtvcc.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 37f662e..982a594 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_C_INCLUDES := external/icu4c/common
-LOCAL_C_INCLUDES := external/dvb/include/am_adp
+LOCAL_C_INCLUDES := vendor/amlogic/dvb/include/am_adp
LOCAL_C_INCLUDES += external/icu/icu4c/source/common
LOCAL_SHARED_LIBRARIES += libicuuc liblog
diff --git a/src/dtvcc.c b/src/dtvcc.c
index 0599fb3..1a5e050 100755
--- a/src/dtvcc.c
+++ b/src/dtvcc.c
@@ -2457,6 +2457,7 @@ dtvcc_put_char (struct dtvcc_decoder * dc,
if (NULL == dw) {
ds->error_line = __LINE__;
+ //AM_DEBUG(1, "================ window null !!!!!");
return FALSE;
}
@@ -2467,6 +2468,7 @@ dtvcc_put_char (struct dtvcc_decoder * dc,
dw->buffer[row][column] = c;
dw->pen[row][column] = dw->curr_pen.style;
+ //AM_DEBUG(1, "========= putchar %x %c", c, c);
if (dw->visible)
dtvcc_render(dc, ds);
@@ -2900,6 +2902,7 @@ dtvcc_display_windows (struct dtvcc_decoder * dc,
window_map &= ds->created;
+ //printf("display %02x %p %02x\n", c, ds->curr_window, ds->created);
if(ds->curr_window == NULL && ds->created == 0) {
return FALSE;
//return TRUE;
@@ -3448,7 +3451,6 @@ dtvcc_decode_packet (struct dtvcc_decoder * dc,
/*
dtvcc_reset (dc);
return;*/
- //AM_DEBUG(1, "packet size larger than dc packet_size");
packet_size = dc->packet_size;
}
@@ -3843,7 +3845,6 @@ tvcc_decode_data (struct tvcc_decoder *td,
case DTVCC_DATA:
j = td->dtvcc.packet_size;
- //AM_DEBUG(1, "ccdata ========== atsc data packet_size %d valid:%d type: %x data1:%x data2:%x\n", j, cc_valid, cc_type, cc_data_1, cc_data_2);
if (j <= 0) {
/* Missed packet start. */
break;