From 1d711f67ffb3ea73aca155537e0f21b444251158 Mon Sep 17 00:00:00 2001 From: Dave Sparks Date: Thu, 3 Dec 2009 10:13:32 -0800 Subject: Remove old hack A/V sync hack that is no longer needed. --- media/libmediaplayerservice/MediaPlayerService.cpp | 3 +-- media/libmediaplayerservice/MediaPlayerService.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'media/libmediaplayerservice') 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 -- cgit v1.1