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

Merge change Ib904c2a4 into eclair-mr2

Browse Source 
* changes:
  Remove old hack A/V sync hack that is no longer needed.
This commit is contained in:
Android (Google) Code Review
2009-12-03 11:25:54 -08:00
parent 44000eb2a2 b904c2a452
commit 7c09a0ff36
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libmediaplayerservice/MediaPlayerService.cpp
View File

@@ -202,7 +202,6 @@ extmap FILE_EXTS [] = {
}; };
// TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround // 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 */ int MediaPlayerService::AudioOutput::mMinBufferCount = 4;
/* static */ bool MediaPlayerService::AudioOutput::mIsOnEmulator = false; /* static */ bool MediaPlayerService::AudioOutput::mIsOnEmulator = false;
@@ -1485,7 +1484,7 @@ status_t MediaPlayerService::AudioOutput::open(
LOGV("setVolume"); LOGV("setVolume");
t->setVolume(mLeftVolume, mRightVolume); t->setVolume(mLeftVolume, mRightVolume);
mMsecsPerFrame = 1.e3 / (float) sampleRate; mMsecsPerFrame = 1.e3 / (float) sampleRate;
mLatency = t->latency() + kAudioVideoDelayMs; mLatency = t->latency();
mTrack = t; mTrack = t;
return NO_ERROR; return NO_ERROR;
} }

2
media/libmediaplayerservice/MediaPlayerService.h
View File

@@ -108,8 +108,6 @@ class MediaPlayerService : public BnMediaPlayerService
float mMsecsPerFrame; float mMsecsPerFrame;
uint32_t mLatency; 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 bool mIsOnEmulator;
static int mMinBufferCount; // 12 for emulator; otherwise 4 static int mMinBufferCount; // 12 for emulator; otherwise 4