commit 78d9a2e77e8ee153945d93624b01f0525f979299
author Wei Jia <wjia@google.com> Mon May 04 23:14:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 04 23:14:26 2015 +0000
tree 0b050674677b1b4c6b6995ab21f4bcb1923ebc84
parent b9096dc829bd9ffd912f88853a87c972086c8796
parent ce8c218ec9db7acd86f9f8929f8bbb668151b53d

Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev

include/media/stagefright/MediaSync.h

diff --git a/include/media/stagefright/MediaSync.h b/include/media/stagefright/MediaSync.h
index a349986..d1d634d 100644
--- a/include/media/stagefright/MediaSync.h
+++ b/include/media/stagefright/MediaSync.h
@@ -75,11 +75,11 @@
 
     // Called when MediaSync is used to render video. It should be called
     // before createInputSurface().
-    status_t configureSurface(const sp<IGraphicBufferProducer> &output);
+    status_t setSurface(const sp<IGraphicBufferProducer> &output);
 
     // Called when audio track is used as media clock source. It should be
     // called before updateQueuedAudioData().
-    status_t configureAudioTrack(const sp<AudioTrack> &audioTrack);
+    status_t setAudioTrack(const sp<AudioTrack> &audioTrack);
 
     // Create a surface for client to render video frames. This is the surface
     // on which the client should render video frames. Those video frames will

media/libstagefright/MediaSync.cpp

diff --git a/media/libstagefright/MediaSync.cpp b/media/libstagefright/MediaSync.cpp
index ad4b7a3..97264fb 100644
--- a/media/libstagefright/MediaSync.cpp
+++ b/media/libstagefright/MediaSync.cpp
@@ -79,17 +79,17 @@
     }
 }
 
-status_t MediaSync::configureSurface(const sp<IGraphicBufferProducer> &output) {
+status_t MediaSync::setSurface(const sp<IGraphicBufferProducer> &output) {
     Mutex::Autolock lock(mMutex);
 
     // TODO: support suface change.
     if (mOutput != NULL) {
-        ALOGE("configureSurface: output surface has already been configured.");
+        ALOGE("setSurface: output surface has already been configured.");
         return INVALID_OPERATION;
     }
 
     if (output == NULL && mSyncSettings.mSource == AVSYNC_SOURCE_VSYNC) {
-        ALOGE("configureSurface: output surface is used as sync source and cannot be removed.");
+        ALOGE("setSurface: output surface is used as sync source and cannot be removed.");
         return INVALID_OPERATION;
     }
 
@@ -103,7 +103,7 @@
                             true /* producerControlledByApp */,
                             &queueBufferOutput);
         if (status != NO_ERROR) {
-            ALOGE("configureSurface: failed to connect (%d)", status);
+            ALOGE("setSurface: failed to connect (%d)", status);
             return status;
         }
 
@@ -114,17 +114,17 @@
 }
 
 // |audioTrack| is used only for querying information.
-status_t MediaSync::configureAudioTrack(const sp<AudioTrack> &audioTrack) {
+status_t MediaSync::setAudioTrack(const sp<AudioTrack> &audioTrack) {
     Mutex::Autolock lock(mMutex);
 
     // TODO: support audio track change.
     if (mAudioTrack != NULL) {
-        ALOGE("configureAudioTrack: audioTrack has already been configured.");
+        ALOGE("setAudioTrack: audioTrack has already been configured.");
         return INVALID_OPERATION;
     }
 
     if (audioTrack == NULL && mSyncSettings.mSource == AVSYNC_SOURCE_AUDIO) {
-        ALOGE("configureAudioTrack: audioTrack is used as sync source and cannot be removed.");
+        ALOGE("setAudioTrack: audioTrack is used as sync source and cannot be removed.");
         return INVALID_OPERATION;
     }
 
@@ -137,7 +137,7 @@
         }
         uint32_t nativeSampleRateInHz = audioTrack->getOriginalSampleRate();
         if (nativeSampleRateInHz <= 0) {
-            ALOGE("configureAudioTrack: native sample rate should be positive.");
+            ALOGE("setAudioTrack: native sample rate should be positive.");
             return BAD_VALUE;
         }
         mAudioTrack = audioTrack;