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

Side by Side Diff: media/base/android/media_codec_bridge.h

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
OLDNEW
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 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 11 matching lines...) Expand all
22 // MediaCodecBridge.java. 22 // MediaCodecBridge.java.
23 enum MediaCodecStatus { 23 enum MediaCodecStatus {
24 MEDIA_CODEC_OK, 24 MEDIA_CODEC_OK,
25 MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER, 25 MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER,
26 MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER, 26 MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER,
27 MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED, 27 MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED,
28 MEDIA_CODEC_OUTPUT_FORMAT_CHANGED, 28 MEDIA_CODEC_OUTPUT_FORMAT_CHANGED,
29 MEDIA_CODEC_INPUT_END_OF_STREAM, 29 MEDIA_CODEC_INPUT_END_OF_STREAM,
30 MEDIA_CODEC_OUTPUT_END_OF_STREAM, 30 MEDIA_CODEC_OUTPUT_END_OF_STREAM,
31 MEDIA_CODEC_NO_KEY, 31 MEDIA_CODEC_NO_KEY,
32 MEDIA_CODEC_STOPPED, 32 MEDIA_CODEC_ABORT,
33 MEDIA_CODEC_ERROR 33 MEDIA_CODEC_ERROR
34 }; 34 };
35 35
36 // Codec direction. Keep this in sync with MediaCodecBridge.java. 36 // Codec direction. Keep this in sync with MediaCodecBridge.java.
37 enum MediaCodecDirection { 37 enum MediaCodecDirection {
38 MEDIA_CODEC_DECODER, 38 MEDIA_CODEC_DECODER,
39 MEDIA_CODEC_ENCODER, 39 MEDIA_CODEC_ENCODER,
40 }; 40 };
41 41
42 // This class serves as a bridge for native code to call java functions inside 42 // This class serves as a bridge for native code to call java functions inside
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 VideoCodecBridge(const std::string& mime, 287 VideoCodecBridge(const std::string& mime,
288 bool is_secure, 288 bool is_secure,
289 MediaCodecDirection direction); 289 MediaCodecDirection direction);
290 290
291 int adaptive_playback_supported_for_testing_; 291 int adaptive_playback_supported_for_testing_;
292 }; 292 };
293 293
294 } // namespace media 294 } // namespace media
295 295
296 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ 296 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaCodecBridge.java ('k') | media/base/android/media_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698