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

Side by Side Diff: media/base/android/media_codec_video_decoder.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/media_codec_util.cc ('k') | media/base/android/media_decoder_job.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_VIDEO_DECODER_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
7 7
8 #include <stddef.h>
9
8 #include <set> 10 #include <set>
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "media/base/android/media_codec_decoder.h" 12 #include "media/base/android/media_codec_decoder.h"
11 #include "ui/gfx/geometry/size.h" 13 #include "ui/gfx/geometry/size.h"
12 #include "ui/gl/android/scoped_java_surface.h" 14 #include "ui/gl/android/scoped_java_surface.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 // Video decoder for MediaCodecPlayer 18 // Video decoder for MediaCodecPlayer
17 class MediaCodecVideoDecoder : public MediaCodecDecoder { 19 class MediaCodecVideoDecoder : public MediaCodecDecoder {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 121
120 // Mantain the last seen PTS for stand-alone EOS. 122 // Mantain the last seen PTS for stand-alone EOS.
121 base::TimeDelta last_seen_pts_; 123 base::TimeDelta last_seen_pts_;
122 124
123 DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder); 125 DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder);
124 }; 126 };
125 127
126 } // namespace media 128 } // namespace media
127 129
128 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_ 130 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/base/android/media_codec_util.cc ('k') | media/base/android/media_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698