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

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

Issue 18052007: Use a direct include of time headers in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/audio/win/core_audio_util_win.h ('k') | media/base/android/media_player_android.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 (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
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/time.h" 12 #include "base/time/time.h"
13 #include "media/base/audio_decoder_config.h" 13 #include "media/base/audio_decoder_config.h"
14 #include "media/base/video_decoder_config.h" 14 #include "media/base/video_decoder_config.h"
15 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 // This class serves as a bridge for native code to call java functions inside 19 // This class serves as a bridge for native code to call java functions inside
20 // Android MediaCodec class. For more information on Android MediaCodec, check 20 // Android MediaCodec class. For more information on Android MediaCodec, check
21 // http://developer.android.com/reference/android/media/MediaCodec.html 21 // http://developer.android.com/reference/android/media/MediaCodec.html
22 // Note: MediaCodec is only available on JB and greater. 22 // Note: MediaCodec is only available on JB and greater.
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 jobject media_crypto); 139 jobject media_crypto);
140 140
141 private: 141 private:
142 explicit VideoCodecBridge(const char* mime); 142 explicit VideoCodecBridge(const char* mime);
143 }; 143 };
144 144
145 } // namespace media 145 } // namespace media
146 146
147 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ 147 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
148 148
OLDNEW
« no previous file with comments | « media/audio/win/core_audio_util_win.h ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698