diff options
author | Andriy Chepurnyy <x0155536@ti.com> | 2013-01-08 15:06:48 +0200 |
---|---|---|
committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 13:37:43 -0800 |
commit | 34223d8215b8ced4c00b560f96d30f362e84deec (patch) | |
tree | 25da0587bd5a2e907f65de6f32250568d2b61884 | |
parent | 273ffe268a14a270550d584bbaf9c10fed90e3b9 (diff) | |
download | hardware_ti_omap4-34223d8215b8ced4c00b560f96d30f362e84deec.tar.gz hardware_ti_omap4-34223d8215b8ced4c00b560f96d30f362e84deec.tar.bz2 hardware_ti_omap4-34223d8215b8ced4c00b560f96d30f362e84deec.zip |
CameraHal: Correctly set H264 stream mode using K3.4 and later
Since in Kernel 3.4 now defined V4L2_PIX_FMT_H264 - we
will use it to enable H264 stream mode in V4LCameraAdapter.
Change-Id: I963131f5d740d60815bdca99e5a8b0cdc17ab161
Signed-off-by: Andriy Chepurnyy <x0155536@ti.com>
-rwxr-xr-x | camera/V4LCameraAdapter/V4LCameraAdapter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp index 2c641ce..f08fc8c 100755 --- a/camera/V4LCameraAdapter/V4LCameraAdapter.cpp +++ b/camera/V4LCameraAdapter/V4LCameraAdapter.cpp @@ -1095,8 +1095,7 @@ void V4LCameraAdapter::setupWorkingMode() { } case 2 : { - // This is WA for Kernel 3.0 - till correct h264 parsing come. - mPixelFormat = 0;//V4L2_PIX_FMT_H264 + mPixelFormat = V4L2_PIX_FMT_H264; mCameraHal->setExternalLocking(true); mDecoder = DecoderFactory::createDecoderByType(DecoderType_H264, false); CAMHAL_LOGI("Using V4L preview format: V4L2_PIX_FMT_H264"); |