Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bug 4903178 Restore priority and cgroup on stop"

Browse Source
This commit is contained in:
Glenn Kasten
2011-11-16 15:11:20 -08:00
committed by Android (Google) Code Review
parent 9a8f2b1057 99d544332a
commit 3cce14e8ff
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/media/AudioRecord.h
View File

@@ -385,6 +385,8 @@ private:
uint32_t mChannelMask;
audio_io_handle_t mInput;
int mSessionId;
int mPreviousPriority; // before start()
int mPreviousSchedulingGroup;
};
}; // namespace android

2
include/media/AudioTrack.h
View File

@@ -487,6 +487,8 @@ private:
int mAuxEffectId;
Mutex mLock;
status_t mRestoreStatus;
int mPreviousPriority; // before start()
int mPreviousSchedulingGroup;
};

15
media/libmedia/AudioRecord.cpp
View File

@@ -80,7 +80,8 @@ status_t AudioRecord::getMinFrameCount(
// ---------------------------------------------------------------------------
AudioRecord::AudioRecord()
: mStatus(NO_INIT), mSessionId(0)
: mStatus(NO_INIT), mSessionId(0),
mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)
{
}
@@ -95,7 +96,8 @@ AudioRecord::AudioRecord(
void* user,
int notificationFrames,
int sessionId)
: mStatus(NO_INIT), mSessionId(0)
: mStatus(NO_INIT), mSessionId(0),
mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)
{
mStatus = set(inputSource, sampleRate, format, channelMask,
frameCount, flags, cbf, user, notificationFrames, sessionId);
@@ -326,9 +328,11 @@ status_t AudioRecord::start()
cblk->bufferTimeoutMs = MAX_RUN_TIMEOUT_MS;
cblk->waitTimeMs = 0;
if (t != 0) {
t->run("ClientRecordThread", ANDROID_PRIORITY_AUDIO);
t->run("ClientRecordThread", ANDROID_PRIORITY_AUDIO);
} else {
setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);
mPreviousPriority = getpriority(PRIO_PROCESS, 0);
mPreviousSchedulingGroup = androidGetThreadSchedulingGroup(0);
androidSetThreadPriority(0, ANDROID_PRIORITY_AUDIO);
}
} else {
mActive = 0;
@@ -363,7 +367,8 @@ status_t AudioRecord::stop()
if (t != 0) {
t->requestExit();
} else {
setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL);
setpriority(PRIO_PROCESS, 0, mPreviousPriority);
androidSetThreadSchedulingGroup(0, mPreviousSchedulingGroup);
}
}

21
media/libmedia/AudioTrack.cpp
View File

@@ -79,7 +79,8 @@ status_t AudioTrack::getMinFrameCount(
// ---------------------------------------------------------------------------
AudioTrack::AudioTrack()
: mStatus(NO_INIT)
: mStatus(NO_INIT),
mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)
{
}
@@ -94,7 +95,8 @@ AudioTrack::AudioTrack(
void* user,
int notificationFrames,
int sessionId)
: mStatus(NO_INIT)
: mStatus(NO_INIT),
mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)
{
mStatus = set(streamType, sampleRate, format, channelMask,
frameCount, flags, cbf, user, notificationFrames,
@@ -112,7 +114,8 @@ AudioTrack::AudioTrack(
void* user,
int notificationFrames,
int sessionId)
: mStatus(NO_INIT)
: mStatus(NO_INIT),
mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)
{
mStatus = set(streamType, sampleRate, format, channelMask,
0, flags, cbf, user, notificationFrames,
@@ -346,9 +349,11 @@ void AudioTrack::start()
cblk->waitTimeMs = 0;
android_atomic_and(~CBLK_DISABLED_ON, &cblk->flags);
if (t != 0) {
t->run("AudioTrackThread", ANDROID_PRIORITY_AUDIO);
t->run("AudioTrackThread", ANDROID_PRIORITY_AUDIO);
} else {
setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);
mPreviousPriority = getpriority(PRIO_PROCESS, 0);
mPreviousSchedulingGroup = androidGetThreadSchedulingGroup(0);
androidSetThreadPriority(0, ANDROID_PRIORITY_AUDIO);
}
ALOGV("start %p before lock cblk %p", this, mCblk);
@@ -370,7 +375,8 @@ void AudioTrack::start()
if (t != 0) {
t->requestExit();
} else {
setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL);
setpriority(PRIO_PROCESS, 0, mPreviousPriority);
androidSetThreadSchedulingGroup(0, mPreviousSchedulingGroup);
}
}
}
@@ -408,7 +414,8 @@ void AudioTrack::stop()
if (t != 0) {
t->requestExit();
} else {
setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL);
setpriority(PRIO_PROCESS, 0, mPreviousPriority);
androidSetThreadSchedulingGroup(0, mPreviousSchedulingGroup);
}
}