From 2071f20583103d1ccf6102f84b2eedd6bb1214ba Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Wed, 10 Aug 2016 13:55:18 +0100 Subject: stagefright: Remove the HAL3 limitation from the video reference clock selection Usage of boot-time as the timestamp reference isn't necessarily limited to HAL3. A single property check for media.camera.ts.monotonic is enough to cover all cases. Change-Id: Ic56dbcc6ba32c25bccde6dd0bbf07d4c918af43e --- media/libstagefright/CameraSource.cpp | 3 +-- media/libstagefright/MediaCodecSource.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'media/libstagefright') diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 4caee78..f6b4741 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -705,8 +705,7 @@ status_t CameraSource::start(MetaData *meta) { int64_t startTimeUs; auto key = kKeyTime; - if (property_get_bool("persist.camera.HAL3.enabled", true) && - !property_get_bool("media.camera.ts.monotonic", true)) { + if (!property_get_bool("media.camera.ts.monotonic", true)) { key = kKeyTimeBoot; } diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp index 94427ef..14a3c0d 100644 --- a/media/libstagefright/MediaCodecSource.cpp +++ b/media/libstagefright/MediaCodecSource.cpp @@ -665,8 +665,7 @@ status_t MediaCodecSource::onStart(MetaData *params) { if (mFlags & FLAG_USE_SURFACE_INPUT) { auto key = kKeyTime; - if (property_get_bool("persist.camera.HAL3.enabled", true) && - !property_get_bool("media.camera.ts.monotonic", true)) { + if (!property_get_bool("media.camera.ts.monotonic", true)) { key = kKeyTimeBoot; } -- cgit v1.1