diff options
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IMediaRecorder.cpp | 9 | ||||
| -rw-r--r-- | media/libmedia/mediarecorder.cpp | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index 59cd1b7..a44ef5a 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -60,12 +60,13 @@ public: { } - status_t setCamera(const sp<ICamera>& camera) + status_t setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy) { - LOGV("setCamera(%p)", camera.get()); + LOGV("setCamera(%p,%p)", camera.get(), proxy.get()); Parcel data, reply; data.writeInterfaceToken(IMediaRecorder::getInterfaceDescriptor()); data.writeStrongBinder(camera->asBinder()); + data.writeStrongBinder(proxy->asBinder()); remote()->transact(SET_CAMERA, data, &reply); return reply.readInt32(); } @@ -434,7 +435,9 @@ status_t BnMediaRecorder::onTransact( LOGV("SET_CAMERA"); CHECK_INTERFACE(IMediaRecorder, data, reply); sp<ICamera> camera = interface_cast<ICamera>(data.readStrongBinder()); - reply->writeInt32(setCamera(camera)); + sp<ICameraRecordingProxy> proxy = + interface_cast<ICameraRecordingProxy>(data.readStrongBinder()); + reply->writeInt32(setCamera(camera, proxy)); return NO_ERROR; } break; default: diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 0100a17..9e4edd0 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -28,9 +28,9 @@ namespace android { -status_t MediaRecorder::setCamera(const sp<ICamera>& camera) +status_t MediaRecorder::setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy) { - LOGV("setCamera(%p)", camera.get()); + LOGV("setCamera(%p,%p)", camera.get(), proxy.get()); if(mMediaRecorder == NULL) { LOGE("media recorder is not initialized yet"); return INVALID_OPERATION; @@ -40,7 +40,7 @@ status_t MediaRecorder::setCamera(const sp<ICamera>& camera) return INVALID_OPERATION; } - status_t ret = mMediaRecorder->setCamera(camera); + status_t ret = mMediaRecorder->setCamera(camera, proxy); if (OK != ret) { LOGV("setCamera failed: %d", ret); mCurrentState = MEDIA_RECORDER_ERROR; |