デバッグログ出力を抑制

Author: saki4510t

app/src/main/java/com/serenegiant/widget/DistributorCameraGLSurfaceView.kt

@@ -378,7 +378,7 @@ class DistributorCameraGLSurfaceView @JvmOverloads constructor(
 				return
 			}
 			val viewAspect = viewWidth / viewHeight.toDouble()
-			Log.i(TAG, String.format("updateViewport:view(%d,%d)%f,video(%1.0f,%1.0f)",
+			if (DEBUG) Log.i(TAG, String.format("updateViewport:view(%d,%d)%f,video(%1.0f,%1.0f)",
 				viewWidth, viewHeight, viewAspect, videoWidth, videoHeight))
 			Matrix.setIdentityM(mMvpMatrix, 0)
 			when (val scaleMode = mCameraDelegator.scaleMode) {
@@ -404,7 +404,7 @@ class DistributorCameraGLSurfaceView @JvmOverloads constructor(
 						y = (viewHeight - height) / 2
 					}
 					// set viewport to draw keeping aspect ration of camera image
-					Log.i(TAG, String.format("updateViewport:xy(%d,%d),size(%d,%d)",
+					if (DEBUG) Log.i(TAG, String.format("updateViewport:xy(%d,%d),size(%d,%d)",
 						x, y, width, height))
 					GLES20.glViewport(x, y, width, height)
 				}
@@ -417,7 +417,7 @@ class DistributorCameraGLSurfaceView @JvmOverloads constructor(
 							scaleX.coerceAtLeast(scaleY) else scaleX.coerceAtMost(scaleY)
 					val width = scale * videoWidth
 					val height = scale * videoHeight
-					Log.i(TAG, String.format("updateViewport:size(%1.0f,%1.0f),scale(%f,%f),mat(%f,%f)",
+					if (DEBUG) Log.i(TAG, String.format("updateViewport:size(%1.0f,%1.0f),scale(%f,%f),mat(%f,%f)",
 						width, height, scaleX, scaleY, width / viewWidth, height / viewHeight))
 					Matrix.scaleM(mMvpMatrix, 0,
 						(width / viewWidth).toFloat(),

common/src/main/java/com/serenegiant/camera/Camera2Utils.java

@@ -259,7 +259,7 @@ public static Size chooseOptimalSize(
 		final Size ppsfv =  Collections.max(Arrays.asList(sizes), new CompareSizesByArea());
 		// widthまたはheightが未指定名の時は最大解像度を使う・・・ここは1080pに制限しといた方が良いかもしれない
 		if ((_width <= 0) || (_height <= 0)) {
-			Log.d(TAG, "chooseOptimalSize:select" + ppsfv);
+			if (DEBUG) Log.d(TAG, "chooseOptimalSize:select" + ppsfv);
 			return ppsfv;
 		}
 
@@ -282,7 +282,7 @@ public static Size chooseOptimalSize(
 		for (Size sz : sizes) {
 			if ((sz.getWidth() == width) && (sz.getHeight() == height)) {
 				selectedSize = sz;
-				Log.v(TAG, "chooseOptimalSize:found(" + selectedSize + ")");
+				if (DEBUG) Log.v(TAG, "chooseOptimalSize:found(" + selectedSize + ")");
 				return selectedSize;
 			}
 		}
@@ -328,7 +328,7 @@ public static Size chooseOptimalSize(
 		}
 		// アスペクト比の差が+/-5%未満のがあればそれを選択する
 		if ((selectedSize != null) && (selectedDelta < 0.05)) {
-			Log.d(TAG, String.format("chooseOptimalSize:select(%dx%d), request(%d,%d)",
+			if (DEBUG) Log.d(TAG, String.format("chooseOptimalSize:select(%dx%d), request(%d,%d)",
 				selectedSize.getWidth(), selectedSize.getHeight(), width, height));
 			return selectedSize;
 		}
@@ -342,7 +342,7 @@ public static Size chooseOptimalSize(
 		if (selectedSize == null) {
 			selectedSize = ppsfv;
 		}
-		Log.d(TAG, "chooseOptimalSize:select(" + selectedSize + ")");
+		if (DEBUG) Log.d(TAG, "chooseOptimalSize:select(" + selectedSize + ")");
 		return selectedSize;
 	}
 

common/src/main/java/com/serenegiant/glutils/AbstractDistributeTask.java

@@ -633,7 +633,7 @@ private void handleRemoveAll() {
 		if (DEBUG) Log.v(TAG, "handleRemoveAll:");
 		synchronized (mTargets) {
 			final int n = mTargets.size();
-			Log.i(TAG, "handleRemoveAll:n=" + n);
+			if (DEBUG) Log.i(TAG, "handleRemoveAll:n=" + n);
 			for (int i = 0; i < n; i++) {
 				final RendererTarget target = mTargets.valueAt(i);
 				if (target != null) {