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

Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1

Browse Source
This commit is contained in:
Eric Laurent
2012-03-16 14:58:21 -07:00
committed by Android (Google) Code Review
parent 3fe7ee651d dc63f3fe40
commit 2a0d685ed6
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libmediaplayerservice/MediaPlayerService.cpp
View File

@@ -320,7 +320,7 @@ status_t MediaPlayerService::AudioOutput::dump(int fd, const Vector<String16>& a
mStreamType, mLeftVolume, mRightVolume); mStreamType, mLeftVolume, mRightVolume);
result.append(buffer); result.append(buffer);
snprintf(buffer, 255, " msec per frame(%f), latency (%d)\n", snprintf(buffer, 255, " msec per frame(%f), latency (%d)\n",
mMsecsPerFrame, mLatency); mMsecsPerFrame, (mTrack != 0) ? mTrack->latency() : -1);
result.append(buffer); result.append(buffer);
snprintf(buffer, 255, " aux effect id(%d), send level (%f)\n", snprintf(buffer, 255, " aux effect id(%d), send level (%f)\n",
mAuxEffectId, mSendLevel); mAuxEffectId, mSendLevel);
@@ -1265,7 +1265,6 @@ MediaPlayerService::AudioOutput::AudioOutput(int sessionId)
mStreamType = AUDIO_STREAM_MUSIC; mStreamType = AUDIO_STREAM_MUSIC;
mLeftVolume = 1.0; mLeftVolume = 1.0;
mRightVolume = 1.0; mRightVolume = 1.0;
mLatency = 0;
mMsecsPerFrame = 0; mMsecsPerFrame = 0;
mAuxEffectId = 0; mAuxEffectId = 0;
mSendLevel = 0.0; mSendLevel = 0.0;
@@ -1324,7 +1323,8 @@ ssize_t MediaPlayerService::AudioOutput::frameSize() const
uint32_t MediaPlayerService::AudioOutput::latency () const uint32_t MediaPlayerService::AudioOutput::latency () const
{ {
return mLatency; if (mTrack == 0) return 0;
return mTrack->latency();
} }
float MediaPlayerService::AudioOutput::msecsPerFrame() const float MediaPlayerService::AudioOutput::msecsPerFrame() const
@@ -1403,7 +1403,6 @@ status_t MediaPlayerService::AudioOutput::open(
t->setVolume(mLeftVolume, mRightVolume); t->setVolume(mLeftVolume, mRightVolume);
mMsecsPerFrame = 1.e3 / (float) sampleRate; mMsecsPerFrame = 1.e3 / (float) sampleRate;
mLatency = t->latency();
mTrack = t; mTrack = t;
t->setAuxEffectSendLevel(mSendLevel); t->setAuxEffectSendLevel(mSendLevel);

1
media/libmediaplayerservice/MediaPlayerService.h
View File

@@ -112,7 +112,6 @@ class MediaPlayerService : public BnMediaPlayerService
float mLeftVolume; float mLeftVolume;
float mRightVolume; float mRightVolume;
float mMsecsPerFrame; float mMsecsPerFrame;
uint32_t mLatency;
int mSessionId; int mSessionId;
float mSendLevel; float mSendLevel;
int mAuxEffectId; int mAuxEffectId;

6
media/libstagefright/AudioPlayer.cpp
View File

@@ -408,6 +408,12 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {
break; break;
} }
if (mAudioSink != NULL) {
mLatencyUs = (int64_t)mAudioSink->latency() * 1000;
} else {
mLatencyUs = (int64_t)mAudioTrack->latency() * 1000;
}
CHECK(mInputBuffer->meta_data()->findInt64( CHECK(mInputBuffer->meta_data()->findInt64(
kKeyTime, &mPositionTimeMediaUs)); kKeyTime, &mPositionTimeMediaUs));