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

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

Issue 16684003: Use a direct include of strings headers in ipc/, jingle/, media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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.cc ('k') | media/base/audio_bus_unittest.cc » ('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 #include "media/base/android/media_codec_bridge.h" 5 #include "media/base/android/media_codec_bridge.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_array.h" 11 #include "base/android/jni_array.h"
12 #include "base/android/jni_string.h" 12 #include "base/android/jni_string.h"
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/lazy_instance.h" 14 #include "base/lazy_instance.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/safe_numerics.h" 16 #include "base/safe_numerics.h"
17 #include "base/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "jni/MediaCodecBridge_jni.h" 18 #include "jni/MediaCodecBridge_jni.h"
19 #include "media/base/bit_reader.h" 19 #include "media/base/bit_reader.h"
20 20
21 using base::android::AttachCurrentThread; 21 using base::android::AttachCurrentThread;
22 using base::android::ConvertUTF8ToJavaString; 22 using base::android::ConvertUTF8ToJavaString;
23 using base::android::ScopedJavaLocalRef; 23 using base::android::ScopedJavaLocalRef;
24 24
25 namespace media { 25 namespace media {
26 26
27 enum { kBufferFlagEndOfStream = 4 }; 27 enum { kBufferFlagEndOfStream = 4 };
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 const char* mime = VideoCodecToMimeType(codec); 351 const char* mime = VideoCodecToMimeType(codec);
352 return mime ? new VideoCodecBridge(mime) : NULL; 352 return mime ? new VideoCodecBridge(mime) : NULL;
353 } 353 }
354 354
355 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) { 355 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
356 return RegisterNativesImpl(env); 356 return RegisterNativesImpl(env);
357 } 357 }
358 358
359 } // namespace media 359 } // namespace media
360 360
OLDNEW
« no previous file with comments | « media/audio/win/core_audio_util_win.cc ('k') | media/base/audio_bus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698