Merge "remove unused references to ISurface"

6 files changed, 2 insertions, 34 deletions

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index 8618221..2064004 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -757,7 +757,7 @@ status_t PreviewPlayer::play_l() {
 
 
 status_t PreviewPlayer::initRenderer_l() {
-    if (mSurface != NULL || mISurface != NULL) {
+    if (mSurface != NULL) {
         sp<MetaData> meta = mVideoSource->getFormat();
 
         int32_t format;
@@ -796,12 +796,6 @@ status_t PreviewPlayer::initRenderer_l() {
 }
 
 
-void PreviewPlayer::setISurface(const sp<ISurface> &isurface) {
-    Mutex::Autolock autoLock(mLock);
-    mISurface = isurface;
-}
-
-
 status_t PreviewPlayer::seekTo(int64_t timeUs) {
 
     if ((mExtractorFlags & MediaExtractor::CAN_SEEK) || (mIsVideoSourceJpg)) {
@@ -1539,7 +1533,7 @@ status_t PreviewPlayer::resume() {
 
     mFlags = state->mFlags & (AUTO_LOOPING | LOOPING | AT_EOS);
 
-    if (state->mLastVideoFrame && (mSurface != NULL || mISurface != NULL)) {
+    if (state->mLastVideoFrame && (mSurface != NULL)) {
         mVideoRenderer =
             PreviewLocalRenderer::initPreviewLocalRenderer(
                     true,  // previewOnly
diff --git a/libvideoeditor/lvpp/PreviewPlayer.h b/libvideoeditor/lvpp/PreviewPlayer.h
index b3a32bc..ad34d6c 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.h
+++ b/libvideoeditor/lvpp/PreviewPlayer.h
@@ -60,8 +60,6 @@ struct PreviewPlayer : public AwesomePlayer {
 
     status_t play();
 
-    void setISurface(const sp<ISurface> &isurface);
-
     status_t seekTo(int64_t timeUs);
 
     status_t getVideoDimensions(int32_t *width, int32_t *height) const;
@@ -114,8 +112,6 @@ private:
         AUTO_LOOPING        = 1024,
     };
 
-    sp<ISurface> mISurface;
-
     void cancelPlayerEvents(bool keepBufferingGoing = false);
     status_t setDataSource_l(const sp<MediaExtractor> &extractor);
     status_t setDataSource_l(
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
index fbf005f..cea1576 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
@@ -69,14 +69,6 @@ status_t VideoEditorPlayer::setDataSource(int fd, int64_t offset,
     return (!OK);

 }

 

-// needed?

-status_t VideoEditorPlayer::setVideoISurface(const sp<ISurface> &surface) {

-    LOGV("setVideoISurface");

-

-    mPlayer->setISurface(surface);

-    return OK;

-}

-

 status_t VideoEditorPlayer::setVideoSurface(const sp<Surface> &surface) {

     LOGV("setVideoSurface");

 

diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index 6c5ca24..0b8a992 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -97,8 +97,6 @@ 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();

diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
index 2e2ae22..c9da6b0 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
@@ -422,8 +422,6 @@ M4OSA_ERR VideoEditorPreviewController::setSurface(const sp<Surface> &surface) {
     Mutex::Autolock autoLock(mLock);

 

     mSurface = surface;

-    mISurface = surface->getISurface();

-    LOGV("setSurface: mISurface = %p", mISurface.get());

     return M4NO_ERROR;

 }

 

@@ -734,9 +732,6 @@ M4OSA_ERR VideoEditorPreviewController::clearSurface(
 

     Mutex::Autolock autoLock(mLock);

 

-    // Get the Isurface to be passed to renderer

-    mISurface = surface->getISurface();

-

     // Delete previous renderer instance

     if(mTarget != NULL) {

         delete mTarget;

@@ -797,8 +792,6 @@ M4OSA_ERR VideoEditorPreviewController::renderPreviewFrame(
     M4VIFI_UInt8 *pixelArray = NULL;

     Mutex::Autolock autoLock(mLock);

 

-    // Get the Isurface to be passed to renderer

-    mISurface = surface->getISurface();

     if (pCurrEditInfo != NULL) {

         pCurrEditInfo->overlaySettingsIndex = -1;

     }

@@ -953,10 +946,6 @@ M4OSA_ERR VideoEditorPreviewController::preparePlayer(
     LOGV("preparePlayer: setDataSource instance %s",

      (const char *)pController->mClipList[index]->pFile);

 

-    pController->mVePlayer[playerInstance]->setVideoISurface(

-     pController->mISurface);

-    LOGV("preparePlayer: setVideoISurface");

-

     pController->mVePlayer[playerInstance]->setVideoSurface(

      pController->mSurface);

     LOGV("preparePlayer: setVideoSurface");

diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.h b/libvideoeditor/lvpp/VideoEditorPreviewController.h
index c9d7de0..4c62ac5 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.h
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.h
@@ -93,7 +93,6 @@ public:
 private:

     sp<VideoEditorPlayer> mVePlayer[NBPLAYER_INSTANCES];

     int mCurrentPlayer; //Instance of the player currently being used

-    sp<ISurface> mISurface;

     sp<Surface>  mSurface;

     mutable Mutex mLock;

     M4OSA_Context mThreadContext;