generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable NACK by default

Browse Source 
BUG=None
TEST=local
Review URL: https://webrtc-codereview.appspot.com/910005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2952 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-10-18 22:22:51 +00:00
parent 89b5388c67
commit cd19707945
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_engine/test/android/jni/vie_android_java_api.cc
View File

@ -974,14 +974,9 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnableNA
if (NULL == vieData.rtp) if (NULL == vieData.rtp)
return -1; return -1;
if (enable)
__android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
"EnableNACK enable");
else
__android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
"EnableNACK disable");
int ret = vieData.rtp->SetNACKStatus(channel, enable); int ret = vieData.rtp->SetNACKStatus(channel, enable);
__android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
"EnableNACK(%d) ret:%d", enable, ret);
return ret; return ret;
} }

3
src/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
View File

@ -138,7 +138,7 @@ public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
private TextView etVTxPort; private TextView etVTxPort;
private int destinationPortVideo = 11111; private int destinationPortVideo = 11111;
private CheckBox cbEnableNack; private CheckBox cbEnableNack;
private boolean enableNack = false; private boolean enableNack = true;
private CheckBox cbEnableVideoRTPDump; private CheckBox cbEnableVideoRTPDump;
// Audio settings // Audio settings
@ -670,6 +670,7 @@ public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
// TODO(leozwang): Add more options besides PLI, currently use pli // TODO(leozwang): Add more options besides PLI, currently use pli
// as the default. Also check return value. // as the default. Also check return value.
ret = vieAndroidAPI.EnablePLI(channel, true); ret = vieAndroidAPI.EnablePLI(channel, true);
ret = vieAndroidAPI.EnableNACK(channel, enableNack);
ret = vieAndroidAPI.SetCallback(channel, this); ret = vieAndroidAPI.SetCallback(channel, this);
if (enableVideoSend) { if (enableVideoSend) {