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

Commit 035b037e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add RAW12 support for meta data"

parents 47aeb593 385d9c87

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1762,6 +1762,7 @@ int msm_isp_get_bit_per_pixel(uint32_t output_format) 
	case V4L2_PIX_FMT_QGRBG12:

	case V4L2_PIX_FMT_QRGGB12:

	case V4L2_PIX_FMT_Y12:

	case MSM_V4L2_PIX_FMT_META12:

		return 12;

	case V4L2_PIX_FMT_SBGGR14:

	case V4L2_PIX_FMT_SGBRG14:

include/uapi/media/msm_cam_sensor.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 


#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */

#define MSM_V4L2_PIX_FMT_META10 v4l2_fourcc('M', 'E', '1', '0') /* META10 */

#define MSM_V4L2_PIX_FMT_META12 v4l2_fourcc('M', 'E', '1', '2') /* META12 */



#define MSM_V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4')

	/* 14  BGBG.. GRGR.. */

#define MSM_V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4')