summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2016-08-10 13:55:18 +0100
committerRicardo Cerqueira <ricardo@cyngn.com>2016-08-10 13:56:30 +0100
commit2071f20583103d1ccf6102f84b2eedd6bb1214ba (patch)
treefbe4b6aaba436cccd300af65d64b0a436f7ef645 /media/libstagefright
parentaa98968601ddb19d92790bf76bddd351dbc4c640 (diff)
downloadframeworks_av-2071f20583103d1ccf6102f84b2eedd6bb1214ba.zip
frameworks_av-2071f20583103d1ccf6102f84b2eedd6bb1214ba.tar.gz
frameworks_av-2071f20583103d1ccf6102f84b2eedd6bb1214ba.tar.bz2
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
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/CameraSource.cpp3
-rw-r--r--media/libstagefright/MediaCodecSource.cpp3
2 files changed, 2 insertions, 4 deletions
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;
}