| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.media; | 5 package org.chromium.media; |
| 6 | 6 |
| 7 import android.media.AudioFormat; | 7 import android.media.AudioFormat; |
| 8 import android.media.AudioManager; | 8 import android.media.AudioManager; |
| 9 import android.media.AudioTrack; | 9 import android.media.AudioTrack; |
| 10 import android.media.MediaCodec; | 10 import android.media.MediaCodec; |
| 11 import android.media.MediaCodecInfo; | 11 import android.media.MediaCodecInfo; |
| 12 import android.media.MediaCodecList; | 12 import android.media.MediaCodecList; |
| 13 import android.media.MediaCrypto; | 13 import android.media.MediaCrypto; |
| 14 import android.media.MediaFormat; | 14 import android.media.MediaFormat; |
| 15 import android.os.Build; | 15 import android.os.Build; |
| 16 import android.os.Bundle; | 16 import android.os.Bundle; |
| 17 import android.util.Log; | 17 import android.util.Log; |
| 18 import android.view.Surface; | 18 import android.view.Surface; |
| 19 | 19 |
| 20 import java.io.IOException; | |
| 21 import java.nio.ByteBuffer; | |
| 22 import java.util.ArrayList; | |
| 23 import java.util.Collection; | |
| 24 import java.util.HashMap; | |
| 25 import java.util.Map; | |
| 26 | |
| 27 import org.chromium.base.CalledByNative; | 20 import org.chromium.base.CalledByNative; |
| 28 import org.chromium.base.JNINamespace; | 21 import org.chromium.base.JNINamespace; |
| 29 | 22 |
| 23 import java.nio.ByteBuffer; |
| 24 import java.util.ArrayList; |
| 25 import java.util.HashMap; |
| 26 import java.util.Map; |
| 27 |
| 30 /** | 28 /** |
| 31 * A wrapper of the MediaCodec class to facilitate exception capturing and | 29 * A wrapper of the MediaCodec class to facilitate exception capturing and |
| 32 * audio rendering. | 30 * audio rendering. |
| 33 */ | 31 */ |
| 34 @JNINamespace("media") | 32 @JNINamespace("media") |
| 35 class MediaCodecBridge { | 33 class MediaCodecBridge { |
| 36 private static final String TAG = "MediaCodecBridge"; | 34 private static final String TAG = "MediaCodecBridge"; |
| 37 | 35 |
| 38 // Error code for MediaCodecBridge. Keep this value in sync with | 36 // Error code for MediaCodecBridge. Keep this value in sync with |
| 39 // MediaCodecStatus in media_codec_bridge.h. | 37 // MediaCodecStatus in media_codec_bridge.h. |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 } | 534 } |
| 537 | 535 |
| 538 private void resetLastPresentationTimeIfNeeded(long presentationTimeUs) { | 536 private void resetLastPresentationTimeIfNeeded(long presentationTimeUs) { |
| 539 if (mFlushed) { | 537 if (mFlushed) { |
| 540 mLastPresentationTimeUs = | 538 mLastPresentationTimeUs = |
| 541 Math.max(presentationTimeUs - MAX_PRESENTATION_TIMESTAMP_SHI
FT_US, 0); | 539 Math.max(presentationTimeUs - MAX_PRESENTATION_TIMESTAMP_SHI
FT_US, 0); |
| 542 mFlushed = false; | 540 mFlushed = false; |
| 543 } | 541 } |
| 544 } | 542 } |
| 545 } | 543 } |
| OLD | NEW |