From cece4b32d340f0ca514160647b9883e3777bc376 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Mon, 1 Aug 2011 16:34:05 +0800
Subject: Remove unused mLastVideoBuffer and bAppliedVideoEffect.

Change-Id: I29511aaa714494a1a6caa4ed95bbc26370b37246
---
 libvideoeditor/lvpp/PreviewPlayer.cpp | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'libvideoeditor/lvpp/PreviewPlayer.cpp')

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index 0f04c0a..78ca1cd 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -81,7 +81,6 @@ PreviewPlayer::PreviewPlayer()
       mFrameYUVBuffer(NULL){
 
     mVideoRenderer = NULL;
-    mLastVideoBuffer = NULL;
     mEffectsSettings = NULL;
     mVeAudioPlayer = NULL;
     mAudioMixStoryBoardTS = 0;
@@ -304,11 +303,6 @@ void PreviewPlayer::reset_l() {
     //delete mAudioPlayer;
     mAudioPlayer = NULL;
 
-    if (mLastVideoBuffer) {
-        mLastVideoBuffer->release();
-        mLastVideoBuffer = NULL;
-    }
-
     if (mVideoBuffer) {
         mVideoBuffer->release();
         mVideoBuffer = NULL;
@@ -795,7 +789,6 @@ status_t PreviewPlayer::initVideoDecoder(uint32_t flags) {
 
 void PreviewPlayer::onVideoEvent() {
     uint32_t i=0;
-    bool bAppliedVideoEffect = false;
     M4OSA_ERR err1 = M4NO_ERROR;
     int64_t imageFrameTimeUs = 0;
 
@@ -816,11 +809,6 @@ void PreviewPlayer::onVideoEvent() {
     int64_t timeStartUs = ts_st->getRealTimeUs();
 
     if (mSeeking != NO_SEEK) {
-        if (mLastVideoBuffer) {
-            mLastVideoBuffer->release();
-            mLastVideoBuffer = NULL;
-        }
-
 
         if(mAudioSource != NULL) {
 
@@ -1016,11 +1004,7 @@ void PreviewPlayer::onVideoEvent() {
 
     // If timestamp exceeds endCutTime of clip, donot render
     if((timeUs/1000) > mPlayEndTimeMsec) {
-        if (mLastVideoBuffer) {
-            mLastVideoBuffer->release();
-            mLastVideoBuffer = NULL;
-        }
-        mLastVideoBuffer = mVideoBuffer;
+        mVideoBuffer->release();
         mVideoBuffer = NULL;
         mFlags |= VIDEO_AT_EOS;
         mFlags |= AUDIO_AT_EOS;
@@ -1102,14 +1086,9 @@ void PreviewPlayer::onVideoEvent() {
         err1 = doVideoPostProcessing();
         if(err1 != M4NO_ERROR) {
             LOGE("doVideoPostProcessing returned err");
-            bAppliedVideoEffect = false;
-        }
-        else {
-            bAppliedVideoEffect = true;
         }
     }
     else {
-        bAppliedVideoEffect = false;
         if(mRenderingMode != MEDIA_RENDERING_INVALID) {
             // No effects to be applied, but media rendering to be done
             err1 = doMediaRendering();
@@ -1126,12 +1105,7 @@ void PreviewPlayer::onVideoEvent() {
         mVideoRenderer->renderYV12();
     }
 
-    if (mLastVideoBuffer) {
-        mLastVideoBuffer->release();
-        mLastVideoBuffer = NULL;
-    }
-
-    mLastVideoBuffer = mVideoBuffer;
+    mVideoBuffer->release();
     mVideoBuffer = NULL;
 
     // Post progress callback based on callback interval set
-- 
cgit v1.1