media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java - Issue 1174523002: Use Chromium's Logging instead of Android's Logging for media files

Unified Diff: media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java

Issue 1174523002: Use Chromium's Logging instead of Android's Logging for media files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« media/base/android/java/src/org/chromium/media/VideoCaptureTango.java ('K') | « media/base/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java

diff --git a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java

index 1d810677cae1de0e88164418207a9e91dd1ba334..6fea0be28b97e5f8a45bf43e4c911c50cee18dd3 100644

--- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java

+++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java

@@ -10,17 +10,17 @@ import android.media.MediaCodec.BufferInfo;

import android.media.MediaExtractor;

import android.media.MediaFormat;

import android.os.ParcelFileDescriptor;

-import android.util.Log;

import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

+import org.chromium.base.Log;

import java.io.File;

import java.nio.ByteBuffer;

@JNINamespace("media")

class WebAudioMediaCodecBridge {

- static final String LOG_TAG = "WebAudioMediaCodec";

+ static final String LOG_TAG = Log.makeTag("media.WebAudioMediaCodec");

dgn 2015/06/09 13:10:53 I think presubmit will keep complaining if the var

amogh.bihani 2015/06/10 04:44:20 Done.

// TODO(rtoy): What is the correct timeout value for reading

// from a file in memory?

static final long TIMEOUT_MICROSECONDS = 500;

@@ -85,14 +85,14 @@ class WebAudioMediaCodecBridge {

durationMicroseconds = 0;

}

- Log.d(LOG_TAG, "Initial: Tracks: " + extractor.getTrackCount() + " Format: " + format);

+ Log.d(LOG_TAG, "Initial: Tracks: %d Format: %s", extractor.getTrackCount(), format);

// Create decoder

MediaCodec codec;

try {

codec = MediaCodec.createDecoderByType(mime);

} catch (Exception e) {

- Log.w(LOG_TAG, "Failed to create MediaCodec for mime type: " + mime);

+ Log.w(LOG_TAG, "Failed to create MediaCodec for mime type: %s", mime);

encodedFD.detachFd();

return false;

}

@@ -141,7 +141,7 @@ class WebAudioMediaCodecBridge {

try {

inputBufIndex = codec.dequeueInputBuffer(TIMEOUT_MICROSECONDS);

} catch (Exception e) {

- Log.w(LOG_TAG, "dequeueInputBuffer(" + TIMEOUT_MICROSECONDS + ") failed.", e);

+ Log.w(LOG_TAG, "dequeueInputBuffer(%d) failed.", TIMEOUT_MICROSECONDS, e);

decodedSuccessfully = false;

break;

}

@@ -165,12 +165,9 @@ class WebAudioMediaCodecBridge {

presentationTimeMicroSec,

sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);

} catch (Exception e) {

- Log.w(LOG_TAG, "queueInputBuffer("

- + inputBufIndex + ", 0, "

- + sampleSize + ", "

- + presentationTimeMicroSec + ", "

- + (sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0)

- + ") failed.", e);

+ Log.w(LOG_TAG, "queueInputBuffer(%d, 0, %d, %d, %d) failed.",

+ inputBufIndex, sampleSize, presentationTimeMicroSec,

+ (sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0), e);

decodedSuccessfully = false;

break;

}

@@ -188,9 +185,7 @@ class WebAudioMediaCodecBridge {

try {

outputBufIndex = codec.dequeueOutputBuffer(info, TIMEOUT_MICROSECONDS);

} catch (Exception e) {

- Log.w(LOG_TAG, "dequeueOutputBuffer(" + info

- + ", " + TIMEOUT_MICROSECONDS

- + ") failed");

+ Log.w(LOG_TAG, "dequeueOutputBuffer(%s, %d) failed", info, TIMEOUT_MICROSECONDS);

e.printStackTrace();

decodedSuccessfully = false;

break;

@@ -204,10 +199,8 @@ class WebAudioMediaCodecBridge {

// catch any changes in format. But be sure to

// initialize it BEFORE we send any decoded audio,

// and only initialize once.

- Log.d(LOG_TAG, "Final: Rate: " + sampleRate

- + " Channels: " + inputChannelCount

- + " Mime: " + mime

- + " Duration: " + durationMicroseconds + " microsec");

+ Log.d(LOG_TAG, "Final: Rate: %d Channels: %d Mime: %s Duration: %d microsec",

+ sampleRate, inputChannelCount, mime, durationMicroseconds);

nativeInitializeDestination(nativeMediaCodecBridge,

inputChannelCount,