diff options
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index cc3138d..7c3fb0d 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -294,13 +294,7 @@ sp<IOMX> MediaPlayerService::getOMX() { } sp<ICrypto> MediaPlayerService::makeCrypto() { - Mutex::Autolock autoLock(mLock); - - if (mCrypto == NULL) { - mCrypto = new Crypto; - } - - return mCrypto; + return new Crypto; } status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& args) const @@ -1417,6 +1411,7 @@ MediaPlayerService::AudioOutput::AudioOutput(int sessionId) : mCallback(NULL), mCallbackCookie(NULL), mCallbackData(NULL), + mBytesWritten(0), mSessionId(sessionId) { ALOGV("AudioOutput(%d)", sessionId); mTrack = 0; @@ -1495,12 +1490,19 @@ float MediaPlayerService::AudioOutput::msecsPerFrame() const return mMsecsPerFrame; } -status_t MediaPlayerService::AudioOutput::getPosition(uint32_t *position) +status_t MediaPlayerService::AudioOutput::getPosition(uint32_t *position) const { if (mTrack == 0) return NO_INIT; return mTrack->getPosition(position); } +status_t MediaPlayerService::AudioOutput::getFramesWritten(uint32_t *frameswritten) const +{ + if (mTrack == 0) return NO_INIT; + *frameswritten = mBytesWritten / frameSize(); + return OK; +} + status_t MediaPlayerService::AudioOutput::open( uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask, audio_format_t format, int bufferCount, @@ -1656,6 +1658,7 @@ void MediaPlayerService::AudioOutput::switchToNextOutput() { mTrack = NULL; mNextOutput->mSampleRateHz = mSampleRateHz; mNextOutput->mMsecsPerFrame = mMsecsPerFrame; + mNextOutput->mBytesWritten = mBytesWritten; } } @@ -1666,6 +1669,7 @@ ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size) //ALOGV("write(%p, %u)", buffer, size); if (mTrack) { ssize_t ret = mTrack->write(buffer, size); + mBytesWritten += ret; return ret; } return NO_INIT; @@ -1777,7 +1781,7 @@ void MediaPlayerService::AudioOutput::CallbackWrapper( data->unlock(); } -int MediaPlayerService::AudioOutput::getSessionId() +int MediaPlayerService::AudioOutput::getSessionId() const { return mSessionId; } @@ -1802,13 +1806,20 @@ float MediaPlayerService::AudioCache::msecsPerFrame() const return mMsecsPerFrame; } -status_t MediaPlayerService::AudioCache::getPosition(uint32_t *position) +status_t MediaPlayerService::AudioCache::getPosition(uint32_t *position) const { if (position == 0) return BAD_VALUE; *position = mSize; return NO_ERROR; } +status_t MediaPlayerService::AudioCache::getFramesWritten(uint32_t *written) const +{ + if (written == 0) return BAD_VALUE; + *written = mSize; + return NO_ERROR; +} + //////////////////////////////////////////////////////////////////////////////// struct CallbackThread : public Thread { @@ -1971,7 +1982,7 @@ void MediaPlayerService::AudioCache::notify( p->mSignal.signal(); } -int MediaPlayerService::AudioCache::getSessionId() +int MediaPlayerService::AudioCache::getSessionId() const { return 0; } |