diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-30 18:46:16 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-05-01 01:59:35 +0000 |
| commit | f06cc24ce7aeb5ff6f45b770a15286c95f8cc9ff (patch) | |
| tree | 22ce17daecad35ec164ff03caec5e9b02396ef14 /include | |
| parent | 1de1e25cba872bd4c077c2e394f8ca9c70b65856 (diff) | |
| download | frameworks_av-f06cc24ce7aeb5ff6f45b770a15286c95f8cc9ff.zip frameworks_av-f06cc24ce7aeb5ff6f45b770a15286c95f8cc9ff.tar.gz frameworks_av-f06cc24ce7aeb5ff6f45b770a15286c95f8cc9ff.tar.bz2 | |
stagefright: MediaCodec: rename mNativeWindow to mSurface
because mNativeWindow is of type sp<Surface>
Bug: 19489395
Change-Id: I5ddc78b04e387915a2293b71195d7a6494986356
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index d89e4c7..e232ce6 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -259,7 +259,7 @@ private: sp<AReplyToken> mReplyID; uint32_t mFlags; status_t mStickyError; - sp<Surface> mNativeWindow; + sp<Surface> mSurface; SoftwareRenderer *mSoftRenderer; sp<AMessage> mOutputFormat; sp<AMessage> mInputFormat; @@ -334,7 +334,7 @@ private: void extractCSD(const sp<AMessage> &format); status_t queueCSDInputBuffer(size_t bufferIndex); - status_t setNativeWindow( + status_t handleSetSurface( const sp<Surface> &surface); void postActivityNotificationIfPossible(); |