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

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

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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/base/android/demuxer_stream_player_params.h ('k') | media/base/pipeline.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/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/geometry/size.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 struct SubsampleEntry; 19 struct SubsampleEntry;
20 20
21 // These must be in sync with MediaCodecBridge.MEDIA_CODEC_XXX constants in 21 // These must be in sync with MediaCodecBridge.MEDIA_CODEC_XXX constants in
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,
(...skipping 261 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/demuxer_stream_player_params.h ('k') | media/base/pipeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698