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

Side by Side Diff: media/filters/decrypting_video_decoder.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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 "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "media/base/cdm_context.h" 10 #include "media/base/cdm_context.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 // Indicates the situation where new key is added during pending decode 108 // Indicates the situation where new key is added during pending decode
109 // (in other words, this variable can only be set in state kPendingDecode). 109 // (in other words, this variable can only be set in state kPendingDecode).
110 // If this variable is true and kNoKey is returned then we need to try 110 // If this variable is true and kNoKey is returned then we need to try
111 // decrypting/decoding again in case the newly added key is the correct 111 // decrypting/decoding again in case the newly added key is the correct
112 // decryption key. 112 // decryption key.
113 bool key_added_while_decode_pending_; 113 bool key_added_while_decode_pending_;
114 114
115 // A unique ID to trace Decryptor::DecryptAndDecodeVideo() call and the 115 // A unique ID to trace Decryptor::DecryptAndDecodeVideo() call and the
116 // matching DecryptCB call (in DoDeliverFrame()). 116 // matching DecryptCB call (in DoDeliverFrame()).
117 uint32 trace_id_; 117 uint32_t trace_id_;
118 118
119 base::WeakPtr<DecryptingVideoDecoder> weak_this_; 119 base::WeakPtr<DecryptingVideoDecoder> weak_this_;
120 base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_; 120 base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder); 122 DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder);
123 }; 123 };
124 124
125 } // namespace media 125 } // namespace media
126 126
127 #endif // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ 127 #endif // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698