diff --git a/src/org/linphone/AboutActivity.java b/src/org/linphone/AboutActivity.java index e01c5086e..1a2df24a5 100644 --- a/src/org/linphone/AboutActivity.java +++ b/src/org/linphone/AboutActivity.java @@ -18,10 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone; +import org.linphone.core.Log; + import android.app.Activity; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; -import android.util.Log; import android.widget.TextView; @@ -35,7 +36,7 @@ public class AboutActivity extends Activity { try { aboutText.setText(String.format(getString(R.string.about_text), getPackageManager().getPackageInfo(getPackageName(), 0).versionName)); } catch (NameNotFoundException e) { - Log.e(LinphoneManager.TAG, "cannot get version name", e); + Log.e(e, "cannot get version name"); } } diff --git a/src/org/linphone/CallManager.java b/src/org/linphone/CallManager.java index 407df253e..e1b1087ed 100644 --- a/src/org/linphone/CallManager.java +++ b/src/org/linphone/CallManager.java @@ -23,9 +23,9 @@ import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCallParams; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; +import org.linphone.core.Log; import org.linphone.core.video.AndroidCameraRecordManager; -import android.util.Log; /** * Handle call updating, reinvites. @@ -82,7 +82,7 @@ class CallManager { LinphoneCore lc = LinphoneManager.getLc(); LinphoneCall lCall = lc.getCurrentCall(); if (lCall == null) { - Log.e(LinphoneManager.TAG, "Trying to reinviteWithVideo while not in call: doing nothing"); + Log.e("Trying to reinviteWithVideo while not in call: doing nothing"); return false; } LinphoneCallParams params = lCall.getCurrentParamsCopy(); @@ -112,7 +112,7 @@ class CallManager { LinphoneCore lc = LinphoneManager.getLc(); LinphoneCall lCall = lc.getCurrentCall(); if (lCall == null) { - Log.e(LinphoneManager.TAG, "Trying to reinvite while not in call: doing nothing"); + Log.e("Trying to reinvite while not in call: doing nothing"); return; } LinphoneCallParams params = lCall.getCurrentParamsCopy(); @@ -129,7 +129,7 @@ class CallManager { LinphoneCore lc = LinphoneManager.getLc(); LinphoneCall lCall = lc.getCurrentCall(); if (lCall == null) { - Log.e(LinphoneManager.TAG, "Trying to updateCall while not in call: doing nothing"); + Log.e("Trying to updateCall while not in call: doing nothing"); return; } LinphoneCallParams params = lCall.getCurrentParamsCopy(); diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 3c46baeb4..6b19fbb87 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -23,6 +23,7 @@ import org.linphone.LinphoneService.LinphoneGuiListener; import org.linphone.core.CallDirection; import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCore; +import org.linphone.core.Log; import org.linphone.core.LinphoneCall.State; import org.linphone.core.video.AndroidCameraRecordManager; import org.linphone.ui.AddVideoButton; @@ -44,7 +45,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.PowerManager; import android.preference.PreferenceManager; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; @@ -108,7 +108,7 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis mPref = PreferenceManager.getDefaultSharedPreferences(this); PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE); - mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,"Linphone"); + mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,Log.TAG); mAddress = (AddressText) findViewById(R.id.SipUri); @@ -165,7 +165,7 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis if (getIntent().getData() == null) return; if (!LinphoneService.isReady() || LinphoneManager.getLc().isIncall()) { - Log.w(LinphoneManager.TAG, "Outgoing call aborted as LinphoneService" + Log.w("Outgoing call aborted as LinphoneService" + " is not ready or we are already in call"); return; } diff --git a/src/org/linphone/FirstLoginActivity.java b/src/org/linphone/FirstLoginActivity.java index d1a70d33b..b932b8c30 100644 --- a/src/org/linphone/FirstLoginActivity.java +++ b/src/org/linphone/FirstLoginActivity.java @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone; +import org.linphone.core.Log; import org.linphone.core.LinphoneCore.RegistrationState; import android.app.Activity; @@ -25,7 +26,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.inputmethod.InputMethodManager; @@ -87,7 +87,7 @@ public class FirstLoginActivity extends Activity implements OnClickListener { try { LinphoneManager.getInstance().initFromConf(getApplicationContext()); } catch (Throwable e) { - Log.e(LinphoneManager.TAG, "Error while initializing from config in first login activity", e); + Log.e(e, "Error while initializing from config in first login activity"); toast(R.string.error);; } } diff --git a/src/org/linphone/HistoryActivity.java b/src/org/linphone/HistoryActivity.java index 5a302d775..4d0bd2ef5 100644 --- a/src/org/linphone/HistoryActivity.java +++ b/src/org/linphone/HistoryActivity.java @@ -27,11 +27,11 @@ import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCallLog; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneProxyConfig; +import org.linphone.core.Log; import android.app.ListActivity; import android.content.Context; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -92,7 +92,7 @@ public class HistoryActivity extends ListActivity { break; default: - Log.e(LinphoneManager.TAG, "Unknown menu item ["+item+"]"); + Log.e("Unknown menu item [",item,"]"); break; } diff --git a/src/org/linphone/KeepAliveReceiver.java b/src/org/linphone/KeepAliveReceiver.java index ff87a3d4b..4c7f3ace3 100644 --- a/src/org/linphone/KeepAliveReceiver.java +++ b/src/org/linphone/KeepAliveReceiver.java @@ -18,10 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone; +import org.linphone.core.Log; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.util.Log; @@ -31,7 +32,7 @@ public class KeepAliveReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { if (!LinphoneService.isReady()) { - Log.i(LinphoneManager.TAG, "Keep alive broadcast received while Linphone service not ready"); + Log.i("Keep alive broadcast received while Linphone service not ready"); return; } else { if (intent.getAction().equalsIgnoreCase(Intent.ACTION_SCREEN_ON)) { diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 995e6ef4a..ff36a9360 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -26,6 +26,7 @@ import java.util.List; import org.linphone.LinphoneManager.EcCalibrationListener; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; +import org.linphone.core.Log; import org.linphone.core.Version; import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.RegistrationState; @@ -46,7 +47,6 @@ import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; import android.text.Html; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -73,7 +73,6 @@ public class LinphoneActivity extends TabActivity { private FrameLayout mMainFrame; private SensorManager mSensorManager; private static SensorEventListener mSensorEventListener; - private static String TAG = LinphoneManager.TAG; private static final String SCREEN_IS_HIDDEN = "screen_is_hidden"; private Handler mHandler = new Handler(); @@ -160,7 +159,7 @@ public class LinphoneActivity extends TabActivity { } }); } catch (LinphoneCoreException e) { - Log.e(TAG, "Unable to calibrate EC", e); + Log.e(e, "Unable to calibrate EC"); } fillTabHost(); @@ -208,7 +207,7 @@ public class LinphoneActivity extends TabActivity { protected void onNewIntent(Intent intent) { super.onNewIntent(intent); if (intent.getData() == null) { - Log.e(TAG, "LinphoneActivity received an intent without data, recreating GUI if needed"); + Log.e("LinphoneActivity received an intent without data, recreating GUI if needed"); if (!LinphoneService.isReady() || !LinphoneManager.getLc().isIncall()) return; LinphoneCore lc = LinphoneManager.getLc(); if(lc.isInComingInvitePending()) { @@ -218,7 +217,7 @@ public class LinphoneActivity extends TabActivity { startIncallActivity(LinphoneManager.getInstance().extractADisplayName(), null); } else { // TODO - Log.e(TAG, "Not handled case: recreation while in call and not using incall activity"); + Log.e("Not handled case: recreation while in call and not using incall activity"); } } return; @@ -268,7 +267,7 @@ public class LinphoneActivity extends TabActivity { startActivity(new Intent(ACTION_MAIN) .setClass(this, AboutActivity.class)); default: - Log.e(TAG, "Unknown menu item ["+item+"]"); + Log.e("Unknown menu item [",item,"]"); break; } @@ -297,7 +296,7 @@ public class LinphoneActivity extends TabActivity { synchronized void startProxymitySensor() { if (mSensorEventListener != null) { - Log.i(TAG, "proximity sensor already active"); + Log.i("proximity sensor already active"); return; } List lSensorList = mSensorManager.getSensorList(Sensor.TYPE_PROXIMITY); @@ -312,7 +311,7 @@ public class LinphoneActivity extends TabActivity { }; if (lSensorList.size() >0) { mSensorManager.registerListener(mSensorEventListener,lSensorList.get(0),SensorManager.SENSOR_DELAY_UI); - Log.i(TAG, "Proximity sensor detected, registering"); + Log.i("Proximity sensor detected, registering"); } } @@ -449,35 +448,6 @@ public class LinphoneActivity extends TabActivity { finishActivity(INCALL_ACTIVITY); } - /* - private String INCALL_ACTIVITY_TAG = "incall"; - - void changeTabVisibility(String tag, int value) { - View tab = getTabHost().getTabWidget().findViewWithTag(tag); - if (tab != null) { - tab.setVisibility(value); - } else { - Log.e(TAG, "Tab not found: " + tag); - } - } - - public void closeIncallActivity() { - changeTabVisibility(DIALER_TAB, View.VISIBLE); - getTabHost().setCurrentTabByTag(DIALER_TAB); - getLocalActivityManager().getActivity(INCALL_ACTIVITY_TAG).finish(); - getTabHost().clearAllTabs(); - fillTabHost(); - } - - @Override - public void finishFromChild(Activity child) { - if (child instanceof IncallActivity) { - return; - } - super.finishFromChild(child); - }*/ - - public void startVideoActivity() { mHandler.post(new Runnable() { public void run() { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 7017f31ee..9f2a71277 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -54,6 +54,7 @@ import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListener; import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneProxyConfig; +import org.linphone.core.Log; import org.linphone.core.PayloadType; import org.linphone.core.Version; import org.linphone.core.LinphoneCall.State; @@ -84,7 +85,6 @@ import android.os.PowerManager.WakeLock; import android.preference.PreferenceManager; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; -import android.util.Log; /** * @@ -131,7 +131,6 @@ public final class LinphoneManager implements LinphoneCoreListener { AndroidCameraRecordManager.getInstance().startOrientationSensor(c.getApplicationContext()); } - public static final String TAG=Version.TAG; private static final int LINPHONE_VOLUME_STREAM = STREAM_VOICE_CALL; private static final int dbStep = 4; /** Called when the activity is first created. */ @@ -148,7 +147,7 @@ public final class LinphoneManager implements LinphoneCoreListener { LinphoneCall call = mLc.getCurrentCall(); boolean paused = false; if (call != null && call.getState() == State.StreamsRunning && Hacks.needPausingCallForSpeakers()) { - Log.d(TAG, "Hack pausing call to have speaker="+speakerOn); + Log.d("Hack pausing call to have speaker=",speakerOn); mLc.pauseCall(call); paused = true; } @@ -169,7 +168,7 @@ public final class LinphoneManager implements LinphoneCoreListener { } if (paused) { - Log.d(TAG, "Hack resuming call to have speaker="+speakerOn); + Log.d("Hack resuming call to have speaker=",speakerOn); mLc.resumeCall(call); } } @@ -329,7 +328,7 @@ public final class LinphoneManager implements LinphoneCoreListener { try { initFromConf(context); } catch (LinphoneException e) { - Log.w(TAG, "no config ready yet"); + Log.w("no config ready yet"); } TimerTask lTask = new TimerTask() { @Override @@ -345,7 +344,7 @@ public final class LinphoneManager implements LinphoneCoreListener { context.registerReceiver(mKeepAliveReceiver, lFilter); } catch (Exception e) { - Log.e(TAG,"Cannot start linphone",e); + Log.e(e,"Cannot start linphone"); } } @@ -550,7 +549,7 @@ public final class LinphoneManager implements LinphoneCoreListener { } else if ("H263-1998".equals(mime)) { key = R.string.pref_video_codec_h263_key; } else { - Log.e(TAG, "Unhandled video codec " + mime); + Log.e("Unhandled video codec ", mime); mLc.enablePayloadType(videoCodec, false); return; } @@ -629,26 +628,26 @@ public final class LinphoneManager implements LinphoneCoreListener { public void displayStatus(final LinphoneCore lc, final String message) { - Log.i(TAG, message); + Log.i(message); serviceListener.onDisplayStatus(message); } public void globalState(final LinphoneCore lc, final LinphoneCore.GlobalState state, final String message) { - Log.i(TAG, "new state ["+state+"]"); + Log.i("new state [",state,"]"); serviceListener.onGlobalStateChanged(state, message); } public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig cfg,final LinphoneCore.RegistrationState state,final String message) { - Log.i(TAG, "new state ["+state+"]"); + Log.i("new state ["+state+"]"); serviceListener.onRegistrationStateChanged(state, message); } public void callState(final LinphoneCore lc,final LinphoneCall call, final State state, final String message) { - Log.i(TAG, "new state ["+state+"]"); + Log.i("new state [",state,"]"); if (state == IncomingReceived && !call.equals(lc.getCurrentCall())) { if (call.getReplacedCall()==null){ //no multicall support, just decline @@ -735,10 +734,10 @@ public final class LinphoneManager implements LinphoneCoreListener { mRingerPlayer.setLooping(true); mRingerPlayer.start(); } else { - Log.w(LinphoneManager.TAG,"already ringing"); + Log.w("already ringing"); } } catch (Exception e) { - Log.e(LinphoneManager.TAG, "cannot handle incoming call",e); + Log.e(e,"cannot handle incoming call"); } } @@ -790,7 +789,7 @@ public final class LinphoneManager implements LinphoneCoreListener { // Called on first launch only public void initializePayloads() { - Log.i(TAG, "Initializing supported payloads"); + Log.i("Initializing supported payloads"); Editor e = mPref.edit(); boolean fastCpu = Version.isArmv7(); @@ -863,7 +862,7 @@ public final class LinphoneManager implements LinphoneCoreListener { final float distanceInCm = event.values[0]; final float maxDistance = event.sensor.getMaximumRange(); - Log.d(TAG, "Proximity sensor report ["+distanceInCm+"] , for max range ["+maxDistance+"]"); + Log.d("Proximity sensor report [",distanceInCm,"] , for max range [",maxDistance,"]"); if (maxDistance <= threshold) { // Case binary 0/1 and short sensors diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java index a82c48c49..06739fd5a 100644 --- a/src/org/linphone/LinphonePreferencesActivity.java +++ b/src/org/linphone/LinphonePreferencesActivity.java @@ -22,9 +22,9 @@ package org.linphone; import static org.linphone.R.string.ec_calibrating; import static org.linphone.R.string.ec_calibration_launch_message; +import static org.linphone.R.string.pref_codec_amr_key; import static org.linphone.R.string.pref_codec_ilbc_key; import static org.linphone.R.string.pref_codec_speex16_key; -import static org.linphone.R.string.pref_codec_amr_key; import static org.linphone.R.string.pref_echo_canceller_calibration_key; import static org.linphone.R.string.pref_video_enable_key; @@ -34,6 +34,7 @@ import java.util.List; import org.linphone.LinphoneManager.EcCalibrationListener; import org.linphone.core.Hacks; import org.linphone.core.LinphoneCoreException; +import org.linphone.core.Log; import org.linphone.core.Version; import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.video.AndroidCameraRecordManager; @@ -46,7 +47,6 @@ import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; -import android.util.Log; import android.widget.Toast; public class LinphonePreferencesActivity extends PreferenceActivity implements EcCalibrationListener { @@ -177,7 +177,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E ecPref.setSummary(ec_calibrating); ecPref.getEditor().putBoolean(getString(pref_echo_canceller_calibration_key), false).commit(); } catch (LinphoneCoreException e) { - Log.w(LinphoneManager.TAG, "Cannot calibrate EC",e); + Log.w(e, "Cannot calibrate EC"); } } @@ -235,7 +235,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E } catch (LinphoneException e) { if (! (e instanceof LinphoneConfigException)) { - Log.e(LinphoneManager.TAG, "Cannot update config",e); + Log.e(e, "Cannot update config"); return; } diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 7876cc291..4e5f7c067 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -19,17 +19,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. package org.linphone; import java.io.IOException; -import java.util.List; import org.linphone.LinphoneManager.LinphoneServiceListener; import org.linphone.LinphoneManager.NewOutgoingCallUiListener; import org.linphone.core.Hacks; import org.linphone.core.LinphoneCall; +import org.linphone.core.Log; import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCore.GlobalState; import org.linphone.core.LinphoneCore.RegistrationState; -import android.app.ActivityManager; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -44,7 +43,6 @@ import android.net.Uri; import android.os.Handler; import android.os.IBinder; import android.preference.PreferenceManager; -import android.util.Log; /*** * @@ -139,9 +137,9 @@ public final class LinphoneService extends Service implements LinphoneServiceLis } catch (NameNotFoundException nnfe) {} if (info != null) { - Log.i(LinphoneManager.TAG, "Linphone version is " + info.versionCode); + Log.i("Linphone version is ", info.versionCode); } else { - Log.i(LinphoneManager.TAG, "Linphone version is unknown"); + Log.i("Linphone version is unknown"); } } @@ -268,7 +266,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis try { mRingerPlayer.setDataSource(getApplicationContext(), ringtoneUri); } catch (IOException e) { - Log.e(LinphoneManager.TAG, "cannot set ringtone", e); + Log.e(e, "cannot set ringtone"); } } diff --git a/src/org/linphone/NetworkManager.java b/src/org/linphone/NetworkManager.java index 877fa72be..fd7a93bd3 100644 --- a/src/org/linphone/NetworkManager.java +++ b/src/org/linphone/NetworkManager.java @@ -18,12 +18,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone; +import org.linphone.core.Log; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.util.Log; @@ -38,12 +39,12 @@ public class NetworkManager extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { NetworkInfo lNetworkInfo = (NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO); - Log.i(LinphoneManager.TAG, "Network info ["+lNetworkInfo+"]"); + Log.i("Network info [",lNetworkInfo,"]"); Boolean lNoConnectivity = intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY,false); if (!LinphoneService.isReady()) { - Log.i(LinphoneManager.TAG, "Network broadcast received while Linphone service not ready"); + Log.i("Network broadcast received while Linphone service not ready"); return; } diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index 8d9e0dda2..975bebae6 100644 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -21,6 +21,7 @@ package org.linphone; import org.linphone.core.LinphoneCore; +import org.linphone.core.Log; import org.linphone.core.Version; import org.linphone.core.VideoSize; import org.linphone.core.video.AndroidCameraRecordManager; @@ -32,7 +33,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; import android.os.PowerManager.WakeLock; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -48,7 +48,6 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing private SurfaceView mVideoView; private SurfaceView mVideoCaptureView; private AndroidCameraRecordManager recordManager; - private static final String tag = "Linphone"; public static boolean launched = false; private WakeLock mWakeLock; private static final int capturePreviewLargestDimension = 150; @@ -57,7 +56,7 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing public void onCreate(Bundle savedInstanceState) { launched = true; - Log.d(tag, "onCreate VideoCallActivity"); + Log.d("onCreate VideoCallActivity"); super.onCreate(savedInstanceState); setContentView(R.layout.videocall); @@ -74,7 +73,7 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing if (!recordManager.isMuted()) LinphoneManager.getInstance().sendStaticImage(false); PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE); - mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,"Linphone"); + mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,Log.TAG); mWakeLock.acquire(); fixScreenOrientationForOldDevices(); @@ -94,7 +93,7 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing @Override protected void onResume() { if (Version.sdkAboveOrEqual(8) && recordManager.isOutputOrientationMismatch()) { - Log.i(tag,"Phone orientation has changed: updating call."); + Log.i("Phone orientation has changed: updating call."); CallManager.getInstance().updateCall(); // resizeCapturePreview by callback when recording started } @@ -173,7 +172,6 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing break; case R.id.videocall_menu_terminate_call: LinphoneManager.getInstance().terminateCall(); - finish(); break; case R.id.videocall_menu_toggle_camera: LinphoneManager.getInstance().toggleCameraMuting(); @@ -184,7 +182,7 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing fixScreenOrientationForOldDevices(); break; default: - Log.e(LinphoneManager.TAG, "Unknown menu item ["+item+"]"); + Log.e("Unknown menu item [",item,"]"); break; } @@ -200,7 +198,7 @@ public class VideoCallActivity extends SoftVolumeActivity implements OnCapturing @Override protected void onPause() { - Log.d(tag, "onPause VideoCallActivity"); + Log.d("onPause VideoCallActivity"); LinphoneManager.getInstance().sendStaticImage(true); if (mWakeLock.isHeld()) mWakeLock.release(); super.onPause(); diff --git a/src/org/linphone/core/AndroidVideoWindowImpl.java b/src/org/linphone/core/AndroidVideoWindowImpl.java index 243afb472..254efb379 100644 --- a/src/org/linphone/core/AndroidVideoWindowImpl.java +++ b/src/org/linphone/core/AndroidVideoWindowImpl.java @@ -3,7 +3,6 @@ package org.linphone.core; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Bitmap.Config; -import android.util.Log; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -15,7 +14,6 @@ public class AndroidVideoWindowImpl { private SurfaceView mView; private Surface mSurface; private VideoWindowListener mListener; - static private String TAG = "Linphone"; public static interface VideoWindowListener{ void onSurfaceReady(AndroidVideoWindowImpl vw); void onSurfaceDestroyed(AndroidVideoWindowImpl vw); @@ -28,17 +26,17 @@ public class AndroidVideoWindowImpl { view.getHolder().addCallback(new Callback(){ public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - Log.i(TAG,"Surface is being changed."); + Log.i("Surface is being changed."); synchronized(AndroidVideoWindowImpl.this){ mBitmap=Bitmap.createBitmap(width,height,Config.RGB_565); mSurface=holder.getSurface(); } if (mListener!=null) mListener.onSurfaceReady(AndroidVideoWindowImpl.this); - Log.w(TAG, "Video display surface changed"); + Log.w("Video display surface changed"); } public void surfaceCreated(SurfaceHolder holder) { - Log.w(TAG, "Video display surface created"); + Log.w("Video display surface created"); } public void surfaceDestroyed(SurfaceHolder holder) { @@ -48,7 +46,7 @@ public class AndroidVideoWindowImpl { } if (mListener!=null) mListener.onSurfaceDestroyed(AndroidVideoWindowImpl.this); - Log.d(TAG, "Video display surface destroyed"); + Log.d("Video display surface destroyed"); } }); } @@ -56,7 +54,7 @@ public class AndroidVideoWindowImpl { static final int PORTRAIT=1; public void requestOrientation(int orientation){ //Surface.setOrientation(0, orientation==LANDSCAPE ? 1 : 0); - //Log.d("Linphone", "Orientation changed."); + //Log.d("Orientation changed."); } public void setListener(VideoWindowListener l){ mListener=l; diff --git a/src/org/linphone/core/Hacks.java b/src/org/linphone/core/Hacks.java index 7628632be..fd9342827 100644 --- a/src/org/linphone/core/Hacks.java +++ b/src/org/linphone/core/Hacks.java @@ -21,7 +21,6 @@ package org.linphone.core; import android.hardware.Camera; import android.media.AudioManager; import android.os.Build; -import android.util.Log; public final class Hacks { @@ -65,7 +64,7 @@ public final class Hacks { /* private static final boolean log(final String msg) { - Log.d("Linphone", msg); + Log.d(msg); return true; }*/ @@ -104,7 +103,7 @@ public final class Hacks { //sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n"); sb.append("SDK=").append(Build.VERSION.SDK); - Log.i(Version.TAG, sb.toString()); + Log.i(sb.toString()); } public static boolean needSoftvolume() { @@ -134,12 +133,12 @@ public final class Hacks { try { nb = (Integer) Camera.class.getMethod("getNumberOfCameras", (Class[])null).invoke(null); } catch (Exception e) { - Log.e(Version.TAG, "Error getting number of cameras"); + Log.e("Error getting number of cameras"); } return nb > 0; } - Log.i(Version.TAG, "Hack: considering there IS a camera.\n" + Log.i("Hack: considering there IS a camera.\n" + "If it is not the case, report DEVICE and MODEL to linphone-users@nongnu.org"); return true; } diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java index 0a9ba7a76..a2800be92 100644 --- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java +++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java @@ -21,15 +21,13 @@ package org.linphone.core; import java.io.File; import java.io.IOException; -import android.util.Log; - public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { private static void loadOptionalLibrary(String s) { try { System.loadLibrary(s); } catch (Throwable e) { - Log.w(Version.TAG, "Unable to load optional library lib" + s); + Log.w("Unable to load optional library lib", s); } } diff --git a/src/org/linphone/core/Log.java b/src/org/linphone/core/Log.java index f223e6100..c341fa68e 100644 --- a/src/org/linphone/core/Log.java +++ b/src/org/linphone/core/Log.java @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. package org.linphone.core; + /** * Convenient wrapper for Android logs. * diff --git a/src/org/linphone/core/Version.java b/src/org/linphone/core/Version.java index 37fbfd877..6bf12be45 100644 --- a/src/org/linphone/core/Version.java +++ b/src/org/linphone/core/Version.java @@ -26,8 +26,6 @@ import android.os.Build; */ public class Version { - public static final String TAG="Linphone"; - public static final int API03_CUPCAKE_15 = 3; public static final int API04_DONUT_16 = 4; public static final int API06_ECLAIR_20 = 6; diff --git a/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java b/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java index 341bd28cc..4772c7a5b 100644 --- a/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java +++ b/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java @@ -18,12 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone.core.tutorials; +import org.linphone.core.Log; import org.linphone.core.video.AndroidCameraRecord; import android.hardware.Camera; import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.Size; -import android.util.Log; import android.widget.TextView; /** @@ -59,8 +59,8 @@ class JavaCameraRecordImpl extends AndroidCameraRecord implements PreviewCallbac Size s = camera.getParameters().getPreviewSize(); int expectedBuffLength = s.width * s.height * 3 /2; if (expectedBuffLength != data.length) { - Log.e(tag, "onPreviewFrame called with bad buffer length " + data.length - + " whereas expected is " + expectedBuffLength + " don't calling putImage"); + Log.e("onPreviewFrame called with bad buffer length ", data.length, + " whereas expected is ", expectedBuffLength, " don't calling putImage"); return; } diff --git a/src/org/linphone/core/tutorials/TestVideoActivity.java b/src/org/linphone/core/tutorials/TestVideoActivity.java index ce3a9185b..7523cb0ff 100644 --- a/src/org/linphone/core/tutorials/TestVideoActivity.java +++ b/src/org/linphone/core/tutorials/TestVideoActivity.java @@ -18,15 +18,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone.core.tutorials; +import static org.linphone.core.VideoSize.CIF; +import static org.linphone.core.VideoSize.HVGA; +import static org.linphone.core.VideoSize.QCIF; +import static org.linphone.core.VideoSize.QVGA; + import java.util.Stack; import org.linphone.R; +import org.linphone.core.Log; import org.linphone.core.VideoSize; import org.linphone.core.video.AndroidCameraRecord; import android.app.Activity; import android.os.Bundle; -import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; @@ -35,7 +40,6 @@ import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.TextView; -import static org.linphone.core.VideoSize.*; /** * Activity for displaying and starting the HelloWorld example on Android phone. @@ -48,7 +52,6 @@ public class TestVideoActivity extends Activity implements Callback, OnClickList private SurfaceView surfaceView; private static final int rate = 7; private JavaCameraRecordImpl recorder; - private static String tag = "Linphone"; private TextView debugView; private Button nextSize; private Button changeCamera; @@ -171,12 +174,12 @@ public class TestVideoActivity extends Activity implements Callback, OnClickList public void surfaceDestroyed(SurfaceHolder holder) { surfaceView = null; - Log.d(tag , "Video capture surface destroyed"); + Log.d("Video capture surface destroyed"); if (recorder != null) recorder.stopPreview(); } public void surfaceCreated(SurfaceHolder holder) { - Log.d(tag , "Video capture surface created"); + Log.d("Video capture surface created"); } public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { diff --git a/src/org/linphone/core/video/AndroidCameraConf5.java b/src/org/linphone/core/video/AndroidCameraConf5.java index 3deda1c69..f8dbe56cb 100644 --- a/src/org/linphone/core/video/AndroidCameraConf5.java +++ b/src/org/linphone/core/video/AndroidCameraConf5.java @@ -19,42 +19,41 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. package org.linphone.core.video; import org.linphone.core.Hacks; +import org.linphone.core.Log; -import android.util.Log; class AndroidCameraConf5 implements AndroidCameraConf { - private static final String tag = "Linphone"; private AndroidCameras foundCameras; public AndroidCameras getFoundCameras() {return foundCameras;} public AndroidCameraConf5() { - Log.i(tag, "Detecting cameras"); + Log.i("Detecting cameras"); // Defaults foundCameras = new AndroidCameras(); if (Hacks.isGalaxySOrTab()) { - Log.d(tag, "Hack Galaxy S : has one or more cameras"); + Log.d("Hack Galaxy S : has one or more cameras"); if (Hacks.isGalaxySOrTabWithFrontCamera()) { - Log.d(tag, "Hack Galaxy S : HAS a front camera with id=2"); + Log.d("Hack Galaxy S : HAS a front camera with id=2"); foundCameras.front = 2; } else { - Log.d(tag, "Hack Galaxy S : NO front camera"); + Log.d("Hack Galaxy S : NO front camera"); } - Log.d(tag, "Hack Galaxy S : HAS a rear camera with id=1"); + Log.d("Hack Galaxy S : HAS a rear camera with id=1"); foundCameras.rear = 1; foundCameras.defaultC = foundCameras.rear; } else if (Hacks.hasTwoCamerasRear0Front1()) { - Log.d(tag, "Hack SPHD700 has 2 cameras a rear with id=0 and a front with id=1"); + Log.d("Hack SPHD700 has 2 cameras a rear with id=0 and a front with id=1"); foundCameras.front = 1; } } public int getNumberOfCameras() { - Log.i(tag, "Detecting the number of cameras"); + Log.i("Detecting the number of cameras"); if (Hacks.hasTwoCamerasRear0Front1() || Hacks.isGalaxySOrTabWithFrontCamera()) { - Log.d(tag, "Hack: we know this model has 2 cameras"); + Log.d("Hack: we know this model has 2 cameras"); return 2; } else return 1; @@ -65,7 +64,7 @@ class AndroidCameraConf5 implements AndroidCameraConf { public int getCameraOrientation(int cameraId) { // Use hacks to guess orientation of the camera if (Hacks.isGalaxySOrTab() && isFrontCamera(cameraId)) { - Log.d(tag, "Hack Galaxy S : front camera mounted landscape"); + Log.d("Hack Galaxy S : front camera mounted landscape"); // mounted in landscape for a portrait phone orientation // |^^^^^^^^| // | ____ | @@ -84,10 +83,10 @@ class AndroidCameraConf5 implements AndroidCameraConf { public boolean isFrontCamera(int cameraId) { // Use hacks to guess facing of the camera if (cameraId == 2 && Hacks.isGalaxySOrTab()) { - Log.d(tag, "Hack Galaxy S : front camera has id=2"); + Log.d("Hack Galaxy S : front camera has id=2"); return true; } else if (cameraId == 1 && Hacks.hasTwoCamerasRear0Front1()) { - Log.d(tag, "Hack SPHD700 : front camera has id=1"); + Log.d("Hack SPHD700 : front camera has id=1"); return true; } diff --git a/src/org/linphone/core/video/AndroidCameraConf9.java b/src/org/linphone/core/video/AndroidCameraConf9.java index b32c80303..d0ef0faa5 100644 --- a/src/org/linphone/core/video/AndroidCameraConf9.java +++ b/src/org/linphone/core/video/AndroidCameraConf9.java @@ -18,10 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone.core.video; -import org.linphone.core.Version; +import org.linphone.core.Log; import android.hardware.Camera; -import android.util.Log; class AndroidCameraConf9 implements AndroidCameraConf { private AndroidCameras foundCameras; @@ -49,9 +48,7 @@ class AndroidCameraConf9 implements AndroidCameraConf { public int getCameraOrientation(int cameraId) { android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo(); Camera.getCameraInfo(cameraId, info); - Log.d(Version.TAG, String.format("Camera info for %d: orientation=%d", - cameraId, - info.orientation)); + Log.d("Camera info for ",cameraId,": orientation=",info.orientation); return info.orientation; } diff --git a/src/org/linphone/core/video/AndroidCameraRecord.java b/src/org/linphone/core/video/AndroidCameraRecord.java index 1fa12b86f..dec9338b2 100644 --- a/src/org/linphone/core/video/AndroidCameraRecord.java +++ b/src/org/linphone/core/video/AndroidCameraRecord.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.linphone.core.Log; import org.linphone.core.Version; import android.hardware.Camera; @@ -30,7 +31,6 @@ import android.hardware.Camera.ErrorCallback; import android.hardware.Camera.Parameters; import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.Size; -import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; @@ -44,7 +44,6 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { private PreviewCallback storedPreviewCallback; private boolean previewStarted; - protected static final String tag="Linphone"; private List supportedVideoSizes; private Size currentPreviewSize; @@ -58,27 +57,27 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { public synchronized void startPreview() { // FIXME throws exception? if (previewStarted) { - Log.w(tag, "Already started"); + Log.w("Already started"); throw new RuntimeException("Video recorder already started"); // return } if (params.surfaceView.getVisibility() != SurfaceView.VISIBLE) { // Illegal state - Log.e(tag, "Illegal state: video capture surface view is not visible"); + Log.e("Illegal state: video capture surface view is not visible"); return; } - Log.d(tag, "Trying to open camera with id " + params.cameraId); + Log.d("Trying to open camera with id ", params.cameraId); if (camera != null) { - Log.e(tag, "Camera is not null, ?already open? : aborting"); + Log.e("Camera is not null, ?already open? : aborting"); return; } camera = openCamera(params.cameraId); camera.setErrorCallback(new ErrorCallback() { public void onError(int error, Camera camera) { - Log.e(tag, "Camera error : " + error); + Log.e("Camera error : ", error); } }); @@ -113,14 +112,14 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { camera.setPreviewDisplay(holder); } catch (Throwable t) { - Log.e(tag, "Exception in Video capture setPreviewDisplay()", t); + Log.e(t,"Exception in Video capture setPreviewDisplay()"); } try { camera.startPreview(); } catch (Throwable e) { - Log.e(tag, "Error, can't start camera preview. Releasing camera!"); + Log.e("Error, can't start camera preview. Releasing camera!"); camera.release(); camera = null; return; @@ -132,7 +131,7 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { if (Camera.Parameters.FOCUS_MODE_AUTO.equals(parameters.getFocusMode())) { OnClickListener svClickListener = new OnClickListener() { public void onClick(View v) { - Log.i(tag, "Auto focus requested"); + Log.i("Auto focus requested"); camera.autoFocus(AndroidCameraRecord.this); } }; @@ -167,7 +166,7 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { public void storePreviewCallBack(PreviewCallback cb) { this.storedPreviewCallback = cb; if (camera == null) { - Log.w(tag, "Capture camera not ready, storing preview callback"); + Log.w("Capture camera not ready, storing preview callback"); return; } @@ -181,7 +180,7 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { camera.stopPreview(); camera.release(); camera=null; - Log.d(tag, "Camera released"); + Log.d("Camera released"); currentPreviewSize = null; previewStarted = false; } @@ -236,8 +235,8 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback { } public void onAutoFocus(boolean success, Camera camera) { - if (success) Log.i(tag, "Autofocus success"); - else Log.i(tag, "Autofocus failure"); + if (success) Log.i("Autofocus success"); + else Log.i("Autofocus failure"); } public int getStoredPhoneOrientation() { diff --git a/src/org/linphone/core/video/AndroidCameraRecord5.java b/src/org/linphone/core/video/AndroidCameraRecord5.java index 8ee2c8303..03f9123db 100644 --- a/src/org/linphone/core/video/AndroidCameraRecord5.java +++ b/src/org/linphone/core/video/AndroidCameraRecord5.java @@ -21,13 +21,13 @@ package org.linphone.core.video; import java.util.Arrays; import java.util.List; +import org.linphone.core.Log; import org.linphone.core.video.AndroidCameraRecord.RecorderParams.MirrorType; import android.hardware.Camera; import android.hardware.Camera.Parameters; import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.Size; -import android.util.Log; /** * Record from Android camera. @@ -63,18 +63,18 @@ class AndroidCameraRecord5 extends AndroidCameraRecord implements PreviewCallbac public void onPreviewFrame(byte[] data, Camera camera) { if (data == null) { - Log.e(tag, "onPreviewFrame Called with null buffer"); + Log.e("onPreviewFrame Called with null buffer"); return; } if (filterCtxPtr == 0l) { - Log.e(tag, "onPreviewFrame Called with no filterCtxPtr set"); + Log.e("onPreviewFrame Called with no filterCtxPtr set"); return; } int expectedBuffLength = getExpectedBufferLength(); if (expectedBuffLength != data.length) { - Log.e(tag, "onPreviewFrame called with bad buffer length " + data.length - + " whereas expected is " + expectedBuffLength + " don't calling putImage"); + Log.e("onPreviewFrame called with bad buffer length ", data.length, + " whereas expected is ", expectedBuffLength, " don't calling putImage"); return; } @@ -87,7 +87,7 @@ class AndroidCameraRecord5 extends AndroidCameraRecord implements PreviewCallbac double currentTimeElapsed = 0.8 * (curTime - lastFrameTime) / 1000 + 0.2 * timeElapsedBetweenFrames; if (currentTimeElapsed < expectedTimeBetweenFrames) { -// Log.d(tag, "Clipping frame " + Math.round(1 / currentTimeElapsed) + " > " + fps); +// Log.d("Clipping frame ", Math.round(1 / currentTimeElapsed), " > ", fps); return; } lastFrameTime = curTime; @@ -118,10 +118,10 @@ class AndroidCameraRecord5 extends AndroidCameraRecord implements PreviewCallbac List supportedFocusModes = parameters.getSupportedFocusModes(); String focusMode = selectFocusMode(supportedFocusModes); if (focusMode != null) { - Log.w(tag, "Selected focus mode: " + focusMode); + Log.w("Selected focus mode: ", focusMode); parameters.setFocusMode(focusMode); } else { - Log.i(tag, "No suitable focus mode found in : " + Arrays.toString(supportedFocusModes.toArray())); + Log.i("No suitable focus mode found in : ", Arrays.toString(supportedFocusModes.toArray())); } } diff --git a/src/org/linphone/core/video/AndroidCameraRecord8.java b/src/org/linphone/core/video/AndroidCameraRecord8.java index ad776475b..c5fda6774 100644 --- a/src/org/linphone/core/video/AndroidCameraRecord8.java +++ b/src/org/linphone/core/video/AndroidCameraRecord8.java @@ -20,11 +20,12 @@ package org.linphone.core.video; import java.util.List; +import org.linphone.core.Log; + import android.hardware.Camera; import android.hardware.Camera.Parameters; import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.Size; -import android.util.Log; /** * @@ -42,7 +43,7 @@ class AndroidCameraRecord8 extends AndroidCameraRecord5 { @Override protected void lowLevelSetPreviewCallback(Camera camera, PreviewCallback cb) { if (cb != null) { - Log.d(tag, "Setting optimized callback with buffer (Android >= 8). Remember to manage the pool of buffers!!!"); + Log.d("Setting optimized callback with buffer (Android >= 8). Remember to manage the pool of buffers!!!"); } camera.setPreviewCallbackWithBuffer(cb); } diff --git a/src/org/linphone/core/video/AndroidCameraRecordManager.java b/src/org/linphone/core/video/AndroidCameraRecordManager.java index f30f23e96..beb8fecb0 100644 --- a/src/org/linphone/core/video/AndroidCameraRecordManager.java +++ b/src/org/linphone/core/video/AndroidCameraRecordManager.java @@ -21,12 +21,12 @@ package org.linphone.core.video; import java.util.List; import org.linphone.LinphoneManager; +import org.linphone.core.Log; import org.linphone.core.Version; import org.linphone.core.video.AndroidCameraRecord.RecorderParams; import android.content.Context; import android.hardware.Camera.Size; -import android.util.Log; import android.view.OrientationEventListener; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -41,7 +41,6 @@ import android.view.SurfaceHolder.Callback; * */ public class AndroidCameraRecordManager { - private static final String tag = "Linphone"; private static AndroidCameraRecordManager instance; private OrientationEventListener orientationEventListener; private OnCapturingStateChangedListener capturingStateChangedListener; @@ -70,7 +69,7 @@ public class AndroidCameraRecordManager { // singleton private AndroidCameraRecordManager() { cc = Version.sdkAboveOrEqual(9) ? new AndroidCameraConf9() : new AndroidCameraConf5(); - Log.i(tag, "=== Detected " + cc.getFoundCameras()+ " ==="); + Log.i("=== Detected " + cc.getFoundCameras()+ " ==="); cameraId = cc.getFoundCameras().defaultC; } @@ -87,7 +86,7 @@ public class AndroidCameraRecordManager { public void setUseFrontCamera(boolean value) { if (!hasFrontCamera()) { - Log.e(tag, "setUseFrontCamera(true) while no front camera detected on device: using rear"); + Log.e("setUseFrontCamera(true) while no front camera detected on device: using rear"); value = false; } if (cc.isFrontCamera(cameraId) == value) return; // already OK @@ -116,7 +115,7 @@ public class AndroidCameraRecordManager { public void setParametersFromFilter(long filterDataPtr, int height, int width, float fps) { if (recorder != null) { - Log.w(tag, "Recorder should not be running"); + Log.w("Recorder should not be running"); stopVideoRecording(); } RecorderParams p = new RecorderParams(filterDataPtr); @@ -148,19 +147,19 @@ public class AndroidCameraRecordManager { holder.addCallback(new Callback() { public void surfaceDestroyed(SurfaceHolder holder) { surfaceView = null; - Log.d(tag , "Video capture surface destroyed"); + Log.d("Video capture surface destroyed"); stopVideoRecording(); } public void surfaceCreated(SurfaceHolder holder) { surfaceView = sv; - Log.d(tag , "Video capture surface created"); + Log.d("Video capture surface created"); tryToStartVideoRecording(); } public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - Log.d(tag , "Video capture surface changed"); + Log.d("Video capture surface changed"); } }); } @@ -200,7 +199,7 @@ public class AndroidCameraRecordManager { if (muted || surfaceView == null || parameters == null) return; if (recorder != null) { - Log.e(tag, "Recorder already present"); + Log.e("Recorder already present"); stopVideoRecording(); } @@ -271,7 +270,7 @@ public class AndroidCameraRecordManager { final int rotation = bufferRotationToCompensateCameraAndPhoneOrientations(); final boolean isPortrait = (rotation % 180) == 90; - Log.d(tag, "Camera sensor in " + (isPortrait? "portrait":"landscape") + " orientation."); + Log.d("Camera sensor in ", isPortrait? "portrait":"landscape"," orientation."); return isPortrait; } @@ -296,10 +295,10 @@ public class AndroidCameraRecordManager { final int phoneOrientation = mAlwaysChangingPhoneOrientation; final int cameraOrientation = cc.getCameraOrientation(cameraId); final int rotation = (cameraOrientation + phoneOrientation) % 360; - Log.d(tag, String.format( - "Capture video buffer of cameraId=%d will need a rotation of " - + "%d degrees: camera_orientation=%d, phone_orientation=%d", - cameraId, rotation, cameraOrientation, phoneOrientation)); + Log.d("Capture video buffer of cameraId=",cameraId, + " will need a rotation of ",rotation, + " degrees: camera_orientation=",cameraOrientation, + " phone_orientation=", phoneOrientation); return rotation; } @@ -329,7 +328,7 @@ public class AndroidCameraRecordManager { if (mAlwaysChangingPhoneOrientation == degrees) return; - Log.i(tag, "Phone orientation changed to " + degrees); + Log.i("Phone orientation changed to ", degrees); mAlwaysChangingPhoneOrientation = degrees; } }