summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Android.mk14
-rw-r--r--screen_source/Android.mk31
-rw-r--r--screen_source/aml_screen.cpp296
-rw-r--r--screen_source/v4l2_vdin.cpp676
-rw-r--r--screen_source/v4l2_vdin.h144
-rw-r--r--tv_callback.h18
-rw-r--r--tv_input.cpp263
-rw-r--r--tvapi/android/Android.mk2
-rw-r--r--tvapi/android/include/ITv.h98
-rw-r--r--tvapi/android/include/ITvClient.h56
-rw-r--r--tvapi/android/include/ITvService.h66
-rw-r--r--tvapi/android/include/Tv.h158
-rw-r--r--tvapi/android/include/tvcmd.h1212
-rw-r--r--tvapi/android/jni/Android.mk135
-rw-r--r--tvapi/android/jni/cfbc_jni.cpp18
-rw-r--r--tvapi/android/jni/cfbc_test.cpp86
-rw-r--r--tvapi/android/jni/com_droidlogic_app_tv_TvControlManager.cpp (renamed from tvapi/android/jni/android_amlogic_tv.cpp)929
-rw-r--r--tvapi/android/libtvbinder/Android.mk48
-rw-r--r--tvapi/android/libtvbinder/ITv.cpp292
-rw-r--r--tvapi/android/libtvbinder/ITvClient.cpp116
-rw-r--r--tvapi/android/libtvbinder/ITvService.cpp100
-rw-r--r--tvapi/android/libtvbinder/Tv.cpp378
-rw-r--r--tvapi/android/tv/Android.mk23
-rw-r--r--tvapi/android/tv/CTv.cpp104
-rw-r--r--tvapi/android/tv/CTv.h54
-rw-r--r--tvapi/android/tvserver/Android.mk164
-rw-r--r--tvapi/android/tvserver/TvService.cpp8911
-rw-r--r--tvapi/android/tvserver/TvService.h170
-rw-r--r--tvapi/android/tvserver/main.cpp46
-rw-r--r--tvapi/android/tvserver/tv_callback.h18
-rw-r--r--[-rwxr-xr-x]tvapi/build/include/.gitignore0
-rw-r--r--tvapi/build/include/xxxconfig.h1
-rw-r--r--tvapi/docs/tv.uml12156
-rw-r--r--tvapi/libtv/Android.mk12
-rw-r--r--tvapi/libtv/audio/CAudioCustomerCtrl.cpp126
-rw-r--r--tvapi/libtv/audio/CAudioCustomerCtrl.h31
-rw-r--r--tvapi/libtv/audio/CTvAudio.cpp30
-rw-r--r--tvapi/libtv/audio/CTvAudio.h76
-rw-r--r--tvapi/libtv/audio/audio_alsa.cpp2073
-rw-r--r--tvapi/libtv/audio/audio_alsa.h257
-rw-r--r--tvapi/libtv/audio/audio_android.cpp1035
-rw-r--r--tvapi/libtv/audio/audio_android.h78
-rw-r--r--tvapi/libtv/audio/audio_android_effect.cpp591
-rw-r--r--tvapi/libtv/audio/audio_android_effect.h65
-rw-r--r--tvapi/libtv/audio/audio_api.cpp2470
-rw-r--r--tvapi/libtv/audio/audio_api.h323
-rw-r--r--tvapi/libtv/audio/audio_effect.cpp356
-rw-r--r--tvapi/libtv/audio/audio_effect.h58
-rw-r--r--tvapi/libtv/include/amstream.h526
-rw-r--r--tvapi/libtv/include/amvecm.h136
-rw-r--r--tvapi/libtv/include/cm.h308
-rw-r--r--tvapi/libtv/include/hdmirx_cec.h316
-rw-r--r--tvapi/libtv/include/ve.h461
-rw-r--r--tvapi/libtv/tv/AutoBackLight.cpp425
-rw-r--r--tvapi/libtv/tv/CAutoPQparam.cpp150
-rw-r--r--tvapi/libtv/tv/CAutoPQparam.h41
-rw-r--r--tvapi/libtv/tv/CAv.cpp116
-rw-r--r--tvapi/libtv/tv/CAv.h24
-rw-r--r--tvapi/libtv/tv/CFbcCommunication.cpp443
-rw-r--r--tvapi/libtv/tv/CFbcCommunication.h25
-rw-r--r--tvapi/libtv/tv/CFrontEnd.cpp198
-rw-r--r--tvapi/libtv/tv/CFrontEnd.h19
-rw-r--r--tvapi/libtv/tv/CTv.cpp13003
-rw-r--r--tvapi/libtv/tv/CTv.h1453
-rw-r--r--tvapi/libtv/tv/CTvBooking.cpp324
-rw-r--r--tvapi/libtv/tv/CTvBooking.h166
-rw-r--r--tvapi/libtv/tv/CTvEpg.cpp24
-rw-r--r--tvapi/libtv/tv/CTvEv.h12
-rw-r--r--tvapi/libtv/tv/CTvLog.h8
-rw-r--r--tvapi/libtv/tv/CTvRecord.cpp552
-rw-r--r--tvapi/libtv/tv/CTvRecord.h92
-rw-r--r--tvapi/libtv/tv/CTvSatellite.h42
-rw-r--r--tvapi/libtv/tv/CTvScanner.cpp335
-rw-r--r--tvapi/libtv/tv/CTvScanner.h26
-rw-r--r--tvapi/libtv/tv/CTvScreenCapture.cpp1279
-rw-r--r--tvapi/libtv/tv/CTvScreenCapture.h351
-rw-r--r--tvapi/libtv/tv/CTvSubtitle.cpp361
-rw-r--r--tvapi/libtv/tv/CTvSubtitle.h484
-rw-r--r--tvapi/libtv/tv/CTvVchipCheck.cpp6
-rw-r--r--tvapi/libtv/tv/CUpgradeFBC.cpp4
-rw-r--r--tvapi/libtv/tv/CUpgradeFBC.h282
-rw-r--r--tvapi/libtv/tv/ScreenCatch.cpp379
-rw-r--r--tvapi/libtv/tvconfig/CIniFile.cpp706
-rw-r--r--tvapi/libtv/tvconfig/tvconfig.conf58
-rw-r--r--tvapi/libtv/tvconfig/tvconfig.cpp106
-rw-r--r--tvapi/libtv/tvconfig/tvconfig.h40
-rw-r--r--tvapi/libtv/tvdb/CTvChannel.cpp694
-rw-r--r--tvapi/libtv/tvdb/CTvChannel.h574
-rw-r--r--tvapi/libtv/tvdb/CTvDatabase.cpp25
-rw-r--r--tvapi/libtv/tvdb/CTvDatabase.h188
-rw-r--r--tvapi/libtv/tvdb/CTvDimension.cpp86
-rw-r--r--tvapi/libtv/tvdb/CTvDimension.h194
-rw-r--r--tvapi/libtv/tvdb/CTvEvent.cpp483
-rw-r--r--tvapi/libtv/tvdb/CTvEvent.h170
-rw-r--r--tvapi/libtv/tvdb/CTvGroup.cpp88
-rw-r--r--tvapi/libtv/tvdb/CTvGroup.h60
-rw-r--r--tvapi/libtv/tvdb/CTvProgram.cpp1806
-rw-r--r--tvapi/libtv/tvdb/CTvProgram.h1066
-rw-r--r--tvapi/libtv/tvdb/CTvRegion.cpp366
-rw-r--r--tvapi/libtv/tvdb/CTvRegion.h84
-rw-r--r--tvapi/libtv/tvin/CHDMIRxCEC.cpp38
-rw-r--r--tvapi/libtv/tvin/CSourceConnectDetect.cpp478
-rw-r--r--tvapi/libtv/tvin/CSourceConnectDetect.h73
-rw-r--r--tvapi/libtv/tvin/CTvin.cpp203
-rw-r--r--tvapi/libtv/tvin/CTvin.h191
-rw-r--r--tvapi/libtv/tvsetting/CBlobDevice.cpp54
-rw-r--r--tvapi/libtv/tvsetting/CBlobDevice.h100
-rw-r--r--tvapi/libtv/tvsetting/CBlobDeviceE2prom.cpp403
-rw-r--r--tvapi/libtv/tvsetting/CBlobDeviceE2prom.h152
-rw-r--r--tvapi/libtv/tvsetting/CBlobDeviceFile.cpp160
-rw-r--r--tvapi/libtv/tvsetting/CBlobDeviceFile.h52
-rw-r--r--tvapi/libtv/tvsetting/CBlobDeviceRam.cpp258
-rw-r--r--tvapi/libtv/tvsetting/CBlobDeviceRam.h74
-rw-r--r--tvapi/libtv/tvsetting/CTvSetting.cpp4658
-rw-r--r--tvapi/libtv/tvsetting/CTvSetting.h30
-rw-r--r--tvapi/libtv/tvsetting/CTvSettingCfg.h782
-rw-r--r--tvapi/libtv/tvsetting/CTvSettingDeviceFactory.cpp10
-rw-r--r--tvapi/libtv/tvsetting/TvKeyData.cpp2726
-rw-r--r--tvapi/libtv/tvsetting/TvKeyData.h64
-rw-r--r--tvapi/libtv/tvsetting/audio_cfg.cpp2575
-rw-r--r--tvapi/libtv/tvsetting/audio_cfg.h239
-rw-r--r--tvapi/libtv/tvutils/CCondition.h2
-rw-r--r--tvapi/libtv/tvutils/CFile.cpp65
-rw-r--r--tvapi/libtv/tvutils/CFile.h3
-rw-r--r--tvapi/libtv/tvutils/CHdmiCecCmd.cpp2
-rw-r--r--tvapi/libtv/tvutils/CMsgQueue.cpp31
-rw-r--r--tvapi/libtv/tvutils/CMsgQueue.h3
-rw-r--r--tvapi/libtv/tvutils/CSerialCommunication.h96
-rw-r--r--tvapi/libtv/tvutils/CSerialPort.cpp18
-rw-r--r--tvapi/libtv/tvutils/CSqlite.cpp8
-rw-r--r--tvapi/libtv/tvutils/CSqlite.h12
-rw-r--r--tvapi/libtv/tvutils/CThread.cpp2
-rw-r--r--tvapi/libtv/tvutils/CTvInput.cpp25
-rw-r--r--tvapi/libtv/tvutils/CTvInput.h4
-rw-r--r--tvapi/libtv/tvutils/serial_base.h34
-rw-r--r--tvapi/libtv/tvutils/serial_operate.cpp66
-rw-r--r--tvapi/libtv/tvutils/serial_operate.h70
-rw-r--r--tvapi/libtv/tvutils/tvutils.cpp3931
-rw-r--r--tvapi/libtv/tvutils/tvutils.h222
-rw-r--r--tvapi/libtv/tvutils/zepoll.cpp2
-rw-r--r--tvapi/libtv/version/version.cpp188
-rw-r--r--tvapi/libtv/version/version.h22
-rw-r--r--tvapi/libtv/vpp/CPQdb.cpp3509
-rw-r--r--tvapi/libtv/vpp/CPQdb.h340
-rw-r--r--tvapi/libtv/vpp/CVpp.cpp5602
-rw-r--r--tvapi/libtv/vpp/CVpp.h230
-rw-r--r--tvapi/tvtests/Android.mk98
-rw-r--r--tvapi/tvtests/android_tvtest.cpp2
-rw-r--r--tvapi/tvtests/comm_test.cpp4
-rw-r--r--tvapi/tvtests/ssm_test.cpp420
-rw-r--r--tvapi/tvtests/tvconfig_test.cpp854
151 files changed, 45277 insertions, 47437 deletions
diff --git a/tvapi/libtv/tv/CTvSubtitle.cpp b/tvapi/libtv/tv/CTvSubtitle.cpp
index 1442dad..4ee991c 100644
--- a/tvapi/libtv/tv/CTvSubtitle.cpp
+++ b/tvapi/libtv/tv/CTvSubtitle.cpp
@@ -1,13 +1,15 @@
//
//
-// amlogic 2013
+// amlogic 2013
//
-// @ Project : tv
-// @ Date : 2013-11
-// @ Author :
+// @ Project : tv
+// @ Date : 2013-11
+// @ Author :
//
//
#include "CTvSubtitle.h"
+#include "am_misc.h"
+#include "am_dmx.h"
CTvSubtitle::CTvSubtitle()
{
mpObser = NULL;
@@ -15,10 +17,17 @@ CTvSubtitle::CTvSubtitle()
CTvSubtitle::~CTvSubtitle()
{
}
-void CTvSubtitle::setObser(IObserver *pObser)
+void CTvSubtitle::setObserver(IObserver *pObser)
{
+ isSubOpen = false;
mpObser = pObser;
}
+void CTvSubtitle::setBuffer(char *share_mem)
+{
+ pthread_mutex_lock(&lock);
+ buffer = (unsigned char *)share_mem;
+ pthread_mutex_unlock(&lock);
+}
void CTvSubtitle::stopDecoder()
{
}
@@ -79,9 +88,9 @@ void CTvSubtitle::goHome()
/**
* 在图文模式下根据颜色跳转到指定链接
- * @param color 颜色,COLOR_RED/COLOR_GREEN/COLOR_YELLOW/COLOR_BLUE
+ * @param color 颜色,COLOR_RED/COLOR_GREEN/COLOR_YELLOW/COLOR_BLUE
*/
-void CTvSubtitle::colorLink(int color)
+void CTvSubtitle::colorLink(int color)
{
}
@@ -110,77 +119,360 @@ void CTvSubtitle::searchPrevious()
{
}
-int CTvSubtitle::sub_init()
+int CTvSubtitle::sub_init(int bmp_width, int bmp_height)
{
+ pthread_mutex_init(&lock, NULL);
+ bmp_w = bmp_width;
+ bmp_h = bmp_height;
+ sub_w = 720;
+ sub_h = 576;
+ bmp_pitch = bmp_w * 4;
return 0;
}
-int CTvSubtitle::sub_destroy()
+int CTvSubtitle::sub_destroy()
{
return 0;
}
-int CTvSubtitle::sub_lock()
+int CTvSubtitle::sub_lock()
{
+ pthread_mutex_lock(&lock);
return 0;
}
-int CTvSubtitle::sub_unlock()
+int CTvSubtitle::sub_unlock()
{
+ pthread_mutex_unlock(&lock);
return 0;
}
-int CTvSubtitle::sub_clear()
+int CTvSubtitle::sub_clear()
{
return 0;
}
-int CTvSubtitle::sub_start_dvb_sub(int dmx_id, int pid, int page_id, int anc_page_id)
+static void clear_bitmap(CTvSubtitle *pSub)
+{
+ unsigned char *ptr = pSub->buffer;
+ int y = pSub->bmp_h;
+
+ while (y--) {
+ memset(ptr, 0, pSub->bmp_pitch);
+ ptr += pSub->bmp_pitch;
+ }
+
+}
+
+static void show_sub_cb(AM_SUB2_Handle_t handle, AM_SUB2_Picture_t *pic)
+{
+ LOGD("dvb callback-----------");
+
+ CTvSubtitle *pSub = ((CTvSubtitle *) AM_SUB2_GetUserData(handle));
+ pthread_mutex_lock(&pSub->lock);
+ clear_bitmap(pSub);
+
+ if (pic) {
+ AM_SUB2_Region_t *rgn = pic->p_region;
+ pSub->sub_w = pic->original_width;
+ pSub->sub_h = pic->original_height;
+ while (rgn) {
+ int sx, sy, dx, dy, rw, rh;
+
+ // ensure we have a valid buffer
+ if (! rgn->p_buf) {
+ rgn = rgn->p_next;
+ continue;
+ }
+
+ sx = 0;
+ sy = 0;
+ dx = pic->original_x + rgn->left;
+ dy = pic->original_y + rgn->top;
+ rw = rgn->width;
+ rh = rgn->height;
+
+ if (dx < 0) {
+ sx = -dx;
+ dx = 0;
+ rw += dx;
+ }
+
+ if (dx + rw > pSub->bmp_w) {
+ rw = pSub->bmp_w - dx;
+ }
+
+ if (dy < 0) {
+ sy = -dy;
+ dy = 0;
+ rh += dy;
+ }
+
+ if (dy + rh > pSub->bmp_h) {
+ rh = pSub->bmp_h - dy;
+ }
+
+ if ((rw > 0) && (rh > 0)) {
+ unsigned char *sbegin = (unsigned char *)rgn->p_buf + sy * rgn->width + sx;
+ unsigned char *dbegin = pSub->buffer + dy * pSub->bmp_pitch + dx * 4;
+ unsigned char *src, *dst;
+ int size;
+
+ while (rh) {
+ src = sbegin;
+ dst = dbegin;
+ size = rw;
+ while (size--) {
+ int c = src[0];
+
+ if (c < (int)rgn->entry) {
+ if (rgn->clut[c].a) {
+ *dst++ = rgn->clut[c].r;
+ *dst++ = rgn->clut[c].g;
+ *dst++ = rgn->clut[c].b;
+ } else {
+ dst += 3;
+ }
+ *dst++ = rgn->clut[c].a;
+ } else {
+ dst += 4;
+ }
+ src ++;
+ }
+ sbegin += rgn->width;
+ dbegin += pSub->bmp_pitch;
+ rh--;
+ }
+ }
+
+ rgn = rgn->p_next;
+ }
+ pSub->mpObser->updateSubtitle(pic->original_width, pic->original_height);
+ }
+ pthread_mutex_unlock(&pSub->lock);
+
+}
+
+static uint64_t get_pts_cb(void *handle, uint64_t pts)
+{
+ char buf[32];
+ AM_ErrorCode_t ret;
+ uint32_t v;
+ uint64_t r;
+
+ ret = AM_FileRead("/sys/class/tsync/pts_pcrscr", buf, sizeof(buf));
+ if (!ret) {
+ v = strtoul(buf, 0, 16);
+ if (pts & (1LL << 32)) {
+ r = ((uint64_t)v) | (1LL << 32);
+ } else {
+ r = (uint64_t)v;
+ }
+ } else {
+ r = 0LL;
+ }
+
+ return r;
+}
+
+static void pes_data_cb(int dev_no, int fhandle, const uint8_t *data, int len, void *user_data)
+{
+ CTvSubtitle *pSub = ((CTvSubtitle *) user_data);
+ AM_PES_Decode(pSub->pes_handle, (uint8_t *)data, len);
+}
+
+static int close_dmx(CTvSubtitle *pSub)
{
+ AM_DMX_FreeFilter(pSub->dmx_id, pSub->filter_handle);
+ AM_DMX_Close(pSub->dmx_id);
+ pSub->dmx_id = -1;
+ pSub->filter_handle = -1;
+
return 0;
}
-int CTvSubtitle::sub_start_dtv_tt(int dmx_id, int region_id, int pid, int page, int sub_page, bool is_sub)
+static int open_dmx(CTvSubtitle *pSub, int dmx_id, int pid)
{
+ close_dmx(pSub);
+ AM_DMX_OpenPara_t op;
+ struct dmx_pes_filter_params pesp;
+ AM_ErrorCode_t ret;
+
+ pSub->dmx_id = -1;
+ pSub->filter_handle = -1;
+ memset(&op, 0, sizeof(op));
+
+ ret = AM_DMX_Open(dmx_id, &op);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_DMX_Open != AM_SUCCESS");
+ goto error;
+ }
+ pSub->dmx_id = dmx_id;
+
+ ret = AM_DMX_AllocateFilter(dmx_id, &pSub->filter_handle);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_DMX_AllocateFilter != AM_SUCCESS");
+ goto error;
+ }
+
+ ret = AM_DMX_SetBufferSize(dmx_id, pSub->filter_handle, 0x80000);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_DMX_SetBufferSize != AM_SUCCESS");
+ goto error;
+ }
+
+ memset(&pesp, 0, sizeof(pesp));
+ pesp.pid = pid;
+ pesp.output = DMX_OUT_TAP;
+ pesp.pes_type = DMX_PES_TELETEXT0;
+
+ ret = AM_DMX_SetPesFilter(dmx_id, pSub->filter_handle, &pesp);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_DMX_SetPesFilter != AM_SUCCESS, err = %d", strerror(errno));
+ goto error;
+ }
+
+ ret = AM_DMX_SetCallback(dmx_id, pSub->filter_handle, pes_data_cb, pSub);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_DMX_SetCallback != AM_SUCCESS");
+ goto error;
+ }
+
+ ret = AM_DMX_StartFilter(dmx_id, pSub->filter_handle);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_DMX_StartFilter != AM_SUCCESS,dmx_id=%d,filter_handle=%d, ret = %d", dmx_id, pSub->filter_handle, ret);
+ goto error;
+ }
+
return 0;
+error:
+ if (pSub->filter_handle != -1) {
+ AM_DMX_FreeFilter(dmx_id, pSub->filter_handle);
+ }
+ if (pSub->dmx_id != -1) {
+ AM_DMX_Close(dmx_id);
+ }
+
+ return -1;
}
-int CTvSubtitle::sub_stop_dvb_sub()
+static void pes_sub_cb(AM_PES_Handle_t handle, uint8_t *buf, int size)
{
+ CTvSubtitle *pSub = ((CTvSubtitle *) AM_SUB2_GetUserData(handle));
+ AM_SUB2_Decode(pSub->sub_handle, buf, size);
+}
+
+int CTvSubtitle::sub_switch_status()
+{
+ return isSubOpen ? 1 : 0;
+}
+int CTvSubtitle::sub_start_dvb_sub(int dmx_id, int pid, int page_id, int anc_page_id)
+{
+ LOGD("start dvb subtitle=----------------");
+
+ AM_PES_Para_t pesp;
+ AM_SUB2_Para_t subp;
+ int ret;
+
+ memset(&pesp, 0, sizeof(pesp));
+ pesp.packet = pes_sub_cb;
+ pesp.user_data = this;
+ ret = AM_PES_Create(&pes_handle, &pesp);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_PES_Create != AM_SUCCESS");
+ goto error;
+ }
+
+ memset(&subp, 0, sizeof(subp));
+ subp.show = show_sub_cb;
+ subp.get_pts = get_pts_cb;
+ subp.composition_id = page_id;
+ subp.ancillary_id = anc_page_id;
+ subp.user_data = this;
+ ret = AM_SUB2_Create(&sub_handle, &subp);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_SUB2_Create != AM_SUCCESS");
+ goto error;
+ }
+
+ ret = AM_SUB2_Start(sub_handle);
+ if (ret != AM_SUCCESS) {
+ LOGD("error AM_SUB2_Start != AM_SUCCESS");
+ goto error;
+ }
+
+ ret = open_dmx(this, dmx_id, pid);
+ if (ret < 0) {
+ LOGD("error open_dmx != AM_SUCCESS");
+ goto error;
+ }
+ isSubOpen = true;
+ return 0;
+error:
+ if (sub_handle) {
+ AM_SUB2_Destroy(sub_handle);
+ sub_handle = NULL;
+ }
+ if (pes_handle) {
+ AM_PES_Destroy(pes_handle);
+ pes_handle = NULL;
+ }
+ return -1;
+}
+
+int CTvSubtitle::sub_start_dtv_tt(int dmx_id, int region_id, int pid, int page, int sub_page, bool is_sub)
+{
+ return 0;
+}
+
+int CTvSubtitle::sub_stop_dvb_sub()
+{
+ pthread_mutex_lock(&lock);
+ close_dmx(this);
+ AM_SUB2_Destroy(sub_handle);
+ AM_PES_Destroy(pes_handle);
+
+ clear_bitmap(this);
+ mpObser->updateSubtitle(0, 0);
+
+ sub_handle = NULL;
+ pes_handle = NULL;
+ isSubOpen = false;
+ pthread_mutex_unlock(&lock);
return 0;
}
-int CTvSubtitle::sub_stop_dtv_tt()
+int CTvSubtitle::sub_stop_dtv_tt()
{
return 0;
}
-int CTvSubtitle::sub_tt_goto(int page)
+int CTvSubtitle::sub_tt_goto(int page)
{
return 0;
}
-int CTvSubtitle::sub_tt_color_link(int color)
+int CTvSubtitle::sub_tt_color_link(int color)
{
return 0;
}
-int CTvSubtitle::sub_tt_home_link()
+int CTvSubtitle::sub_tt_home_link()
{
return 0;
}
-int CTvSubtitle::sub_tt_next(int dir)
+int CTvSubtitle::sub_tt_next(int dir)
{
return 0;
}
-int CTvSubtitle::sub_tt_set_search_pattern(char *pattern, bool casefold)
+int CTvSubtitle::sub_tt_set_search_pattern(char *pattern, bool casefold)
{
return 0;
}
-int CTvSubtitle::sub_tt_search(int dir)
+int CTvSubtitle::sub_tt_search(int dir)
{
return 0;
}
@@ -230,10 +522,10 @@ program, no signal, blocked...*/
//channel_num == 0 ,if frontend is dtv
//else != 0
-int CTvSubtitle::sub_start_atsc_cc(enum cc_param_country country, enum cc_param_source_type src_type, int channel_num, enum cc_param_caption_type caption_type)
+int CTvSubtitle::sub_start_atsc_cc(enum cc_param_country country, enum cc_param_source_type src_type, int channel_num, enum cc_param_caption_type caption_type)
{
LOGD("----sub_start_atsc_cc-1--- country=%d,src=%d,ctype=%d", country, src_type, caption_type);
- switch(country) {
+ switch (country) {
case CC_PARAM_COUNTRY_USA:
AM_CC_Cmd(CMD_SET_COUNTRY_USA);
break;
@@ -245,7 +537,7 @@ int CTvSubtitle::sub_start_atsc_cc(enum cc_param_country country, enum cc_param_
break;
}
- switch(src_type) {
+ switch (src_type) {
case CC_PARAM_SOURCE_VBIDATA:
AM_CC_Cmd(CMD_CC_SET_VBIDATA);
break;
@@ -258,13 +550,13 @@ int CTvSubtitle::sub_start_atsc_cc(enum cc_param_country country, enum cc_param_
}
//just for test
- if(channel_num == 0) {
+ if (channel_num == 0) {
} else {
//AM_CC_Cmd(CMD_CC_SET_CHAN_NUM);
}
AM_CLOSECAPTION_cmd_t cc_t_cmd;
- switch(caption_type) {
+ switch (caption_type) {
case CC_PARAM_ANALOG_CAPTION_TYPE_CC1:
cc_t_cmd = CMD_CC_1;
break;
@@ -303,13 +595,13 @@ int CTvSubtitle::sub_start_atsc_cc(enum cc_param_country country, enum cc_param_
return 0;
}
-int CTvSubtitle::sub_stop_atsc_cc()
+int CTvSubtitle::sub_stop_atsc_cc()
{
LOGD("----sub_stop_atsc_cc----");
AM_CC_Cmd(CMD_CC_STOP);
return 0;
}
-int CTvSubtitle::ResetVchipChgStat()
+int CTvSubtitle::ResetVchipChgStat()
{
avchip_chg = 0;
AM_CC_Cmd(CMD_VCHIP_RST_CHGSTAT);
@@ -325,14 +617,16 @@ int CTvSubtitle::IsVchipChange()
void CTvSubtitle::close_caption_callback(char *str, int cnt, int data_buf[], int cmd_buf[], void *user_data)
{
+ /*
CTvSubtitle *pSub = (CTvSubtitle *)user_data;
- if(pSub == NULL) {
- LOGD("sub cc callback is null user data for this");
- return;
+ if (pSub == NULL)
+ {
+ LOGD("sub cc callback is null user data for this");
+ return;
}
- if(pSub->mpObser == NULL) return;
+ if (pSub->mpObser == NULL) return;
pSub->mCurCCEv.mDataBufSize = cnt;
pSub->mCurCCEv.mpDataBuffer = data_buf;
@@ -340,6 +634,7 @@ void CTvSubtitle::close_caption_callback(char *str, int cnt, int data_buf[], int
pSub->mCurCCEv.mpCmdBuffer = cmd_buf;
pSub->mpObser->onEvent(pSub->mCurCCEv);
+ */
}
void CTvSubtitle::atv_vchip_callback(int Is_chg, void *user_data)
{