diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-13 21:14:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-13 21:14:18 -0700 |
| commit | 6fd6589c6771fe5123a9e7d295170fc08b79197c (patch) | |
| tree | 68e4c8606bfd36fbcb4f1b6e87e52a7944cbb585 /include | |
| parent | 0138890a0993b66d04b95ce1f94a9800b2c666b6 (diff) | |
| parent | b8a89c8c3cdcaa95706897b18bff35098df0c817 (diff) | |
| download | frameworks_av-6fd6589c6771fe5123a9e7d295170fc08b79197c.zip frameworks_av-6fd6589c6771fe5123a9e7d295170fc08b79197c.tar.gz frameworks_av-6fd6589c6771fe5123a9e7d295170fc08b79197c.tar.bz2 | |
Merge "libstagefright: Allow for CameraSourceTimeLapse to be extended"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/CameraSourceTimeLapse.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/stagefright/CameraSourceTimeLapse.h b/include/media/stagefright/CameraSourceTimeLapse.h index 34213be..f264d98 100644 --- a/include/media/stagefright/CameraSourceTimeLapse.h +++ b/include/media/stagefright/CameraSourceTimeLapse.h @@ -20,6 +20,7 @@ #include <pthread.h> +#include <media/stagefright/CameraSource.h> #include <utils/RefBase.h> #include <utils/threads.h> #include <utils/String16.h> @@ -56,7 +57,7 @@ public: // returning quickly. void startQuickReadReturns(); -private: +protected: // size of the encoded video. int32_t mVideoWidth; int32_t mVideoHeight; @@ -152,7 +153,7 @@ private: // the frame needs to be encoded, it returns false and also modifies // the time stamp to be one frame time ahead of the last encoded // frame's time stamp. - bool skipFrameAndModifyTimeStamp(int64_t *timestampUs); + virtual bool skipFrameAndModifyTimeStamp(int64_t *timestampUs); // Wrapper to enter threadTimeLapseEntry() static void *ThreadTimeLapseWrapper(void *me); |