diff options
| author | Mathias Agopian <mathias@google.com> | 2011-08-09 15:23:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-09 15:23:19 -0700 |
| commit | f6d08b95289ec9069fa2f3789dbfc4748dbb4883 (patch) | |
| tree | 11bd4321dc42756d85d49786196ffb43536318ce /include/media | |
| parent | 7466b0fdfe6ae07e56053d70db414b7a2f792400 (diff) | |
| parent | 43a3d91dff059034d699c9612dab68b8d9cdf556 (diff) | |
| download | frameworks_base-f6d08b95289ec9069fa2f3789dbfc4748dbb4883.zip frameworks_base-f6d08b95289ec9069fa2f3789dbfc4748dbb4883.tar.gz frameworks_base-f6d08b95289ec9069fa2f3789dbfc4748dbb4883.tar.bz2 | |
Merge changes Ie06e73e5,I7ac6b5b0
* changes:
free all buffers when ANativeWindow::disconnect is called
return correct value from query after connecting a surface
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index fab258c..1affb8a 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -133,7 +133,8 @@ public: // // This method will fail if the connect was previously called on the // SurfaceMediaSource and no corresponding disconnect call was made. - virtual status_t connect(int api); + virtual status_t connect(int api, + uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform); // disconnect attempts to disconnect a client API from the SurfaceMediaSource. // Calling this method will cause any subsequent calls to other |