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

Side by Side Diff: media/base/android/java/src/org/chromium/media/MediaCodecBridge.java

Issue 753213003: Adding a new enum "MEDIA_CODEC_ABORT" for aborted cases (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments Created 6 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/base/android/media_codec_bridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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;
(...skipping 25 matching lines...) Expand all
36 // Error code for MediaCodecBridge. Keep this value in sync with 36 // Error code for MediaCodecBridge. Keep this value in sync with
37 // MediaCodecStatus in media_codec_bridge.h. 37 // MediaCodecStatus in media_codec_bridge.h.
38 private static final int MEDIA_CODEC_OK = 0; 38 private static final int MEDIA_CODEC_OK = 0;
39 private static final int MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER = 1; 39 private static final int MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER = 1;
40 private static final int MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER = 2; 40 private static final int MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER = 2;
41 private static final int MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED = 3; 41 private static final int MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED = 3;
42 private static final int MEDIA_CODEC_OUTPUT_FORMAT_CHANGED = 4; 42 private static final int MEDIA_CODEC_OUTPUT_FORMAT_CHANGED = 4;
43 private static final int MEDIA_CODEC_INPUT_END_OF_STREAM = 5; 43 private static final int MEDIA_CODEC_INPUT_END_OF_STREAM = 5;
44 private static final int MEDIA_CODEC_OUTPUT_END_OF_STREAM = 6; 44 private static final int MEDIA_CODEC_OUTPUT_END_OF_STREAM = 6;
45 private static final int MEDIA_CODEC_NO_KEY = 7; 45 private static final int MEDIA_CODEC_NO_KEY = 7;
46 private static final int MEDIA_CODEC_STOPPED = 8; 46 private static final int MEDIA_CODEC_ABORT = 8;
47 private static final int MEDIA_CODEC_ERROR = 9; 47 private static final int MEDIA_CODEC_ERROR = 9;
48 48
49 // Codec direction. Keep this in sync with media_codec_bridge.h. 49 // Codec direction. Keep this in sync with media_codec_bridge.h.
50 private static final int MEDIA_CODEC_DECODER = 0; 50 private static final int MEDIA_CODEC_DECODER = 0;
51 private static final int MEDIA_CODEC_ENCODER = 1; 51 private static final int MEDIA_CODEC_ENCODER = 1;
52 52
53 // Max adaptive playback size to be supplied to the decoder. 53 // Max adaptive playback size to be supplied to the decoder.
54 private static final int MAX_ADAPTIVE_PLAYBACK_WIDTH = 1920; 54 private static final int MAX_ADAPTIVE_PLAYBACK_WIDTH = 1920;
55 private static final int MAX_ADAPTIVE_PLAYBACK_HEIGHT = 1080; 55 private static final int MAX_ADAPTIVE_PLAYBACK_HEIGHT = 1080;
56 56
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 return AudioFormat.CHANNEL_OUT_QUAD; 744 return AudioFormat.CHANNEL_OUT_QUAD;
745 case 6: 745 case 6:
746 return AudioFormat.CHANNEL_OUT_5POINT1; 746 return AudioFormat.CHANNEL_OUT_5POINT1;
747 case 8: 747 case 8:
748 return AudioFormat.CHANNEL_OUT_7POINT1; 748 return AudioFormat.CHANNEL_OUT_7POINT1;
749 default: 749 default:
750 return AudioFormat.CHANNEL_OUT_DEFAULT; 750 return AudioFormat.CHANNEL_OUT_DEFAULT;
751 } 751 }
752 } 752 }
753 } 753 }
OLDNEW
« no previous file with comments | « no previous file | media/base/android/media_codec_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698