Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1199)

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

Issue 1123823002: Remove ICS support from Chromium code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
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 c86ebcb190e9feb68141153c53b640398ce7c2c5..2d3b9e493bd4a7a71191dc960aef49a32dc64cd2 100644
--- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
@@ -4,13 +4,11 @@
package org.chromium.media;
-import android.annotation.TargetApi;
import android.content.Context;
import android.media.MediaCodec;
import android.media.MediaCodec.BufferInfo;
import android.media.MediaExtractor;
import android.media.MediaFormat;
-import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.util.Log;
@@ -21,7 +19,6 @@ import java.io.File;
import java.nio.ByteBuffer;
@JNINamespace("media")
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
class WebAudioMediaCodecBridge {
static final String LOG_TAG = "WebAudioMediaCodec";
// TODO(rtoy): What is the correct timeout value for reading
@@ -36,13 +33,10 @@ class WebAudioMediaCodecBridge {
@SuppressWarnings("deprecation")
@CalledByNative
- private static boolean decodeAudioFile(Context ctx,
- long nativeMediaCodecBridge,
- int inputFD,
- long dataSize) {
+ private static boolean decodeAudioFile(Context ctx, long nativeMediaCodecBridge,
+ int inputFD, long dataSize) {
- if (dataSize < 0 || dataSize > 0x7fffffff)
- return false;
+ if (dataSize < 0 || dataSize > 0x7fffffff) return false;
MediaExtractor extractor = new MediaExtractor();

Powered by Google App Engine
This is Rietveld 408576698