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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/audio_decoder_job.h ('k') | media/base/android/media_client_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_DEMUXER_STREAM_PLAYER_PARAMS_H_ 5 #ifndef MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_
6 #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ 6 #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_
7 7
8 #include <stdint.h>
9
8 #include <vector> 10 #include <vector>
9 11
10 #include "media/base/audio_decoder_config.h" 12 #include "media/base/audio_decoder_config.h"
11 #include "media/base/decrypt_config.h" 13 #include "media/base/decrypt_config.h"
12 #include "media/base/demuxer_stream.h" 14 #include "media/base/demuxer_stream.h"
13 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
14 #include "media/base/video_decoder_config.h" 16 #include "media/base/video_decoder_config.h"
15 #include "ui/gfx/geometry/size.h" 17 #include "ui/gfx/geometry/size.h"
16 18
17 namespace media { 19 namespace media {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 MEDIA_EXPORT 73 MEDIA_EXPORT
72 std::ostream& operator<<(std::ostream& os, media::DemuxerStream::Type type); 74 std::ostream& operator<<(std::ostream& os, media::DemuxerStream::Type type);
73 75
74 MEDIA_EXPORT 76 MEDIA_EXPORT
75 std::ostream& operator<<(std::ostream& os, const media::AccessUnit& au); 77 std::ostream& operator<<(std::ostream& os, const media::AccessUnit& au);
76 78
77 MEDIA_EXPORT 79 MEDIA_EXPORT
78 std::ostream& operator<<(std::ostream& os, const media::DemuxerConfigs& conf); 80 std::ostream& operator<<(std::ostream& os, const media::DemuxerConfigs& conf);
79 81
80 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ 82 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_
OLDNEW
« no previous file with comments | « media/base/android/audio_decoder_job.h ('k') | media/base/android/media_client_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698