diff options
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 166 |
1 files changed, 83 insertions, 83 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 2ea2af9..cd8bb33 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -214,7 +214,7 @@ void MediaPlayerService::instantiate() { MediaPlayerService::MediaPlayerService() { - LOGV("MediaPlayerService created"); + ALOGV("MediaPlayerService created"); mNextConnId = 1; mBatteryAudio.refCount = 0; @@ -229,7 +229,7 @@ MediaPlayerService::MediaPlayerService() MediaPlayerService::~MediaPlayerService() { - LOGV("MediaPlayerService destroyed"); + ALOGV("MediaPlayerService destroyed"); } sp<IMediaRecorder> MediaPlayerService::createMediaRecorder(pid_t pid) @@ -238,7 +238,7 @@ sp<IMediaRecorder> MediaPlayerService::createMediaRecorder(pid_t pid) wp<MediaRecorderClient> w = recorder; Mutex::Autolock lock(mLock); mMediaRecorderClients.add(w); - LOGV("Create new media recorder client from pid %d", pid); + ALOGV("Create new media recorder client from pid %d", pid); return recorder; } @@ -246,13 +246,13 @@ void MediaPlayerService::removeMediaRecorderClient(wp<MediaRecorderClient> clien { Mutex::Autolock lock(mLock); mMediaRecorderClients.remove(client); - LOGV("Delete media recorder client"); + ALOGV("Delete media recorder client"); } sp<IMediaMetadataRetriever> MediaPlayerService::createMetadataRetriever(pid_t pid) { sp<MetadataRetrieverClient> retriever = new MetadataRetrieverClient(pid); - LOGV("Create new media retriever from pid %d", pid); + ALOGV("Create new media retriever from pid %d", pid); return retriever; } @@ -265,7 +265,7 @@ sp<IMediaPlayer> MediaPlayerService::create(pid_t pid, const sp<IMediaPlayerClie this, pid, connId, client, audioSessionId, IPCThreadState::self()->getCallingUid()); - LOGV("Create new client(%d) from pid %d, uid %d, ", connId, pid, + ALOGV("Create new client(%d) from pid %d, uid %d, ", connId, pid, IPCThreadState::self()->getCallingUid()); wp<Client> w = c; @@ -477,7 +477,7 @@ MediaPlayerService::Client::Client( int32_t connId, const sp<IMediaPlayerClient>& client, int audioSessionId, uid_t uid) { - LOGV("Client(%d) constructor", connId); + ALOGV("Client(%d) constructor", connId); mPid = pid; mConnId = connId; mService = service; @@ -495,7 +495,7 @@ MediaPlayerService::Client::Client( MediaPlayerService::Client::~Client() { - LOGV("Client(%d) destructor pid = %d", mConnId, mPid); + ALOGV("Client(%d) destructor pid = %d", mConnId, mPid); mAudioOutput.clear(); wp<Client> client(this); disconnect(); @@ -504,7 +504,7 @@ MediaPlayerService::Client::~Client() void MediaPlayerService::Client::disconnect() { - LOGV("disconnect(%d) from pid %d", mConnId, mPid); + ALOGV("disconnect(%d) from pid %d", mConnId, mPid); // grab local reference and clear main reference to prevent future // access to object sp<MediaPlayerBase> p; @@ -611,19 +611,19 @@ static sp<MediaPlayerBase> createPlayer(player_type playerType, void* cookie, sp<MediaPlayerBase> p; switch (playerType) { case SONIVOX_PLAYER: - LOGV(" create MidiFile"); + ALOGV(" create MidiFile"); p = new MidiFile(); break; case STAGEFRIGHT_PLAYER: - LOGV(" create StagefrightPlayer"); + ALOGV(" create StagefrightPlayer"); p = new StagefrightPlayer; break; case NU_PLAYER: - LOGV(" create NuPlayer"); + ALOGV(" create NuPlayer"); p = new NuPlayerDriver; break; case TEST_PLAYER: - LOGV("Create Test Player stub"); + ALOGV("Create Test Player stub"); p = new TestPlayerStub(); break; default: @@ -648,7 +648,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::createPlayer(player_type playerT // determine if we have the right player type sp<MediaPlayerBase> p = mPlayer; if ((p != NULL) && (p->playerType() != playerType)) { - LOGV("delete player"); + ALOGV("delete player"); p.clear(); } if (p == NULL) { @@ -665,7 +665,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::createPlayer(player_type playerT status_t MediaPlayerService::Client::setDataSource( const char *url, const KeyedVector<String8, String8> *headers) { - LOGV("setDataSource(%s)", url); + ALOGV("setDataSource(%s)", url); if (url == NULL) return UNKNOWN_ERROR; @@ -693,7 +693,7 @@ status_t MediaPlayerService::Client::setDataSource( return mStatus; } else { player_type playerType = getPlayerType(url); - LOGV("player type = %d", playerType); + ALOGV("player type = %d", playerType); // create the right type of player sp<MediaPlayerBase> p = createPlayer(playerType); @@ -705,7 +705,7 @@ status_t MediaPlayerService::Client::setDataSource( } // now set data source - LOGV(" setDataSource"); + ALOGV(" setDataSource"); mStatus = p->setDataSource(url, headers); if (mStatus == NO_ERROR) { mPlayer = p; @@ -718,7 +718,7 @@ status_t MediaPlayerService::Client::setDataSource( status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64_t length) { - LOGV("setDataSource fd=%d, offset=%lld, length=%lld", fd, offset, length); + ALOGV("setDataSource fd=%d, offset=%lld, length=%lld", fd, offset, length); struct stat sb; int ret = fstat(fd, &sb); if (ret != 0) { @@ -726,11 +726,11 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 return UNKNOWN_ERROR; } - LOGV("st_dev = %llu", sb.st_dev); - LOGV("st_mode = %u", sb.st_mode); - LOGV("st_uid = %lu", sb.st_uid); - LOGV("st_gid = %lu", sb.st_gid); - LOGV("st_size = %llu", sb.st_size); + ALOGV("st_dev = %llu", sb.st_dev); + ALOGV("st_mode = %u", sb.st_mode); + ALOGV("st_uid = %lu", sb.st_uid); + ALOGV("st_gid = %lu", sb.st_gid); + ALOGV("st_size = %llu", sb.st_size); if (offset >= sb.st_size) { LOGE("offset error"); @@ -739,11 +739,11 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 } if (offset + length > sb.st_size) { length = sb.st_size - offset; - LOGV("calculated length = %lld", length); + ALOGV("calculated length = %lld", length); } player_type playerType = getPlayerType(fd, offset, length); - LOGV("player type = %d", playerType); + ALOGV("player type = %d", playerType); // create the right type of player sp<MediaPlayerBase> p = createPlayer(playerType); @@ -787,7 +787,7 @@ status_t MediaPlayerService::Client::setDataSource( status_t MediaPlayerService::Client::setVideoSurface(const sp<Surface>& surface) { - LOGV("[%d] setVideoSurface(%p)", mConnId, surface.get()); + ALOGV("[%d] setVideoSurface(%p)", mConnId, surface.get()); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->setVideoSurface(surface); @@ -796,7 +796,7 @@ status_t MediaPlayerService::Client::setVideoSurface(const sp<Surface>& surface) status_t MediaPlayerService::Client::setVideoSurfaceTexture( const sp<ISurfaceTexture>& surfaceTexture) { - LOGV("[%d] setVideoSurfaceTexture(%p)", mConnId, surfaceTexture.get()); + ALOGV("[%d] setVideoSurfaceTexture(%p)", mConnId, surfaceTexture.get()); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->setVideoSurfaceTexture(surfaceTexture); @@ -871,7 +871,7 @@ status_t MediaPlayerService::Client::getMetadata( status_t MediaPlayerService::Client::prepareAsync() { - LOGV("[%d] prepareAsync", mConnId); + ALOGV("[%d] prepareAsync", mConnId); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; status_t ret = p->prepareAsync(); @@ -884,7 +884,7 @@ status_t MediaPlayerService::Client::prepareAsync() status_t MediaPlayerService::Client::start() { - LOGV("[%d] start", mConnId); + ALOGV("[%d] start", mConnId); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; p->setLooping(mLoop); @@ -893,7 +893,7 @@ status_t MediaPlayerService::Client::start() status_t MediaPlayerService::Client::stop() { - LOGV("[%d] stop", mConnId); + ALOGV("[%d] stop", mConnId); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->stop(); @@ -901,7 +901,7 @@ status_t MediaPlayerService::Client::stop() status_t MediaPlayerService::Client::pause() { - LOGV("[%d] pause", mConnId); + ALOGV("[%d] pause", mConnId); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->pause(); @@ -913,18 +913,18 @@ status_t MediaPlayerService::Client::isPlaying(bool* state) sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; *state = p->isPlaying(); - LOGV("[%d] isPlaying: %d", mConnId, *state); + ALOGV("[%d] isPlaying: %d", mConnId, *state); return NO_ERROR; } status_t MediaPlayerService::Client::getCurrentPosition(int *msec) { - LOGV("getCurrentPosition"); + ALOGV("getCurrentPosition"); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; status_t ret = p->getCurrentPosition(msec); if (ret == NO_ERROR) { - LOGV("[%d] getCurrentPosition = %d", mConnId, *msec); + ALOGV("[%d] getCurrentPosition = %d", mConnId, *msec); } else { LOGE("getCurrentPosition returned %d", ret); } @@ -933,12 +933,12 @@ status_t MediaPlayerService::Client::getCurrentPosition(int *msec) status_t MediaPlayerService::Client::getDuration(int *msec) { - LOGV("getDuration"); + ALOGV("getDuration"); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; status_t ret = p->getDuration(msec); if (ret == NO_ERROR) { - LOGV("[%d] getDuration = %d", mConnId, *msec); + ALOGV("[%d] getDuration = %d", mConnId, *msec); } else { LOGE("getDuration returned %d", ret); } @@ -947,7 +947,7 @@ status_t MediaPlayerService::Client::getDuration(int *msec) status_t MediaPlayerService::Client::seekTo(int msec) { - LOGV("[%d] seekTo(%d)", mConnId, msec); + ALOGV("[%d] seekTo(%d)", mConnId, msec); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->seekTo(msec); @@ -955,7 +955,7 @@ status_t MediaPlayerService::Client::seekTo(int msec) status_t MediaPlayerService::Client::reset() { - LOGV("[%d] reset", mConnId); + ALOGV("[%d] reset", mConnId); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->reset(); @@ -963,7 +963,7 @@ status_t MediaPlayerService::Client::reset() status_t MediaPlayerService::Client::setAudioStreamType(int type) { - LOGV("[%d] setAudioStreamType(%d)", mConnId, type); + ALOGV("[%d] setAudioStreamType(%d)", mConnId, type); // TODO: for hardware output, call player instead Mutex::Autolock l(mLock); if (mAudioOutput != 0) mAudioOutput->setAudioStreamType(type); @@ -972,7 +972,7 @@ status_t MediaPlayerService::Client::setAudioStreamType(int type) status_t MediaPlayerService::Client::setLooping(int loop) { - LOGV("[%d] setLooping(%d)", mConnId, loop); + ALOGV("[%d] setLooping(%d)", mConnId, loop); mLoop = loop; sp<MediaPlayerBase> p = getPlayer(); if (p != 0) return p->setLooping(loop); @@ -981,7 +981,7 @@ status_t MediaPlayerService::Client::setLooping(int loop) status_t MediaPlayerService::Client::setVolume(float leftVolume, float rightVolume) { - LOGV("[%d] setVolume(%f, %f)", mConnId, leftVolume, rightVolume); + ALOGV("[%d] setVolume(%f, %f)", mConnId, leftVolume, rightVolume); // TODO: for hardware output, call player instead Mutex::Autolock l(mLock); if (mAudioOutput != 0) mAudioOutput->setVolume(leftVolume, rightVolume); @@ -990,7 +990,7 @@ status_t MediaPlayerService::Client::setVolume(float leftVolume, float rightVolu status_t MediaPlayerService::Client::setAuxEffectSendLevel(float level) { - LOGV("[%d] setAuxEffectSendLevel(%f)", mConnId, level); + ALOGV("[%d] setAuxEffectSendLevel(%f)", mConnId, level); Mutex::Autolock l(mLock); if (mAudioOutput != 0) return mAudioOutput->setAuxEffectSendLevel(level); return NO_ERROR; @@ -998,21 +998,21 @@ status_t MediaPlayerService::Client::setAuxEffectSendLevel(float level) status_t MediaPlayerService::Client::attachAuxEffect(int effectId) { - LOGV("[%d] attachAuxEffect(%d)", mConnId, effectId); + ALOGV("[%d] attachAuxEffect(%d)", mConnId, effectId); Mutex::Autolock l(mLock); if (mAudioOutput != 0) return mAudioOutput->attachAuxEffect(effectId); return NO_ERROR; } status_t MediaPlayerService::Client::setParameter(int key, const Parcel &request) { - LOGV("[%d] setParameter(%d)", mConnId, key); + ALOGV("[%d] setParameter(%d)", mConnId, key); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->setParameter(key, request); } status_t MediaPlayerService::Client::getParameter(int key, Parcel *reply) { - LOGV("[%d] getParameter(%d)", mConnId, key); + ALOGV("[%d] getParameter(%d)", mConnId, key); sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; return p->getParameter(key, reply); @@ -1035,7 +1035,7 @@ void MediaPlayerService::Client::notify( // also access mMetadataUpdated and clears it. client->addNewMetadataUpdate(metadata_type); } - LOGV("[%d] notify (%p, %d, %d, %d)", client->mConnId, cookie, msg, ext1, ext2); + ALOGV("[%d] notify (%p, %d, %d, %d)", client->mConnId, cookie, msg, ext1, ext2); client->mClient->notify(msg, ext1, ext2, obj); } @@ -1086,7 +1086,7 @@ int Antagonizer::callbackThread(void* user) Antagonizer* p = reinterpret_cast<Antagonizer*>(user); while (!p->mExit) { if (p->mActive) { - LOGV("send event"); + ALOGV("send event"); p->mCb(p->mClient, 0, 0, 0); } usleep(interval); @@ -1102,7 +1102,7 @@ static size_t kDefaultHeapSize = 1024 * 1024; // 1MB sp<IMemory> MediaPlayerService::decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) { - LOGV("decode(%s)", url); + ALOGV("decode(%s)", url); sp<MemoryBase> mem; sp<MediaPlayerBase> player; @@ -1116,7 +1116,7 @@ sp<IMemory> MediaPlayerService::decode(const char* url, uint32_t *pSampleRate, i } player_type playerType = getPlayerType(url); - LOGV("player type = %d", playerType); + ALOGV("player type = %d", playerType); // create the right type of player sp<AudioCache> cache = new AudioCache(url); @@ -1129,16 +1129,16 @@ sp<IMemory> MediaPlayerService::decode(const char* url, uint32_t *pSampleRate, i // set data source if (player->setDataSource(url) != NO_ERROR) goto Exit; - LOGV("prepare"); + ALOGV("prepare"); player->prepareAsync(); - LOGV("wait for prepare"); + ALOGV("wait for prepare"); if (cache->wait() != NO_ERROR) goto Exit; - LOGV("start"); + ALOGV("start"); player->start(); - LOGV("wait for playback complete"); + ALOGV("wait for playback complete"); cache->wait(); // in case of error, return what was successfully decoded. if (cache->size() == 0) { @@ -1149,7 +1149,7 @@ sp<IMemory> MediaPlayerService::decode(const char* url, uint32_t *pSampleRate, i *pSampleRate = cache->sampleRate(); *pNumChannels = cache->channelCount(); *pFormat = (int)cache->format(); - LOGV("return memory @ %p, sampleRate=%u, channelCount = %d, format = %d", mem->pointer(), *pSampleRate, *pNumChannels, *pFormat); + ALOGV("return memory @ %p, sampleRate=%u, channelCount = %d, format = %d", mem->pointer(), *pSampleRate, *pNumChannels, *pFormat); Exit: if (player != 0) player->reset(); @@ -1158,12 +1158,12 @@ Exit: sp<IMemory> MediaPlayerService::decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) { - LOGV("decode(%d, %lld, %lld)", fd, offset, length); + ALOGV("decode(%d, %lld, %lld)", fd, offset, length); sp<MemoryBase> mem; sp<MediaPlayerBase> player; player_type playerType = getPlayerType(fd, offset, length); - LOGV("player type = %d", playerType); + ALOGV("player type = %d", playerType); // create the right type of player sp<AudioCache> cache = new AudioCache("decode_fd"); @@ -1176,16 +1176,16 @@ sp<IMemory> MediaPlayerService::decode(int fd, int64_t offset, int64_t length, u // set data source if (player->setDataSource(fd, offset, length) != NO_ERROR) goto Exit; - LOGV("prepare"); + ALOGV("prepare"); player->prepareAsync(); - LOGV("wait for prepare"); + ALOGV("wait for prepare"); if (cache->wait() != NO_ERROR) goto Exit; - LOGV("start"); + ALOGV("start"); player->start(); - LOGV("wait for playback complete"); + ALOGV("wait for playback complete"); cache->wait(); // in case of error, return what was successfully decoded. if (cache->size() == 0) { @@ -1196,7 +1196,7 @@ sp<IMemory> MediaPlayerService::decode(int fd, int64_t offset, int64_t length, u *pSampleRate = cache->sampleRate(); *pNumChannels = cache->channelCount(); *pFormat = cache->format(); - LOGV("return memory @ %p, sampleRate=%u, channelCount = %d, format = %d", mem->pointer(), *pSampleRate, *pNumChannels, *pFormat); + ALOGV("return memory @ %p, sampleRate=%u, channelCount = %d, format = %d", mem->pointer(), *pSampleRate, *pNumChannels, *pFormat); Exit: if (player != 0) player->reset(); @@ -1211,7 +1211,7 @@ MediaPlayerService::AudioOutput::AudioOutput(int sessionId) : mCallback(NULL), mCallbackCookie(NULL), mSessionId(sessionId) { - LOGV("AudioOutput(%d)", sessionId); + ALOGV("AudioOutput(%d)", sessionId); mTrack = 0; mStreamType = AUDIO_STREAM_MUSIC; mLeftVolume = 1.0; @@ -1302,7 +1302,7 @@ status_t MediaPlayerService::AudioOutput::open( bufferCount = mMinBufferCount; } - LOGV("open(%u, %d, %d, %d, %d)", sampleRate, channelCount, format, bufferCount,mSessionId); + ALOGV("open(%u, %d, %d, %d, %d)", sampleRate, channelCount, format, bufferCount,mSessionId); if (mTrack) close(); int afSampleRate; int afFrameCount; @@ -1350,7 +1350,7 @@ status_t MediaPlayerService::AudioOutput::open( return NO_INIT; } - LOGV("setVolume"); + ALOGV("setVolume"); t->setVolume(mLeftVolume, mRightVolume); mMsecsPerFrame = 1.e3 / (float) sampleRate; @@ -1363,7 +1363,7 @@ status_t MediaPlayerService::AudioOutput::open( void MediaPlayerService::AudioOutput::start() { - LOGV("start"); + ALOGV("start"); if (mTrack) { mTrack->setVolume(mLeftVolume, mRightVolume); mTrack->setAuxEffectSendLevel(mSendLevel); @@ -1377,7 +1377,7 @@ ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size) { LOG_FATAL_IF(mCallback != NULL, "Don't call write if supplying a callback."); - //LOGV("write(%p, %u)", buffer, size); + //ALOGV("write(%p, %u)", buffer, size); if (mTrack) { ssize_t ret = mTrack->write(buffer, size); return ret; @@ -1387,32 +1387,32 @@ ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size) void MediaPlayerService::AudioOutput::stop() { - LOGV("stop"); + ALOGV("stop"); if (mTrack) mTrack->stop(); } void MediaPlayerService::AudioOutput::flush() { - LOGV("flush"); + ALOGV("flush"); if (mTrack) mTrack->flush(); } void MediaPlayerService::AudioOutput::pause() { - LOGV("pause"); + ALOGV("pause"); if (mTrack) mTrack->pause(); } void MediaPlayerService::AudioOutput::close() { - LOGV("close"); + ALOGV("close"); delete mTrack; mTrack = 0; } void MediaPlayerService::AudioOutput::setVolume(float left, float right) { - LOGV("setVolume(%f, %f)", left, right); + ALOGV("setVolume(%f, %f)", left, right); mLeftVolume = left; mRightVolume = right; if (mTrack) { @@ -1422,7 +1422,7 @@ void MediaPlayerService::AudioOutput::setVolume(float left, float right) status_t MediaPlayerService::AudioOutput::setAuxEffectSendLevel(float level) { - LOGV("setAuxEffectSendLevel(%f)", level); + ALOGV("setAuxEffectSendLevel(%f)", level); mSendLevel = level; if (mTrack) { return mTrack->setAuxEffectSendLevel(level); @@ -1432,7 +1432,7 @@ status_t MediaPlayerService::AudioOutput::setAuxEffectSendLevel(float level) status_t MediaPlayerService::AudioOutput::attachAuxEffect(int effectId) { - LOGV("attachAuxEffect(%d)", effectId); + ALOGV("attachAuxEffect(%d)", effectId); mAuxEffectId = effectId; if (mTrack) { return mTrack->attachAuxEffect(effectId); @@ -1443,7 +1443,7 @@ status_t MediaPlayerService::AudioOutput::attachAuxEffect(int effectId) // static void MediaPlayerService::AudioOutput::CallbackWrapper( int event, void *cookie, void *info) { - //LOGV("callbackwrapper"); + //ALOGV("callbackwrapper"); if (event != AudioTrack::EVENT_MORE_DATA) { return; } @@ -1565,7 +1565,7 @@ status_t MediaPlayerService::AudioCache::open( uint32_t sampleRate, int channelCount, int format, int bufferCount, AudioCallback cb, void *cookie) { - LOGV("open(%u, %d, %d, %d)", sampleRate, channelCount, format, bufferCount); + ALOGV("open(%u, %d, %d, %d)", sampleRate, channelCount, format, bufferCount); if (mHeap->getHeapID() < 0) { return NO_INIT; } @@ -1595,13 +1595,13 @@ void MediaPlayerService::AudioCache::stop() { ssize_t MediaPlayerService::AudioCache::write(const void* buffer, size_t size) { - LOGV("write(%p, %u)", buffer, size); + ALOGV("write(%p, %u)", buffer, size); if ((buffer == 0) || (size == 0)) return size; uint8_t* p = static_cast<uint8_t*>(mHeap->getBase()); if (p == NULL) return NO_INIT; p += mSize; - LOGV("memcpy(%p, %p, %u)", p, buffer, size); + ALOGV("memcpy(%p, %p, %u)", p, buffer, size); if (mSize + size > mHeap->getSize()) { LOGE("Heap size overflow! req size: %d, max size: %d", (mSize + size), mHeap->getSize()); size = mHeap->getSize() - mSize; @@ -1621,9 +1621,9 @@ status_t MediaPlayerService::AudioCache::wait() mCommandComplete = false; if (mError == NO_ERROR) { - LOGV("wait - success"); + ALOGV("wait - success"); } else { - LOGV("wait - error"); + ALOGV("wait - error"); } return mError; } @@ -1631,7 +1631,7 @@ status_t MediaPlayerService::AudioCache::wait() void MediaPlayerService::AudioCache::notify( void* cookie, int msg, int ext1, int ext2, const Parcel *obj) { - LOGV("notify(%p, %d, %d, %d)", cookie, msg, ext1, ext2); + ALOGV("notify(%p, %d, %d, %d)", cookie, msg, ext1, ext2); AudioCache* p = static_cast<AudioCache*>(cookie); // ignore buffering messages @@ -1642,13 +1642,13 @@ void MediaPlayerService::AudioCache::notify( p->mError = ext1; break; case MEDIA_PREPARED: - LOGV("prepared"); + ALOGV("prepared"); break; case MEDIA_PLAYBACK_COMPLETE: - LOGV("playback complete"); + ALOGV("playback complete"); break; default: - LOGV("ignored"); + ALOGV("ignored"); return; } |