diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-12-03 16:34:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 16:34:07 -0800 |
| commit | c9ffa992276a1aadb6a99a62417f5222daa03c2e (patch) | |
| tree | c061a4f653756e284c150e4cf7ba20e1f0c968af | |
| parent | baeb6dddd1b848320457b9af8c5eb415b43f181a (diff) | |
| parent | 8908d616cc9d74f9fe2c17f1d8d9335ee28c290d (diff) | |
| download | frameworks_av-c9ffa992276a1aadb6a99a62417f5222daa03c2e.zip frameworks_av-c9ffa992276a1aadb6a99a62417f5222daa03c2e.tar.gz frameworks_av-c9ffa992276a1aadb6a99a62417f5222daa03c2e.tar.bz2 | |
am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp
* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.
| -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 |