summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-02-14 11:56:16 -0800
committerGlenn Kasten <gkasten@google.com>2011-02-24 12:42:04 -0800
commit4aeec63e25e1d1f55d55245d1c0ffd554f2a2f49 (patch)
treeadb699436b69de6a97e132e343a771a460d3825f
parentd67e9da63323d965760337913f86de28024531a4 (diff)
downloadframeworks_av-4aeec63e25e1d1f55d55245d1c0ffd554f2a2f49.zip
frameworks_av-4aeec63e25e1d1f55d55245d1c0ffd554f2a2f49.tar.gz
frameworks_av-4aeec63e25e1d1f55d55245d1c0ffd554f2a2f49.tar.bz2
Bug 3438258 surface textures
This is sufficient to build, but is not a full implementation. See bug 3467199 for the real implementation. Change-Id: Ifc3325fa9b019669bffddfd7bfd10bce57d0a136
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorPlayer.cpp8
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorPlayer.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
index 3e1743e..fe99472 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
@@ -69,6 +69,7 @@ status_t VideoEditorPlayer::setDataSource(int fd, int64_t offset,
return (!OK);
}
+// needed?
status_t VideoEditorPlayer::setVideoISurface(const sp<ISurface> &surface) {
LOGV("setVideoISurface");
@@ -83,6 +84,13 @@ status_t VideoEditorPlayer::setVideoSurface(const sp<Surface> &surface) {
return OK;
}
+status_t VideoEditorPlayer::setVideoSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture) {
+ LOGV("setVideoSurfaceTexture");
+
+ mPlayer->setSurfaceTexture(surfaceTexture);
+ return OK;
+}
+
status_t VideoEditorPlayer::prepare() {
LOGV("prepare");
return mPlayer->prepare();
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index da00ca5..1febef4 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -97,8 +97,10 @@ public:
const char *url, const KeyedVector<String8, String8> *headers);
virtual status_t setDataSource(int fd, int64_t offset, int64_t length);
+ // needed?
virtual status_t setVideoISurface(const sp<ISurface> &surface);
virtual status_t setVideoSurface(const sp<Surface> &surface);
+ virtual status_t setVideoSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture);
virtual status_t prepare();
virtual status_t prepareAsync();
virtual status_t start();