summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodec.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-02-14 17:11:27 -0800
committerMathias Agopian <mathias@google.com>2013-02-15 12:47:35 -0800
commitb1e7cd156ca3e1747374e0d20cdd1ce467210453 (patch)
tree557f25ff5a0477f0cf0f89d4c21b0291371f09a2 /media/libstagefright/MediaCodec.cpp
parent62ad9071cd61fc56355d3c2d25895382003ea362 (diff)
downloadframeworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.zip
frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.tar.gz
frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.tar.bz2
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
-rw-r--r--media/libstagefright/MediaCodec.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 77aceb7..83be0fd 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -22,7 +22,7 @@
#include "include/SoftwareRenderer.h"
-#include <gui/SurfaceTextureClient.h>
+#include <gui/Surface.h>
#include <media/ICrypto.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
@@ -132,7 +132,7 @@ status_t MediaCodec::init(const char *name, bool nameIsType, bool encoder) {
status_t MediaCodec::configure(
const sp<AMessage> &format,
- const sp<SurfaceTextureClient> &nativeWindow,
+ const sp<Surface> &nativeWindow,
const sp<ICrypto> &crypto,
uint32_t flags) {
sp<AMessage> msg = new AMessage(kWhatConfigure, id());
@@ -1526,7 +1526,7 @@ ssize_t MediaCodec::dequeuePortBuffer(int32_t portIndex) {
}
status_t MediaCodec::setNativeWindow(
- const sp<SurfaceTextureClient> &surfaceTextureClient) {
+ const sp<Surface> &surfaceTextureClient) {
status_t err;
if (mNativeWindow != NULL) {