diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-03 11:25:54 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-03 11:25:54 -0800 |
commit | 8908d616cc9d74f9fe2c17f1d8d9335ee28c290d (patch) | |
tree | d7fddd5e7e3467626f0eddbbf1fdc0a9f283844f /media/libmediaplayerservice | |
parent | c297fccffc4ab1cb3b9f5c6a5b0802be057f3e0f (diff) | |
parent | 1d711f67ffb3ea73aca155537e0f21b444251158 (diff) | |
download | frameworks_av-8908d616cc9d74f9fe2c17f1d8d9335ee28c290d.zip frameworks_av-8908d616cc9d74f9fe2c17f1d8d9335ee28c290d.tar.gz frameworks_av-8908d616cc9d74f9fe2c17f1d8d9335ee28c290d.tar.bz2 |
Merge change Ib904c2a4 into eclair-mr2
* changes:
Remove old hack A/V sync hack that is no longer needed.
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 3 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index b81684b..a4e3601 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -202,7 +202,6 @@ extmap FILE_EXTS [] = { }; // TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround -/* static */ const uint32_t MediaPlayerService::AudioOutput::kAudioVideoDelayMs = 0; /* static */ int MediaPlayerService::AudioOutput::mMinBufferCount = 4; /* static */ bool MediaPlayerService::AudioOutput::mIsOnEmulator = false; @@ -1485,7 +1484,7 @@ status_t MediaPlayerService::AudioOutput::open( LOGV("setVolume"); t->setVolume(mLeftVolume, mRightVolume); mMsecsPerFrame = 1.e3 / (float) sampleRate; - mLatency = t->latency() + kAudioVideoDelayMs; + mLatency = t->latency(); mTrack = t; return NO_ERROR; } diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index b00f5b7..1c90cf9 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -108,8 +108,6 @@ class MediaPlayerService : public BnMediaPlayerService float mMsecsPerFrame; uint32_t mLatency; - // TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround - static const uint32_t kAudioVideoDelayMs; static bool mIsOnEmulator; static int mMinBufferCount; // 12 for emulator; otherwise 4 |