diff options
author | Wei Jia <wjia@google.com> | 2015-05-04 15:48:01 -0700 |
---|---|---|
committer | Wei Jia <wjia@google.com> | 2015-05-04 15:48:01 -0700 |
commit | ce8c218ec9db7acd86f9f8929f8bbb668151b53d (patch) | |
tree | d5ed67b731218db60fcdf2820b423c4fa611b7a9 | |
parent | 32fa6d0e65dbf956e253a1006e9419dce2fe75c9 (diff) | |
download | frameworks_av-ce8c218ec9db7acd86f9f8929f8bbb668151b53d.zip frameworks_av-ce8c218ec9db7acd86f9f8929f8bbb668151b53d.tar.gz frameworks_av-ce8c218ec9db7acd86f9f8929f8bbb668151b53d.tar.bz2 |
MediaSync: clean up configureAudioTrack and configureSurface.
Bug: 19666434
Change-Id: I579956aad4a6d591b5338d518e610b8532a72402
-rw-r--r-- | include/media/stagefright/MediaSync.h | 4 | ||||
-rw-r--r-- | media/libstagefright/MediaSync.cpp | 16 |
2 files changed, 10 insertions, 10 deletions
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 @@ public: // 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 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 @@ MediaSync::~MediaSync() { } } -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 @@ status_t MediaSync::configureSurface(const sp<IGraphicBufferProducer> &output) { 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 @@ status_t MediaSync::configureSurface(const sp<IGraphicBufferProducer> &output) { } // |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 @@ status_t MediaSync::configureAudioTrack(const sp<AudioTrack> &audioTrack) { } 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; |