diff options
author | Mathias Agopian <mathias@google.com> | 2013-02-21 23:21:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-21 23:21:21 +0000 |
commit | 99c2f923f6b04efffe949d1daf9cb7148e3cc201 (patch) | |
tree | 55c1e2edc11f76e1f43f05dd688aae09d57b3dd9 | |
parent | e2fb147449fe1f851d4b7dd0387672fb79dd3d33 (diff) | |
parent | 9e1cdea45d40fa8cf95dd080943053856009054f (diff) | |
download | frameworks_av-99c2f923f6b04efffe949d1daf9cb7148e3cc201.zip frameworks_av-99c2f923f6b04efffe949d1daf9cb7148e3cc201.tar.gz frameworks_av-99c2f923f6b04efffe949d1daf9cb7148e3cc201.tar.bz2 |
Merge "replace getISurfaceTexture by getIGraphicBufferProducer"
-rw-r--r-- | cmds/stagefright/stream.cpp | 2 | ||||
-rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 2 | ||||
-rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/stream.cpp b/cmds/stagefright/stream.cpp index d49ab4a..dba67a9 100644 --- a/cmds/stagefright/stream.cpp +++ b/cmds/stagefright/stream.cpp @@ -374,7 +374,7 @@ int main(int argc, char **argv) { service->create(client, 0); if (player != NULL && player->setDataSource(source) == NO_ERROR) { - player->setVideoSurfaceTexture(surface->getISurfaceTexture()); + player->setVideoSurfaceTexture(surface->getIGraphicBufferProducer()); player->start(); client->waitForEOS(); diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index b9feaf8..e8b3b7f 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -488,7 +488,7 @@ status_t Camera2Client::setPreviewDisplay( sp<IBinder> binder; sp<ANativeWindow> window; if (surface != 0) { - binder = surface->getISurfaceTexture()->asBinder(); + binder = surface->getIGraphicBufferProducer()->asBinder(); window = surface; } diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 5f03a1c..f67c9f4 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -301,7 +301,7 @@ status_t CameraClient::setPreviewWindow(const sp<IBinder>& binder, status_t CameraClient::setPreviewDisplay(const sp<Surface>& surface) { LOG1("setPreviewDisplay(%p) (pid %d)", surface.get(), getCallingPid()); - sp<IBinder> binder(surface != 0 ? surface->getISurfaceTexture()->asBinder() : 0); + sp<IBinder> binder(surface != 0 ? surface->getIGraphicBufferProducer()->asBinder() : 0); sp<ANativeWindow> window(surface); return setPreviewWindow(binder, window); } |