summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
diff options
context:
space:
mode:
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp50
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp10
2 files changed, 30 insertions, 30 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 2a5c0a6..7191175 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -159,7 +159,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
switch (msg->what()) {
case kWhatSetDataSource:
{
- LOGV("kWhatSetDataSource");
+ ALOGV("kWhatSetDataSource");
CHECK(mSource == NULL);
@@ -172,7 +172,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
case kWhatSetVideoNativeWindow:
{
- LOGV("kWhatSetVideoNativeWindow");
+ ALOGV("kWhatSetVideoNativeWindow");
sp<RefBase> obj;
CHECK(msg->findObject("native-window", &obj));
@@ -183,7 +183,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
case kWhatSetAudioSink:
{
- LOGV("kWhatSetAudioSink");
+ ALOGV("kWhatSetAudioSink");
sp<RefBase> obj;
CHECK(msg->findObject("sink", &obj));
@@ -194,7 +194,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
case kWhatStart:
{
- LOGV("kWhatStart");
+ ALOGV("kWhatStart");
mVideoIsAVC = false;
mAudioEOS = false;
@@ -228,7 +228,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
mScanSourcesPending = false;
- LOGV("scanning sources haveAudio=%d, haveVideo=%d",
+ ALOGV("scanning sources haveAudio=%d, haveVideo=%d",
mAudioDecoder != NULL, mVideoDecoder != NULL);
instantiateDecoder(false, &mVideoDecoder);
@@ -284,9 +284,9 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
CHECK(codecRequest->findInt32("err", &err));
if (err == ERROR_END_OF_STREAM) {
- LOGV("got %s decoder EOS", audio ? "audio" : "video");
+ ALOGV("got %s decoder EOS", audio ? "audio" : "video");
} else {
- LOGV("got %s decoder EOS w/ error %d",
+ ALOGV("got %s decoder EOS w/ error %d",
audio ? "audio" : "video",
err);
}
@@ -305,10 +305,10 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
mVideoLateByUs = 0;
}
- LOGV("decoder %s flush completed", audio ? "audio" : "video");
+ ALOGV("decoder %s flush completed", audio ? "audio" : "video");
if (needShutdown) {
- LOGV("initiating %s decoder shutdown",
+ ALOGV("initiating %s decoder shutdown",
audio ? "audio" : "video");
(audio ? mAudioDecoder : mVideoDecoder)->initiateShutdown();
@@ -329,7 +329,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
int32_t sampleRate;
CHECK(codecRequest->findInt32("sample-rate", &sampleRate));
- LOGV("Audio output format changed to %d Hz, %d channels",
+ ALOGV("Audio output format changed to %d Hz, %d channels",
sampleRate, numChannels);
mAudioSink->close();
@@ -354,7 +354,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
"crop",
&cropLeft, &cropTop, &cropRight, &cropBottom));
- LOGV("Video output format changed to %d x %d "
+ ALOGV("Video output format changed to %d x %d "
"(crop: %d x %d @ (%d, %d))",
width, height,
(cropRight - cropLeft + 1),
@@ -367,7 +367,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
cropBottom - cropTop + 1);
}
} else if (what == ACodec::kWhatShutdownCompleted) {
- LOGV("%s shutdown completed", audio ? "audio" : "video");
+ ALOGV("%s shutdown completed", audio ? "audio" : "video");
if (audio) {
mAudioDecoder.clear();
@@ -414,7 +414,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
}
if (finalResult == ERROR_END_OF_STREAM) {
- LOGV("reached %s EOS", audio ? "audio" : "video");
+ ALOGV("reached %s EOS", audio ? "audio" : "video");
} else {
LOGE("%s track encountered an error (%d)",
audio ? "audio" : "video", finalResult);
@@ -448,7 +448,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
int32_t audio;
CHECK(msg->findInt32("audio", &audio));
- LOGV("renderer %s flush completed.", audio ? "audio" : "video");
+ ALOGV("renderer %s flush completed.", audio ? "audio" : "video");
}
break;
}
@@ -460,13 +460,13 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
case kWhatReset:
{
- LOGV("kWhatReset");
+ ALOGV("kWhatReset");
if (mFlushingAudio != NONE || mFlushingVideo != NONE) {
// We're currently flushing, postpone the reset until that's
// completed.
- LOGV("postponing reset");
+ ALOGV("postponing reset");
mResetPostponed = true;
break;
@@ -494,7 +494,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
int64_t seekTimeUs;
CHECK(msg->findInt64("seekTimeUs", &seekTimeUs));
- LOGV("kWhatSeek seekTimeUs=%lld us (%.2f secs)",
+ ALOGV("kWhatSeek seekTimeUs=%lld us (%.2f secs)",
seekTimeUs, seekTimeUs / 1E6);
mSource->seekTo(seekTimeUs);
@@ -538,7 +538,7 @@ void NuPlayer::finishFlushIfPossible() {
return;
}
- LOGV("both audio and video are flushed now.");
+ ALOGV("both audio and video are flushed now.");
mRenderer->signalTimeDiscontinuity();
@@ -554,7 +554,7 @@ void NuPlayer::finishFlushIfPossible() {
mFlushingVideo = NONE;
if (mResetInProgress) {
- LOGV("reset completed");
+ ALOGV("reset completed");
mResetInProgress = false;
finishReset();
@@ -665,7 +665,7 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) {
bool formatChange =
type == ATSParser::DISCONTINUITY_FORMATCHANGE;
- LOGV("%s discontinuity (formatChange=%d)",
+ ALOGV("%s discontinuity (formatChange=%d)",
audio ? "audio" : "video", formatChange);
if (audio) {
@@ -715,12 +715,12 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) {
}
} while (dropAccessUnit);
- // LOGV("returned a valid buffer of %s data", audio ? "audio" : "video");
+ // ALOGV("returned a valid buffer of %s data", audio ? "audio" : "video");
#if 0
int64_t mediaTimeUs;
CHECK(accessUnit->meta()->findInt64("timeUs", &mediaTimeUs));
- LOGV("feeding %s input buffer at media time %.2f secs",
+ ALOGV("feeding %s input buffer at media time %.2f secs",
audio ? "audio" : "video",
mediaTimeUs / 1E6);
#endif
@@ -732,7 +732,7 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) {
}
void NuPlayer::renderBuffer(bool audio, const sp<AMessage> &msg) {
- // LOGV("renderBuffer %s", audio ? "audio" : "video");
+ // ALOGV("renderBuffer %s", audio ? "audio" : "video");
sp<AMessage> reply;
CHECK(msg->findMessage("reply", &reply));
@@ -743,7 +743,7 @@ void NuPlayer::renderBuffer(bool audio, const sp<AMessage> &msg) {
// so we don't want any output buffers it sent us (from before
// we initiated the flush) to be stuck in the renderer's queue.
- LOGV("we're still flushing the %s decoder, sending its output buffer"
+ ALOGV("we're still flushing the %s decoder, sending its output buffer"
" right back.", audio ? "audio" : "video");
reply->post();
@@ -765,7 +765,7 @@ void NuPlayer::renderBuffer(bool audio, const sp<AMessage> &msg) {
CHECK(buffer->meta()->findInt64("timeUs", &mediaTimeUs));
if (mediaTimeUs < skipUntilMediaTimeUs) {
- LOGV("dropping %s buffer at time %lld as requested.",
+ ALOGV("dropping %s buffer at time %lld as requested.",
audio ? "audio" : "video",
mediaTimeUs);
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index bf19040..4995846 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -230,7 +230,7 @@ bool NuPlayer::Renderer::onDrainAudioQueue() {
if (numFramesAvailableToWrite == mAudioSink->frameCount()) {
LOGI("audio sink underrun");
} else {
- LOGV("audio queue has %d frames left to play",
+ ALOGV("audio queue has %d frames left to play",
mAudioSink->frameCount() - numFramesAvailableToWrite);
}
#endif
@@ -255,7 +255,7 @@ bool NuPlayer::Renderer::onDrainAudioQueue() {
int64_t mediaTimeUs;
CHECK(entry->mBuffer->meta()->findInt64("timeUs", &mediaTimeUs));
- LOGV("rendering audio at media time %.2f secs", mediaTimeUs / 1E6);
+ ALOGV("rendering audio at media time %.2f secs", mediaTimeUs / 1E6);
mAnchorTimeMediaUs = mediaTimeUs;
@@ -376,9 +376,9 @@ void NuPlayer::Renderer::onDrainVideoQueue() {
bool tooLate = (mVideoLateByUs > 40000);
if (tooLate) {
- LOGV("video late by %lld us (%.2f secs)", lateByUs, lateByUs / 1E6);
+ ALOGV("video late by %lld us (%.2f secs)", lateByUs, lateByUs / 1E6);
} else {
- LOGV("rendering video at media time %.2f secs", mediaTimeUs / 1E6);
+ ALOGV("rendering video at media time %.2f secs", mediaTimeUs / 1E6);
}
entry->mNotifyConsumed->setInt32("render", true);
@@ -454,7 +454,7 @@ void NuPlayer::Renderer::onQueueBuffer(const sp<AMessage> &msg) {
int64_t diff = firstVideoTimeUs - firstAudioTimeUs;
- LOGV("queueDiff = %.2f secs", diff / 1E6);
+ ALOGV("queueDiff = %.2f secs", diff / 1E6);
if (diff > 100000ll) {
// Audio data starts More than 0.1 secs before video.
generated by cgit v1.1 at 2024-07-31 13:45:13 +0000