Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63c1faa8 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Update comments"

parents 71534946 17a736c3

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ int VolumeSetVolumeLevel(EffectContext *pContext, int16_t level){ 
        pContext->pBundledContext->firstVolume = LVM_FALSE;

    }

    return 0;

}    /* end setVolumeLevel */

}    /* end VolumeSetVolumeLevel */



//----------------------------------------------------------------------------

// VolumeGetVolumeLevel()

media/libmedia/AudioTrack.cpp

+5 −4
Original line number Diff line number Diff line
@@ -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()

media/libmedia/JetPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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),

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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(

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4256,7 +4256,7 @@ void AudioFlinger::RecordThread::RecordTrack::stop() 
        RecordThread *recordThread = (RecordThread *)thread.get();

        recordThread->stop(this);

        TrackBase::reset();

        // Force overerrun condition to avoid false overrun callback until first data is

        // Force overrun condition to avoid false overrun callback until first data is

        // read from buffer

        android_atomic_or(CBLK_UNDERRUN_ON, &mCblk->flags);

    }