OpenH264 vs Mediacodec management update
This commit is contained in:
Brieuc Viel
parent
f2336a3625
commit
05e9369315
2 changed files with 65 additions and 62 deletions
|
|
@ -18,67 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
package org.linphone;
|
package org.linphone;
|
||||||
|
|
||||||
import static android.media.AudioManager.MODE_RINGTONE;
|
|
||||||
import static android.media.AudioManager.STREAM_RING;
|
|
||||||
import static android.media.AudioManager.STREAM_VOICE_CALL;
|
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Timer;
|
|
||||||
import java.util.TimerTask;
|
|
||||||
|
|
||||||
import org.linphone.assistant.AssistantActivity;
|
|
||||||
import org.linphone.core.CallDirection;
|
|
||||||
import org.linphone.core.LinphoneAccountCreator;
|
|
||||||
import org.linphone.core.LinphoneAddress;
|
|
||||||
import org.linphone.core.LinphoneBuffer;
|
|
||||||
import org.linphone.core.LinphoneCall;
|
|
||||||
import org.linphone.core.LinphoneCall.State;
|
|
||||||
import org.linphone.core.LinphoneCallParams;
|
|
||||||
import org.linphone.core.LinphoneCallStats;
|
|
||||||
import org.linphone.core.LinphoneChatMessage;
|
|
||||||
import org.linphone.core.LinphoneChatRoom;
|
|
||||||
import org.linphone.core.LinphoneContent;
|
|
||||||
import org.linphone.core.LinphoneCore;
|
|
||||||
import org.linphone.core.LinphoneCore.AuthMethod;
|
|
||||||
import org.linphone.core.LinphoneCore.EcCalibratorStatus;
|
|
||||||
import org.linphone.core.LinphoneCore.GlobalState;
|
|
||||||
import org.linphone.core.LinphoneCore.LogCollectionUploadState;
|
|
||||||
import org.linphone.core.LinphoneCore.RegistrationState;
|
|
||||||
import org.linphone.core.LinphoneCore.RemoteProvisioningState;
|
|
||||||
import org.linphone.core.LinphoneAuthInfo;
|
|
||||||
import org.linphone.core.LinphoneCoreException;
|
|
||||||
import org.linphone.core.LinphoneCoreFactory;
|
|
||||||
import org.linphone.core.LinphoneCoreListener;
|
|
||||||
import org.linphone.core.LinphoneEvent;
|
|
||||||
import org.linphone.core.LinphoneFriend;
|
|
||||||
import org.linphone.core.LinphoneFriendList;
|
|
||||||
import org.linphone.core.LinphoneInfoMessage;
|
|
||||||
import org.linphone.core.LinphoneProxyConfig;
|
|
||||||
import org.linphone.core.OpenH264DownloadHelperListener;
|
|
||||||
import org.linphone.core.PayloadType;
|
|
||||||
import org.linphone.core.PresenceActivityType;
|
|
||||||
import org.linphone.core.PresenceModel;
|
|
||||||
import org.linphone.core.PublishState;
|
|
||||||
import org.linphone.core.SubscriptionState;
|
|
||||||
import org.linphone.core.TunnelConfig;
|
|
||||||
import org.linphone.mediastream.Log;
|
|
||||||
import org.linphone.mediastream.Version;
|
|
||||||
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
|
|
||||||
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration.AndroidCamera;
|
|
||||||
import org.linphone.mediastream.video.capture.hwconf.Hacks;
|
|
||||||
import org.linphone.tools.OpenH264DownloadHelper;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
|
|
@ -109,6 +48,67 @@ import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import org.linphone.assistant.AssistantActivity;
|
||||||
|
import org.linphone.core.CallDirection;
|
||||||
|
import org.linphone.core.LinphoneAccountCreator;
|
||||||
|
import org.linphone.core.LinphoneAddress;
|
||||||
|
import org.linphone.core.LinphoneAuthInfo;
|
||||||
|
import org.linphone.core.LinphoneBuffer;
|
||||||
|
import org.linphone.core.LinphoneCall;
|
||||||
|
import org.linphone.core.LinphoneCall.State;
|
||||||
|
import org.linphone.core.LinphoneCallParams;
|
||||||
|
import org.linphone.core.LinphoneCallStats;
|
||||||
|
import org.linphone.core.LinphoneChatMessage;
|
||||||
|
import org.linphone.core.LinphoneChatRoom;
|
||||||
|
import org.linphone.core.LinphoneContent;
|
||||||
|
import org.linphone.core.LinphoneCore;
|
||||||
|
import org.linphone.core.LinphoneCore.AuthMethod;
|
||||||
|
import org.linphone.core.LinphoneCore.EcCalibratorStatus;
|
||||||
|
import org.linphone.core.LinphoneCore.GlobalState;
|
||||||
|
import org.linphone.core.LinphoneCore.LogCollectionUploadState;
|
||||||
|
import org.linphone.core.LinphoneCore.RegistrationState;
|
||||||
|
import org.linphone.core.LinphoneCore.RemoteProvisioningState;
|
||||||
|
import org.linphone.core.LinphoneCoreException;
|
||||||
|
import org.linphone.core.LinphoneCoreFactory;
|
||||||
|
import org.linphone.core.LinphoneCoreListener;
|
||||||
|
import org.linphone.core.LinphoneEvent;
|
||||||
|
import org.linphone.core.LinphoneFriend;
|
||||||
|
import org.linphone.core.LinphoneFriendList;
|
||||||
|
import org.linphone.core.LinphoneInfoMessage;
|
||||||
|
import org.linphone.core.LinphoneProxyConfig;
|
||||||
|
import org.linphone.core.OpenH264DownloadHelperListener;
|
||||||
|
import org.linphone.core.PayloadType;
|
||||||
|
import org.linphone.core.PresenceActivityType;
|
||||||
|
import org.linphone.core.PresenceModel;
|
||||||
|
import org.linphone.core.PublishState;
|
||||||
|
import org.linphone.core.SubscriptionState;
|
||||||
|
import org.linphone.core.TunnelConfig;
|
||||||
|
import org.linphone.mediastream.Log;
|
||||||
|
import org.linphone.mediastream.Version;
|
||||||
|
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
|
||||||
|
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration.AndroidCamera;
|
||||||
|
import org.linphone.mediastream.video.capture.hwconf.Hacks;
|
||||||
|
import org.linphone.tools.H264Helper;
|
||||||
|
import org.linphone.tools.OpenH264DownloadHelper;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.sql.Timestamp;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Timer;
|
||||||
|
import java.util.TimerTask;
|
||||||
|
|
||||||
|
import static android.media.AudioManager.MODE_RINGTONE;
|
||||||
|
import static android.media.AudioManager.STREAM_RING;
|
||||||
|
import static android.media.AudioManager.STREAM_VOICE_CALL;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Manager of the low level LibLinphone stuff.<br />
|
* Manager of the low level LibLinphone stuff.<br />
|
||||||
|
|
@ -316,6 +316,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
|
||||||
instance = new LinphoneManager(c);
|
instance = new LinphoneManager(c);
|
||||||
instance.startLibLinphone(c);
|
instance.startLibLinphone(c);
|
||||||
|
|
||||||
|
// H264 codec Management - set to auto mode -> MediaCodec >= android 5.0 >= OpenH264
|
||||||
|
H264Helper.setH264Mode(H264Helper.MODE_AUTO, getLc());
|
||||||
TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
|
TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
|
||||||
boolean gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE;
|
boolean gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE;
|
||||||
setGsmIdle(gsmIdle);
|
setGsmIdle(gsmIdle);
|
||||||
|
|
@ -1021,6 +1023,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
|
||||||
Log.i("New global state [",state,"]");
|
Log.i("New global state [",state,"]");
|
||||||
if (state == GlobalState.GlobalOn){
|
if (state == GlobalState.GlobalOn){
|
||||||
try {
|
try {
|
||||||
|
Log.e("LinphoneManager"," globalState ON");
|
||||||
initLiblinphone(lc);
|
initLiblinphone(lc);
|
||||||
initOpenH264Helper();
|
initOpenH264Helper();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 59890b641129ae4a9c64917bad67df1dab70d85a
|
Subproject commit 19944600c84cec2cf2a31e7f59515cb570b918ef
|
||||||
Loading…
Reference in a new issue