diff options
author | Mathias Agopian <mathias@google.com> | 2013-02-14 17:11:27 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2013-02-15 12:47:35 -0800 |
commit | b1e7cd156ca3e1747374e0d20cdd1ce467210453 (patch) | |
tree | 557f25ff5a0477f0cf0f89d4c21b0291371f09a2 /libvideoeditor | |
parent | 62ad9071cd61fc56355d3c2d25895382003ea362 (diff) | |
download | frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.zip frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.tar.gz frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.tar.bz2 |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-x | libvideoeditor/lvpp/NativeWindowRenderer.cpp | 6 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/NativeWindowRenderer.h | 14 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/PreviewPlayer.cpp | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.cpp b/libvideoeditor/lvpp/NativeWindowRenderer.cpp index 114f0f6..702900b 100755 --- a/libvideoeditor/lvpp/NativeWindowRenderer.cpp +++ b/libvideoeditor/lvpp/NativeWindowRenderer.cpp @@ -21,7 +21,7 @@ #include <GLES2/gl2ext.h> #include <cutils/log.h> #include <gui/GLConsumer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/foundation/ADebug.h> @@ -316,7 +316,7 @@ NativeWindowRenderer::~NativeWindowRenderer() { void NativeWindowRenderer::render(RenderInput* input) { sp<GLConsumer> ST = input->mST; - sp<SurfaceTextureClient> STC = input->mSTC; + sp<Surface> STC = input->mSTC; if (input->mIsExternalBuffer) { queueExternalBuffer(STC.get(), input->mBuffer, @@ -569,7 +569,7 @@ RenderInput::RenderInput(NativeWindowRenderer* renderer, GLuint textureId) : mRenderer(renderer) , mTextureId(textureId) { mST = new GLConsumer(mTextureId); - mSTC = new SurfaceTextureClient(mST->getBufferQueue()); + mSTC = new Surface(mST->getBufferQueue()); native_window_connect(mSTC.get(), NATIVE_WINDOW_API_MEDIA); } diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.h b/libvideoeditor/lvpp/NativeWindowRenderer.h index b0623ba..26b4cba 100755 --- a/libvideoeditor/lvpp/NativeWindowRenderer.h +++ b/libvideoeditor/lvpp/NativeWindowRenderer.h @@ -37,16 +37,16 @@ // we only expect that happens briefly when one clip is about to finish // and the next clip is about to start. // -// We allocate a SurfaceTextureClient for each RenderInput and the user can use +// We allocate a Surface for each RenderInput and the user can use // the getTargetWindow() function to get the corresponding ANativeWindow -// for that SurfaceTextureClient. The intention is that the user can pass that +// for that Surface. The intention is that the user can pass that // ANativeWindow to OMXCodec::Create() so the codec can decode directly // to buffers provided by the texture. namespace android { class GLConsumer; -class SurfaceTextureClient; +class Surface; class RenderInput; class NativeWindowRenderer { @@ -110,7 +110,7 @@ private: // destination aspect ratio. GLfloat mPositionCoordinates[8]; - // We use a different GL id for each SurfaceTextureClient. + // We use a different GL id for each Surface. GLuint mNextTextureId; // Number of existing RenderInputs, just for debugging. @@ -146,7 +146,7 @@ private: class RenderInput { public: - // Returns the ANativeWindow corresponds to the SurfaceTextureClient. + // Returns the ANativeWindow corresponds to the Surface. ANativeWindow* getTargetWindow(); // Updates video frame size from the MediaSource's metadata. Specifically @@ -156,7 +156,7 @@ public: // Renders the buffer with the given video effect and rending mode. // The video effets are defined in VideoEditorTools.h // Set isExternalBuffer to true only when the buffer given is not - // provided by the SurfaceTextureClient. + // provided by the Surface. void render(MediaBuffer *buffer, uint32_t videoEffect, M4xVSS_MediaRendering renderingMode, bool isExternalBuffer); private: @@ -165,7 +165,7 @@ private: NativeWindowRenderer* mRenderer; GLuint mTextureId; sp<GLConsumer> mST; - sp<SurfaceTextureClient> mSTC; + sp<Surface> mSTC; int mWidth, mHeight; // These are only valid during render() calls diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp index 754c5a9..2bd9f84 100755 --- a/libvideoeditor/lvpp/PreviewPlayer.cpp +++ b/libvideoeditor/lvpp/PreviewPlayer.cpp @@ -32,7 +32,7 @@ #include <media/stagefright/foundation/ADebug.h> #include <gui/Surface.h> #include <gui/IGraphicBufferProducer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include "VideoEditorPreviewController.h" #include "DummyAudioSource.h" @@ -1780,7 +1780,7 @@ void PreviewPlayer::setSurfaceTexture(const sp<IGraphicBufferProducer> &bufferPr mSurface.clear(); if (bufferProducer != NULL) { - setNativeWindow_l(new SurfaceTextureClient(bufferProducer)); + setNativeWindow_l(new Surface(bufferProducer)); } } |