diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-14 08:52:15 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-19 14:12:01 -0700 |
| commit | 17a736c3e1d062d7fc916329eb32aef8935614af (patch) | |
| tree | 7fb73e48de8641ce6ad7b65fb4204bc60cd3e5f0 /media | |
| parent | 1746929ddc7592ab397c402724a61352e45df093 (diff) | |
| download | frameworks_av-17a736c3e1d062d7fc916329eb32aef8935614af.zip frameworks_av-17a736c3e1d062d7fc916329eb32aef8935614af.tar.gz frameworks_av-17a736c3e1d062d7fc916329eb32aef8935614af.tar.bz2 | |
Update comments
Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
Diffstat (limited to 'media')
| -rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 9 | ||||
| -rw-r--r-- | media/libmedia/JetPlayer.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index ca93ce5..40dffd4 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -1493,7 +1493,7 @@ int VolumeSetVolumeLevel(EffectContext *pContext, int16_t level){ pContext->pBundledContext->firstVolume = LVM_FALSE; } return 0; -} /* end setVolumeLevel */ +} /* end VolumeSetVolumeLevel */ //---------------------------------------------------------------------------- // VolumeGetVolumeLevel() diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 048be1d..60143c6 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -104,9 +104,10 @@ AudioTrack::AudioTrack( { mStatus = set(streamType, sampleRate, format, channelMask, frameCount, flags, cbf, user, notificationFrames, - 0, false, sessionId); + 0 /*sharedBuffer*/, false /*threadCanCallJava*/, sessionId); } +// DEPRECATED AudioTrack::AudioTrack( int streamType, uint32_t sampleRate, @@ -124,7 +125,7 @@ AudioTrack::AudioTrack( { mStatus = set((audio_stream_type_t)streamType, sampleRate, (audio_format_t)format, channelMask, frameCount, (audio_policy_output_flags_t)flags, cbf, user, notificationFrames, - 0, false, sessionId); + 0 /*sharedBuffer*/, false /*threadCanCallJava*/, sessionId); } AudioTrack::AudioTrack( @@ -144,8 +145,8 @@ AudioTrack::AudioTrack( mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT) { mStatus = set(streamType, sampleRate, format, channelMask, - 0, flags, cbf, user, notificationFrames, - sharedBuffer, false, sessionId); + 0 /*frameCount*/, flags, cbf, user, notificationFrames, + sharedBuffer, false /*threadCanCallJava*/, sessionId); } AudioTrack::~AudioTrack() diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index f1f62f7..7fa6bb7 100644 --- a/media/libmedia/JetPlayer.cpp +++ b/media/libmedia/JetPlayer.cpp @@ -89,7 +89,7 @@ int JetPlayer::init() // create the output AudioTrack mAudioTrack = new AudioTrack(); - mAudioTrack->set(AUDIO_STREAM_MUSIC, //TODO parametrize this + mAudioTrack->set(AUDIO_STREAM_MUSIC, //TODO parameterize this pLibConfig->sampleRate, AUDIO_FORMAT_PCM_16_BIT, audio_channel_out_mask_from_count(pLibConfig->numChannels), diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8f62ee4..148018d 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1571,7 +1571,7 @@ status_t MediaPlayerService::AudioOutput::open( AUDIO_POLICY_OUTPUT_FLAG_NONE, CallbackWrapper, mCallbackData, - 0, + 0, // notification frames mSessionId); } else { t = new AudioTrack( |