Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9320399 authored by Konsta's avatar Konsta Committed by Steve Kondik
Browse files

camera: allow device to append camera parameters 

Overload using include/camera/CameraParametersExtra.h in device
tree to add device specific camera parameters.

Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
parent 063c96d7

camera/CameraParameters.cpp

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <string.h>

#include <stdlib.h>

#include <camera/CameraParameters.h>

#include <camera/CameraParametersExtra.h>

#include <system/graphics.h>



namespace android {
@@ -173,6 +174,10 @@ const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-pictu 
const char CameraParameters::LIGHTFX_LOWLIGHT[] = "low-light";

const char CameraParameters::LIGHTFX_HDR[] = "high-dynamic-range";



#ifdef CAMERA_PARAMETERS_EXTRA_C

CAMERA_PARAMETERS_EXTRA_C

#endif



CameraParameters::CameraParameters()

                : mMap()

{

include/camera/CameraParameters.h

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <utils/KeyedVector.h>

#include <utils/String8.h>

#include <camera/CameraParametersExtra.h>



namespace android {
@@ -683,6 +684,10 @@ public: 
    // High-dynamic range mode

    static const char LIGHTFX_HDR[];



#ifdef CAMERA_PARAMETERS_EXTRA_H

CAMERA_PARAMETERS_EXTRA_H

#endif



    /**

     * Returns the the supported preview formats as an enum given in graphics.h

     * corrsponding to the format given in the input string or -1 if no such

include/camera/CameraParametersExtra.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
// Overload this file in your device specific config if you need

// to add extra camera parameters.

// A typical file would look like this:

/*

 * Copyright (C) 2014 The CyanogenMod Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

/*

#define CAMERA_PARAMETERS_EXTRA_C \

const char CameraParameters::KEY_SUPPORTED_BURST_NUM[] = "supported-burst-num"; \

const char CameraParameters::KEY_BURST_NUM[] = "burst-num"; \

const char CameraParameters::KEY_SUPPORTED_HDR_MODES[] = "supported-hdr-modes"; \

const char CameraParameters::KEY_HDR_MODE[] = "hdr-mode"; \

const char CameraParameters::HDR_MODE_OFF[] = "hdr-mode-off"; \

const char CameraParameters::HDR_MODE_HDR[] = "hdr-mode-hdr";



#define CAMERA_PARAMETERS_EXTRA_H \

    static const char KEY_SUPPORTED_BURST_NUM[]; \

    static const char KEY_BURST_NUM[]; \

    static const char KEY_SUPPORTED_HDR_MODES[]; \

    static const char KEY_HDR_MODE[]; \

    static const char HDR_MODE_OFF[]; \

    static const char HDR_MODE_HDR[];

*/