author | Ke Gong <ke.gong@amlogic.com> | 2015-07-07 03:14:49 (GMT) |
---|---|---|
committer | Ke Gong <ke.gong@amlogic.com> | 2015-07-07 03:14:49 (GMT) |
commit | 866af25bfffb53a89aa0017ac0b9ef7afde722d8 (patch) | |
tree | 8d57d9cb2774191535326f329f00993134b56427 | |
parent | a4346f51801b82d4779cc23f956b440bb7050458 (diff) | |
download | libzvbi-866af25bfffb53a89aa0017ac0b9ef7afde722d8.zip libzvbi-866af25bfffb53a89aa0017ac0b9ef7afde722d8.tar.gz libzvbi-866af25bfffb53a89aa0017ac0b9ef7afde722d8.tar.bz2 |
PD #107547: support Android5.1
Change-Id: Id5b3722d08cf0e5996e1df2b0778c33b1fab8607
-rwxr-xr-x | Android.mk | 9 | ||||
-rwxr-xr-x | ntsc_decode/ntsc_dmx/am_vbi_dmx.c | 8 | ||||
-rwxr-xr-x | ntsc_decode/ntsc_dmx/linux_vbi/linux_ntsc.c | 10 |
3 files changed, 16 insertions, 11 deletions
@@ -10,10 +10,13 @@ LOCAL_SRC_FILES := src/bit_slicer.c src/cache.c src/caption.c src/conv.c src/dvb src/tables.c src/trigger.c src/vbi.c src/vps.c src/wss.c src/xds_demux.c src/decoder.c src/dtvcc.c LOCAL_CFLAGS+=-D_REENTRANT -D_GNU_SOURCE -DENABLE_DVB=1 -DENABLE_V4L=1 -DENABLE_V4L2=1 -DHAVE_ICONV=1 -DPACKAGE=\"zvbi\" -DVERSION=\"0.2.33\" -DANDROID +ifeq ($(ANDROID_BUILD_TYPE), 64) +LOCAL_CFLAGS+=-DHAVE_S64_U64 +endif + LOCAL_ARM_MODE := arm -LOCAL_C_INCLUDES := external/icu4c/common\ - external/icu/icu4c/source/common - +LOCAL_C_INCLUDES := external/icu4c/common +LOCAL_C_INCLUDES += external/icu/icu4c/source/common LOCAL_SHARED_LIBRARIES += libicuuc liblog diff --git a/ntsc_decode/ntsc_dmx/am_vbi_dmx.c b/ntsc_decode/ntsc_dmx/am_vbi_dmx.c index 713c7c0..e734711 100755 --- a/ntsc_decode/ntsc_dmx/am_vbi_dmx.c +++ b/ntsc_decode/ntsc_dmx/am_vbi_dmx.c @@ -189,11 +189,13 @@ static void* dmx_data_thread(void *arg) if(cb) { - if(id && sec) - AM_DEBUG( "filter %d data callback len fd:%d len:%d, %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", - id, (int)filter->drv_data, sec_len, + if(id && sec) { + int fd = (long)filter->drv_data; + AM_DEBUG( "filter %d data callback len fd:%d len:%d, %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", + id, fd, sec_len, sec[0], sec[1], sec[2], sec[3], sec[4], sec[5], sec[6], sec[7], sec[8], sec[9]); + } cb(dev->dev_no, id, sec, sec_len, data); if(id && sec) AM_DEBUG( "filter %d data callback ok", id); diff --git a/ntsc_decode/ntsc_dmx/linux_vbi/linux_ntsc.c b/ntsc_decode/ntsc_dmx/linux_vbi/linux_ntsc.c index 7b891da..235606a 100755 --- a/ntsc_decode/ntsc_dmx/linux_vbi/linux_ntsc.c +++ b/ntsc_decode/ntsc_dmx/linux_vbi/linux_ntsc.c @@ -141,7 +141,7 @@ static AM_ErrorCode_t vbi_alloc_filter(AM_VBI_Device_t *dev, AM_VBI_Filter_t *fi */ //*************************************************** - filter->drv_data = (void*)fd; + filter->drv_data = (void*)(long)fd; return AM_SUCCESS; } @@ -149,7 +149,7 @@ static AM_ErrorCode_t vbi_alloc_filter(AM_VBI_Device_t *dev, AM_VBI_Filter_t *fi static AM_ErrorCode_t vbi_free_filter(AM_VBI_Device_t *dev, AM_VBI_Filter_t *filter) { VbiDmx_t *dmx = (VbiDmx_t*)dev->drv_data; - int fd = (int)filter->drv_data; + int fd = (long)filter->drv_data; close(fd); dmx->fd[filter->id] = -1; @@ -162,7 +162,7 @@ static AM_ErrorCode_t vbi_free_filter(AM_VBI_Device_t *dev, AM_VBI_Filter_t *fil static AM_ErrorCode_t vbi_enable_filter(AM_VBI_Device_t *dev, AM_VBI_Filter_t *filter, vbi_bool enable) { AM_DEBUG("**************************vbi_enable_filter*******************\n"); - int fd = (int)filter->drv_data; + int fd = (long)filter->drv_data; int ret; AM_DEBUG("***********vbi_enable_filter***************enable = %d \n",enable); if(enable) @@ -181,7 +181,7 @@ static AM_ErrorCode_t vbi_enable_filter(AM_VBI_Device_t *dev, AM_VBI_Filter_t *f static AM_ErrorCode_t vbi_set_buf_size(AM_VBI_Device_t *dev, AM_VBI_Filter_t *filter, int size) { - int fd = (int)filter->drv_data; + int fd = (long)filter->drv_data; int ret; AM_DEBUG("vbi_set_buf_size fd =%d size = %d\n",fd,size); @@ -259,7 +259,7 @@ static AM_ErrorCode_t vbi_poll(AM_VBI_Device_t *dev, AM_VBI_FilterMask_t *mask, static AM_ErrorCode_t vbi_read(AM_VBI_Device_t *dev, AM_VBI_Filter_t *filter, uint8_t *buf, int *size) { - int fd = (int)filter->drv_data; + int fd = (long)filter->drv_data; int len = *size; int ret; struct pollfd pfd; |