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

Side by Side Diff: media/filters/decrypting_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 5 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_FILTERS_DECRYPTING_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_
7 7
8 #include <stdint.h>
9
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
11 #include "media/base/cdm_context.h" 13 #include "media/base/cdm_context.h"
12 #include "media/base/decryptor.h" 14 #include "media/base/decryptor.h"
13 #include "media/base/video_decoder.h" 15 #include "media/base/video_decoder.h"
14 #include "media/base/video_decoder_config.h" 16 #include "media/base/video_decoder_config.h"
15 17
16 namespace base { 18 namespace base {
17 class SingleThreadTaskRunner; 19 class SingleThreadTaskRunner;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 121
120 base::WeakPtr<DecryptingVideoDecoder> weak_this_; 122 base::WeakPtr<DecryptingVideoDecoder> weak_this_;
121 base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_; 123 base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_;
122 124
123 DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder); 125 DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder);
124 }; 126 };
125 127
126 } // namespace media 128 } // namespace media
127 129
128 #endif // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ 130 #endif // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/decrypting_demuxer_stream_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698