Skip to content

Commit

Permalink
klte-common: camera: Use wrapper parameters instead of CameraParameters
Browse files Browse the repository at this point in the history
 * Get inline with the lack of CameraParametersExtra.h
    support in AOSP, avoid using device header to inject
    additional parameters, especially with the introduction
    of Android.bp compilation for libcamera_client
    which ignores the device headers override

Change-Id: I754116f55ed32d54d1b1ad44407993137a07fb69
  • Loading branch information
AdrianDC authored and haggertk committed Nov 1, 2017
1 parent dac4f86 commit 737bd8c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 76 deletions.
12 changes: 9 additions & 3 deletions camera/CameraWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
#include <utils/String8.h>
#include <utils/threads.h>

static const char KEY_DIS[] = "dis";
static const char DIS_DISABLE[] = "disable";
static const char KEY_ZSL[] = "zsl";
static const char ZSL_ON[] = "on";
static const char ZSL_OFF[] = "off";

#define BACK_CAMERA_ID 0
#define FRONT_CAMERA_ID 1

Expand Down Expand Up @@ -190,10 +196,10 @@ static char *camera_fixup_setparams(int id, const char *settings)

if (!isTorch && !wasTorch) {
if (isVideo) {
params.set(CameraParameters::KEY_DIS, CameraParameters::DIS_DISABLE);
params.set(CameraParameters::KEY_ZSL, CameraParameters::ZSL_OFF);
params.set(KEY_DIS, DIS_DISABLE);
params.set(KEY_ZSL, ZSL_OFF);
} else {
params.set(CameraParameters::KEY_ZSL, CameraParameters::ZSL_ON);
params.set(KEY_ZSL, ZSL_ON);
}
}

Expand Down
73 changes: 0 additions & 73 deletions include/camera/CameraParametersExtra.h

This file was deleted.

0 comments on commit 737bd8c

Please sign in to comment.