author | Gong Ke <ke.gong@amlogic.com> | 2017-12-27 08:32:41 (GMT) |
---|---|---|
committer | Gong Ke <ke.gong@amlogic.com> | 2017-12-27 08:32:41 (GMT) |
commit | 51b2719f4dcb15e91d5a934bed50d12545bd97ae (patch) | |
tree | 4e1a0bdf6bc1ed1d4c396237a0b71ca448d466ca | |
parent | 719595fd7c520203b820bf30430d624e811b07fb (diff) | |
download | dvb-51b2719f4dcb15e91d5a934bed50d12545bd97ae.zip dvb-51b2719f4dcb15e91d5a934bed50d12545bd97ae.tar.gz dvb-51b2719f4dcb15e91d5a934bed50d12545bd97ae.tar.bz2 |
dvb: fix the bug about dtv crash with weak [1/1]
PD# 156368
Change-Id: Iffb0ceb3d121da414b6353a8b54c22d20c119396
-rw-r--r-- | am_adp/am_av/aml/aml.c | 9 | ||||
-rwxr-xr-x | lib32/libam_ver.so | 6 | ||||
-rwxr-xr-x | lib64/libam_ver.so | 4 | ||||
-rwxr-xr-x | libam_ver.so | 4 |
4 files changed, 13 insertions, 10 deletions
diff --git a/am_adp/am_av/aml/aml.c b/am_adp/am_av/aml/aml.c index 91149b0..60e14aa 100644 --- a/am_adp/am_av/aml/aml.c +++ b/am_adp/am_av/aml/aml.c @@ -3831,11 +3831,14 @@ static void* aml_av_monitor_thread(void *arg) resample = 1; if (has_audio && (abuf_level * 5 > abuf_size * 4)) + { resample = 1; + } if (has_video && (vbuf_level * 5 > vbuf_size * 4)) + { resample = 1; - + } #ifdef ENABLE_AUDIO_RESAMPLE if (resample != resample_type) { if (resample != next_resample_type) { @@ -4031,12 +4034,12 @@ static void* aml_av_monitor_thread(void *arg) AM_DEBUG(1, "[avmon] apts_dmx_stop: %d arp_stop: %d vpts_dmx_stop: %d vrp_stop: %d", dmx_apts_stop_dur, arp_stop_dur, dmx_vpts_stop_dur, vrp_stop_dur); } - if (vbuf_level * 6 > vbuf_size * 5) + if (vbuf_level * 5 > vbuf_size * 4) { need_replay = AM_TRUE; AM_DEBUG(1, "[avmon] 1 replay ts vlevel %d vbuf_size %d",vbuf_level*6, vbuf_size*5); } - if (abuf_level * 6 > abuf_size * 5) + if (abuf_level * 5 > abuf_size * 4) { need_replay = AM_TRUE; AM_DEBUG(1, "[avmon] 2 replay ts vlevel %d vbuf_size %d",abuf_level*6, abuf_size*5); diff --git a/lib32/libam_ver.so b/lib32/libam_ver.so index 7bb8dea..2b8d9f3 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 737dc28..04a1698 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 cc54e7a..d34ac89 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 |