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 /media/libmediaplayerservice | |
| 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 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 136e6cf..80d5ac2 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -1465,13 +1465,13 @@ status_t StagefrightRecorder::setupCameraSource( return BAD_VALUE; } - mCameraSourceTimeLapse = CameraSourceTimeLapse::CreateFromCamera( + mCameraSourceTimeLapse = AVFactory::get()->CreateCameraSourceTimeLapseFromCamera( mCamera, mCameraProxy, mCameraId, mClientName, mClientUid, videoSize, mFrameRate, mPreviewSurface, mTimeBetweenCaptureUs); *cameraSource = mCameraSourceTimeLapse; } else { - *cameraSource = AVFactory::get()->CreateFromCamera( + *cameraSource = AVFactory::get()->CreateCameraSourceFromCamera( mCamera, mCameraProxy, mCameraId, mClientName, mClientUid, videoSize, mFrameRate, mPreviewSurface); |