author | Gong Ke <ke.gong@amlogic.com> | 2017-12-18 12:27:14 (GMT) |
---|---|---|
committer | Gong Ke <ke.gong@amlogic.com> | 2017-12-18 12:27:14 (GMT) |
commit | 7eacdecc5cb1091f8b584c1a2fce47b015b941dd (patch) | |
tree | 1733e7e14ea9f1fd36f1eada6ad7808489591838 | |
parent | 71659f616244d77636118090e5fa633845e6e097 (diff) | |
download | dvb-7eacdecc5cb1091f8b584c1a2fce47b015b941dd.zip dvb-7eacdecc5cb1091f8b584c1a2fce47b015b941dd.tar.gz dvb-7eacdecc5cb1091f8b584c1a2fce47b015b941dd.tar.bz2 |
am_adp: set disable_video to 2 and add no_audio_data test flag [1/1]
PD# NONE
Change-Id: Ia19ce7e2661fe8576ee5db1cdeb519a806f8f9bd
-rw-r--r-- | am_adp/am_av/am_av.c | 2 | ||||
-rw-r--r-- | am_adp/am_av/aml/aml.c | 2 | ||||
-rwxr-xr-x | lib32/libam_ver.so | 6 | ||||
-rwxr-xr-x | lib64/libam_ver.so | 4 | ||||
-rwxr-xr-x | libam_ver.so | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/am_adp/am_av/am_av.c b/am_adp/am_av/am_av.c index bac1dc7..921553a 100644 --- a/am_adp/am_av/am_av.c +++ b/am_adp/am_av/am_av.c @@ -2046,7 +2046,7 @@ AM_ErrorCode_t AM_AV_EnableVideo(int dev_no) { if (dev->drv->set_video_para) { - ret = dev->drv->set_video_para(dev, AV_VIDEO_PARA_ENABLE, (void*)AM_TRUE); + ret = dev->drv->set_video_para(dev, AV_VIDEO_PARA_ENABLE, (void*)(size_t)2); } if (ret == AM_SUCCESS) diff --git a/am_adp/am_av/aml/aml.c b/am_adp/am_av/aml/aml.c index 936cf14..c9d3a06 100644 --- a/am_adp/am_av/aml/aml.c +++ b/am_adp/am_av/aml/aml.c @@ -3946,7 +3946,7 @@ static void* aml_av_monitor_thread(void *arg) } //first no_data - if (has_audio && adec_start && (dmx_apts_stop_dur > NO_DATA_CHECK_TIME) && (apts_stop_dur > NO_DATA_CHECK_TIME)) { + if (has_audio && adec_start && !no_audio_data && (dmx_apts_stop_dur > NO_DATA_CHECK_TIME) && (apts_stop_dur > NO_DATA_CHECK_TIME)) { AM_Bool_t sf[2]; AM_DEBUG(1, "[avmon] audio stoped"); no_audio_data = AM_TRUE; diff --git a/lib32/libam_ver.so b/lib32/libam_ver.so index 4a86156..fdb09f5 100755 --- a/lib32/libam_ver.so +++ b/lib32/libam_ver.so @@ -1,4 +1,4 @@ -ELF +ELF 0å3ÿ/áÐKâ @@ -97,8 +97,8 @@ B¿&¼ñ óÿ°°¬€:óÿ°°°€8óÿ°°¨€Nóÿ°„€Xóÿ°°°€xóÿ°„€üóÿ°°ª€€ôÿ°°°€˜ôÿ°„€4õÿ°« -€˜ùÿ°°¬€Ôùÿ°°°€þÿ +€˜ùÿ°°¬€Ôùÿ°°°€þÿ A -"&Dlibam_ver.so +"&Dlibam_ver.so diff --git a/lib64/libam_ver.so b/lib64/libam_ver.so index 69bdbcd..9467679 100755 --- a/lib64/libam_ver.so +++ b/lib64/libam_ver.so @@ -1,2 +1,2 @@ -ELF - +ELF + diff --git a/libam_ver.so b/libam_ver.so index 244977d..ffe0fe1 100755 --- a/libam_ver.so +++ b/libam_ver.so @@ -1,6 +1,6 @@ ELF -0å3ÿ/áÐKâ +0å3ÿ/áÐKâ A -"Dlibam_ver.so +"Dlibam_ver.so |