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

Commit 429e88ca authored by Kevin Rocard's avatar Kevin Rocard Committed by android-build-merger
Browse files

Audio V4: Propagate audio attributes to tracks am: 1f564acc 

am: b084bdf9

Change-Id: I91a5f492ede951283eb8fb4efddd5870aeaf96e5
parents 4d0ccdca b084bdf9

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -753,8 +753,8 @@ sp<IAudioTrack> AudioFlinger::createTrack(const CreateTrackInput& input, 
        output.notificationFrameCount = input.notificationFrameCount;

        output.flags = input.flags;



        track = thread->createTrack_l(client, streamType, &output.sampleRate, input.config.format,

                                      input.config.channel_mask,

        track = thread->createTrack_l(client, streamType, input.attr, &output.sampleRate,

                                      input.config.format, input.config.channel_mask,

                                      &output.frameCount, &output.notificationFrameCount,

                                      input.notificationsPerBuffer, input.speed,

                                      input.sharedBuffer, sessionId, &output.flags,
@@ -1673,7 +1673,7 @@ sp<media::IAudioRecord> AudioFlinger::createRecord(const CreateRecordInput& inpu 
        output.frameCount = input.frameCount;

        output.notificationFrameCount = input.notificationFrameCount;



        recordTrack = thread->createRecordTrack_l(client, &output.sampleRate,

        recordTrack = thread->createRecordTrack_l(client, input.attr, &output.sampleRate,

                                                  input.config.format, input.config.channel_mask,

                                                  &output.frameCount, sessionId,

                                                  &output.notificationFrameCount,

services/audioflinger/MmapTracks.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
class MmapTrack : public TrackBase {

public:

                MmapTrack(ThreadBase *thread,

                            const audio_attributes_t& attr,

                            uint32_t sampleRate,

                            audio_format_t format,

                            audio_channel_mask_t channelMask,

services/audioflinger/PlaybackTracks.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ public: 
                        Track(  PlaybackThread *thread,

                                const sp<Client>& client,

                                audio_stream_type_t streamType,

                                const audio_attributes_t& attr,

                                uint32_t sampleRate,

                                audio_format_t format,

                                audio_channel_mask_t channelMask,

services/audioflinger/RecordTracks.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ class RecordTrack : public TrackBase { 
public:

                        RecordTrack(RecordThread *thread,

                                const sp<Client>& client,

                                const audio_attributes_t& attr,

                                uint32_t sampleRate,

                                audio_format_t format,

                                audio_channel_mask_t channelMask,

services/audioflinger/Threads.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1847,6 +1847,7 @@ void AudioFlinger::PlaybackThread::preExit() 
sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrack_l(

        const sp<AudioFlinger::Client>& client,

        audio_stream_type_t streamType,

        const audio_attributes_t& attr,

        uint32_t *pSampleRate,

        audio_format_t format,

        audio_channel_mask_t channelMask,
@@ -2125,7 +2126,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
            }

        }



        track = new Track(this, client, streamType, sampleRate, format,

        track = new Track(this, client, streamType, attr, sampleRate, format,

                          channelMask, frameCount,

                          nullptr /* buffer */, (size_t)0 /* bufferSize */, sharedBuffer,

                          sessionId, uid, *flags, TrackBase::TYPE_DEFAULT, portId);
@@ -6808,6 +6809,7 @@ void AudioFlinger::RecordThread::inputStandBy() 
// RecordThread::createRecordTrack_l() must be called with AudioFlinger::mLock held

sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRecordTrack_l(

        const sp<AudioFlinger::Client>& client,

        const audio_attributes_t& attr,

        uint32_t *pSampleRate,

        audio_format_t format,

        audio_channel_mask_t channelMask,
@@ -6941,7 +6943,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe 
    { // scope for mLock

        Mutex::Autolock _l(mLock);



        track = new RecordTrack(this, client, sampleRate,

        track = new RecordTrack(this, client, attr, sampleRate,

                      format, channelMask, frameCount,

                      nullptr /* buffer */, (size_t)0 /* bufferSize */, sessionId, uid,

                      *flags, TrackBase::TYPE_DEFAULT, portId);
@@ -7960,7 +7962,8 @@ status_t AudioFlinger::MmapThread::start(const AudioClient& client, 
        return PERMISSION_DENIED;

    }



    sp<MmapTrack> track = new MmapTrack(this, mSampleRate, mFormat, mChannelMask, mSessionId,

    // Given that MmapThread::mAttr is mutable, should a MmapTrack have attributes ?

    sp<MmapTrack> track = new MmapTrack(this, mAttr, mSampleRate, mFormat, mChannelMask, mSessionId,

                                        client.clientUid, client.clientPid, portId);



    mActiveTracks.add(track);