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

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

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « media/audio/win/waveout_output_win.cc ('k') | media/base/android/media_decoder_job.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>
8 #include <string>
9 7
10 #include "base/android/build_info.h" 8 #include "base/android/build_info.h"
11 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
12 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
13 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
14 #include "base/basictypes.h" 12 #include "base/basictypes.h"
15 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
16 #include "base/logging.h" 14 #include "base/logging.h"
17 #include "base/numerics/safe_conversions.h" 15 #include "base/numerics/safe_conversions.h"
18 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 JNIEnv* env = AttachCurrentThread(); 837 JNIEnv* env = AttachCurrentThread();
840 return Java_MediaCodecBridge_isAdaptivePlaybackSupported( 838 return Java_MediaCodecBridge_isAdaptivePlaybackSupported(
841 env, media_codec(), width, height); 839 env, media_codec(), width, height);
842 } 840 }
843 841
844 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) { 842 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
845 return RegisterNativesImpl(env); 843 return RegisterNativesImpl(env);
846 } 844 }
847 845
848 } // namespace media 846 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/win/waveout_output_win.cc ('k') | media/base/android/media_decoder_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698