commit 3bd45591402b94ed4481ea0ee0a9140840979c84
author James Dong <jdong@google.com> Fri Jan 20 19:28:01 2012 -0800
committer James Dong <jdong@google.com> Thu Jan 26 19:30:33 2012 -0800
tree eadf2f63beb3705f954ceedc3ec34b6b7f0147b2
parent 5ddfbe7a9c530f70582dc788c9b198d892be3950

Clean up VideoEditorGBAudioProcessing

o added #ifndef/#define in the header
o removed unused variables
o renamed some types and methods
o replaced macro with class private enum

Change-Id: I588ef062fcadcd11591a5a55b4aed771c724492f

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index 17ad482..8bb7bd8 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -154,7 +154,7 @@
 void VideoEditorAudioPlayer::resume() {
     ALOGV("resume");
 
-    veAudMixSettings audioMixSettings;
+    AudioMixSettings audioMixSettings;
 
     // Single audio player is used;
     // Pass on the audio ducking parameters
@@ -173,7 +173,7 @@
     audioMixSettings.lvPTChannelCount = mAudioMixSettings->uiNbChannels;
 
     // Call to Audio mix param setting
-    mAudioProcess->veSetAudioProcessingParams(audioMixSettings);
+    mAudioProcess->setMixParams(audioMixSettings);
 
     CHECK(mStarted);
 
@@ -337,7 +337,7 @@
 
     // Create the BG Audio handler
     mAudioProcess = new VideoEditorBGAudioProcessing();
-    veAudMixSettings audioMixSettings;
+    AudioMixSettings audioMixSettings;
 
     // Pass on the audio ducking parameters
     audioMixSettings.lvInDucking_threshold =
@@ -354,7 +354,7 @@
     audioMixSettings.lvPTChannelCount = mAudioMixSettings->uiNbChannels;
 
     // Call to Audio mix param setting
-    mAudioProcess->veSetAudioProcessingParams(audioMixSettings);
+    mAudioProcess->setMixParams(audioMixSettings);
 
     // Get the BG Audio PCM file details
     if ( mBGAudioPCMFileHandle ) {
@@ -759,7 +759,7 @@
                                     ptFrame.m_bufferSize = len;
 
                                     // Call to mix and duck
-                                    mAudioProcess->veProcessAudioMixNDuck(
+                                    mAudioProcess->mixAndDuck(
                                          &ptFrame, &bgFrame, &mixFrame);
 
                                         // Overwrite the decoded buffer