Skip to content

Commit 9ca7964

Browse files
pedroSG94pedroSG94
committed
optimize imports and remove warnings
1 parent d69176a commit 9ca7964

34 files changed

Lines changed: 73 additions & 73 deletions

File tree

‎app/src/main/java/com/pedro/streamer/rotation/RotationActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import androidx.annotation.RequiresApi
3030
import androidx.appcompat.app.AppCompatActivity
3131
import androidx.core.graphics.scale
3232
import com.pedro.encoder.input.sources.audio.MicrophoneSource
33+
import com.pedro.encoder.input.sources.video.BitmapSource
3334
import com.pedro.encoder.input.sources.video.BufferVideoSource
3435
import com.pedro.encoder.input.sources.video.Camera1Source
3536
import com.pedro.encoder.input.sources.video.Camera2Source
36-
import com.pedro.encoder.input.sources.video.BitmapSource
3737
import com.pedro.extrasources.CameraUvcSource
3838
import com.pedro.extrasources.CameraXSource
3939
import com.pedro.streamer.R

‎app/src/main/java/com/pedro/streamer/screen/ScreenActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import androidx.activity.result.contract.ActivityResultContracts
2727
import androidx.annotation.RequiresApi
2828
import androidx.appcompat.app.AppCompatActivity
2929
import com.pedro.common.ConnectChecker
30-
import com.pedro.library.base.recording.RecordController
31-
import com.pedro.encoder.input.sources.audio.MixAudioSource
3230
import com.pedro.encoder.input.sources.audio.InternalAudioSource
3331
import com.pedro.encoder.input.sources.audio.MicrophoneSource
32+
import com.pedro.encoder.input.sources.audio.MixAudioSource
33+
import com.pedro.library.base.recording.RecordController
3434
import com.pedro.streamer.R
3535
import com.pedro.streamer.utils.fitAppPadding
3636
import com.pedro.streamer.utils.toast

‎common/src/main/java/com/pedro/common/base/BaseSender.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import android.util.Log
44
import com.pedro.common.BitrateManager
55
import com.pedro.common.ConnectChecker
66
import com.pedro.common.StreamBlockingQueue
7-
import com.pedro.common.compare
87
import com.pedro.common.frame.MediaFrame
9-
import com.pedro.common.trySend
108
import kotlinx.coroutines.CoroutineScope
119
import kotlinx.coroutines.Dispatchers
1210
import kotlinx.coroutines.Job
@@ -16,9 +14,6 @@ import kotlinx.coroutines.delay
1614
import kotlinx.coroutines.isActive
1715
import kotlinx.coroutines.launch
1816
import java.nio.ByteBuffer
19-
import java.util.concurrent.BlockingQueue
20-
import java.util.concurrent.LinkedBlockingQueue
21-
import java.util.concurrent.PriorityBlockingQueue
2217

2318
abstract class BaseSender(
2419
protected val connectChecker: ConnectChecker,

‎encoder/src/main/java/com/pedro/encoder/input/audio/AmplitudeEffect.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.pedro.encoder.input.audio
22

3-
import java.util.concurrent.BlockingQueue
43
import java.util.concurrent.Executors
54
import java.util.concurrent.LinkedBlockingQueue
65

‎encoder/src/main/java/com/pedro/encoder/input/sources/video/BitmapSource.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class BitmapSource(private val bitmap: Bitmap): VideoSource() {
5454
val canvas = surface?.lockCanvas(null)
5555
canvas?.drawBitmap(scaledBitmap, 0f, 0f, paint)
5656
surface?.unlockCanvasAndPost(canvas)
57-
} catch (ignored: Exception) { }
57+
} catch (_: Exception) { }
5858
//sleep to emulate fps
5959
delay(1000 / fps.toLong())
6060
}

‎encoder/src/main/java/com/pedro/encoder/input/sources/video/VideoSource.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.pedro.encoder.input.sources.video
1818

1919
import android.graphics.SurfaceTexture
2020
import com.pedro.encoder.input.sources.OrientationConfig
21-
import com.pedro.encoder.input.sources.OrientationForced
2221

2322
/**
2423
* Created by pedro on 11/1/24.

‎encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
* <p>
5252
* If you want use all resolutions. You can use libYuv for resize images in OnPreviewFrame:
5353
* https://chromium.googlesource.com/libyuv/libyuv/
54+
* @noinspection deprecation
5455
*/
5556

5657
public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDetectionListener {
@@ -68,7 +69,7 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
6869
private int cameraSelect;
6970
private CameraHelper.Facing facing = CameraHelper.Facing.BACK;
7071
private boolean isPortrait = false;
71-
private Context context;
72+
private final Context context;
7273

7374
//default parameters for camera
7475
private int width = 640;
@@ -389,7 +390,7 @@ public Camera.Size getCameraSize(int width, int height) {
389390
}
390391

391392
/**
392-
* See: https://developer.android.com/reference/android/graphics/ImageFormat.html to know name of
393+
* See: <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html">ImageFormat</a> to know name of
393394
* constant values
394395
* Example: 842094169 -> YV12, 17 -> NV21
395396
*/
@@ -490,7 +491,6 @@ public void switchCamera(int cameraId) throws CameraOpenException {
490491
}
491492
stop();
492493
start();
493-
return;
494494
}
495495
}
496496

@@ -551,7 +551,7 @@ public List<int[]> getSupportedFps() {
551551
}
552552

553553
/**
554-
* @required: <uses-permission android:name="android.permission.FLASHLIGHT"/>
554+
* &#064;required: <uses-permission android:name="android.permission.FLASHLIGHT"/>
555555
*/
556556
public void disableLantern() {
557557
if (camera != null) {
@@ -756,16 +756,16 @@ private Rect calculateFocusArea(float x, float y, float previewWidth, float prev
756756
return new Rect(left, top, left + focusAreaSize, top + focusAreaSize);
757757
}
758758

759-
private int clamp(int touchCoordinateInCameraReper, int focusAreaSize) {
759+
private int clamp(int touchCoordinate, int focusAreaSize) {
760760
int result;
761-
if (Math.abs(touchCoordinateInCameraReper) + focusAreaSize / 2 > 1000){
762-
if (touchCoordinateInCameraReper > 0){
761+
if (Math.abs(touchCoordinate) + focusAreaSize / 2 > 1000) {
762+
if (touchCoordinate > 0) {
763763
result = 1000 - focusAreaSize / 2;
764764
} else {
765765
result = -1000 + focusAreaSize / 2;
766766
}
767-
} else{
768-
result = touchCoordinateInCameraReper - focusAreaSize / 2;
767+
} else {
768+
result = touchCoordinate - focusAreaSize / 2;
769769
}
770770
return result;
771771
}

‎encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.kt‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import java.util.concurrent.Executors
5252
import java.util.concurrent.Semaphore
5353
import kotlin.math.max
5454
import kotlin.math.min
55+
import kotlin.math.roundToInt
5556

5657
/**
5758
* Created by pedro on 4/03/17.
@@ -115,7 +116,7 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
115116
private var imageReader: ImageReader? = null
116117

117118
init {
118-
cameraId = try { getCameraIdForFacing(Facing.BACK) } catch (e: Exception) { "0" }
119+
cameraId = try { getCameraIdForFacing(Facing.BACK) } catch (_: Exception) { "0" }
119120
}
120121

121122
fun prepareCamera(surfaceTexture: SurfaceTexture, width: Int, height: Int, fps: Int) {
@@ -158,13 +159,10 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
158159
try {
159160
it.setRepeatingRequest(
160161
captureRequest,
161-
if (faceDetectionEnabled || frameCapturedCallback != null){
162-
cb
163-
} else{
164-
null
165-
}, cameraHandler
162+
if (faceDetectionEnabled || frameCapturedCallback != null) cb else null,
163+
cameraHandler
166164
)
167-
} catch (e: IllegalStateException) {
165+
} catch (_: IllegalStateException) {
168166
reOpenCamera(cameraId)
169167
} catch (e: Exception) {
170168
cameraCallbacks?.onCameraError("Create capture session failed: " + e.message)
@@ -178,7 +176,7 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
178176
},
179177
cameraHandler
180178
)
181-
} catch (e: IllegalStateException) {
179+
} catch (_: IllegalStateException) {
182180
reOpenCamera(cameraId)
183181
} catch (e: Exception) {
184182
cameraCallbacks?.onCameraError("Create capture session failed: " + e.message)
@@ -506,7 +504,7 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
506504
session.capture(builderInputSurface.build(), captureCallbackHandler, null)
507505
isAutoFocusEnabled = true
508506
return true
509-
} catch (e: Exception) {
507+
} catch (_: Exception) {
510508
return false
511509
}
512510
}
@@ -763,8 +761,8 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
763761
//This ratio is the ratio of cropped Rect to Camera's original(Maximum) Rect
764762
val ratio = 1f / l
765763
//croppedWidth and croppedHeight are the pixels cropped away, not pixels after cropped
766-
val croppedWidth = rect.width() - Math.round(rect.width().toFloat() * ratio)
767-
val croppedHeight = rect.height() - Math.round(rect.height().toFloat() * ratio)
764+
val croppedWidth = rect.width() - (rect.width().toFloat() * ratio).roundToInt()
765+
val croppedHeight = rect.height() - (rect.height().toFloat() * ratio).roundToInt()
768766
//Finally, zoom represents the zoomed visible area
769767
val zoom = Rect(
770768
croppedWidth / 2, croppedHeight / 2, rect.width() - croppedWidth / 2,
@@ -903,7 +901,7 @@ class Camera2ApiManager(context: Context) : CameraDevice.StateCallback() {
903901
}
904902
}
905903
return Facing.BACK
906-
} catch (e: Exception) {
904+
} catch (_: Exception) {
907905
return Facing.BACK
908906
}
909907
}

‎encoder/src/main/java/com/pedro/encoder/input/video/Camera2ResolutionCalculator.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ object Camera2ResolutionCalculator {
3434
resolutions.add(resolution)
3535
val resolutionsSorted = resolutions.sortedByDescending { it.height }
3636
val index = resolutionsSorted.indexOf(resolution)
37-
if (index > 0) {
38-
return resolutionsSorted[index - 1]
39-
} else return resolutionsSorted[index + 1]
37+
return if (index > 0) {
38+
resolutionsSorted[index - 1]
39+
} else resolutionsSorted[index + 1]
4040
} else {
4141
actualResolution
4242
}

‎encoder/src/main/java/com/pedro/encoder/utils/gl/GlUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import androidx.annotation.RequiresApi;
2929

3030
import com.pedro.encoder.BuildConfig;
31+
3132
import java.io.ByteArrayOutputStream;
3233
import java.io.IOException;
3334
import java.io.InputStream;

0 commit comments

Comments
 (0)