Skip to content

Commit 82f06d1

Browse files
committed
支持外置USB摄像头
1 parent 6322fd3 commit 82f06d1

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

openCVLibrary411/src/main/java/org/opencv/android/JavaCamera2View.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ protected boolean initializeCamera() {
102102
if ((mCameraIndex == CameraBridgeViewBase.CAMERA_ID_BACK &&
103103
characteristics.get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_BACK) ||
104104
(mCameraIndex == CameraBridgeViewBase.CAMERA_ID_FRONT &&
105-
characteristics.get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_FRONT)
105+
characteristics.get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_FRONT)||
106+
(characteristics.get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_EXTERNAL)
106107
) {
107108
mCameraID = cameraID;
108109
break;

smartopencv/src/main/java/tech/huqi/smartopencv/core/bridge/CameraBridgeViewWrapper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ public void deliverAndDrawFrame(CvCameraViewFrame frame) {
119119
Canvas canvas = mSurfaceHolder.lockCanvas();
120120
if (canvas != null) {
121121
canvas.drawColor(0, android.graphics.PorterDuff.Mode.CLEAR);
122-
if (BuildConfig.DEBUG)
123-
Log.d(TAG, "mStretch value: " + mScale);
122+
//Too many log
123+
//if (BuildConfig.DEBUG)
124+
// Log.d(TAG, "mStretch value: " + mScale);
124125

125126
if (mBase instanceof ICameraView) {
126127
((ICameraView) mBase).drawBitmap(canvas, mCacheBitmap);

smartopencv/src/main/java/tech/huqi/smartopencv/utils/CameraHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ private static int getCameraRotateDegree(int cameraId) {
7777
Camera.CameraInfo info = new Camera.CameraInfo();
7878
Camera.getCameraInfo(cameraId, info);
7979
return info.orientation;
80+
//FIXME some bug here???
81+
//return 0;
8082
}
8183

8284
public static Bitmap scaleImage(Bitmap image, int desireWidth, int desireHeight) {

0 commit comments

Comments
 (0)