| OLD | NEW |
| 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/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "media/base/decryptor.h" | 10 #include "media/base/decryptor.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 // The buffer returned by the demuxer that needs decrypting/decoding. | 148 // The buffer returned by the demuxer that needs decrypting/decoding. |
| 149 scoped_refptr<media::DecoderBuffer> pending_buffer_to_decode_; | 149 scoped_refptr<media::DecoderBuffer> pending_buffer_to_decode_; |
| 150 | 150 |
| 151 // Indicates the situation where new key is added during pending decode | 151 // Indicates the situation where new key is added during pending decode |
| 152 // (in other words, this variable can only be set in state kPendingDecode). | 152 // (in other words, this variable can only be set in state kPendingDecode). |
| 153 // If this variable is true and kNoKey is returned then we need to try | 153 // If this variable is true and kNoKey is returned then we need to try |
| 154 // decrypting/decoding again in case the newly added key is the correct | 154 // decrypting/decoding again in case the newly added key is the correct |
| 155 // decryption key. | 155 // decryption key. |
| 156 bool key_added_while_pending_decode_; | 156 bool key_added_while_pending_decode_; |
| 157 | 157 |
| 158 // A unique ID to trace Decryptor::DecryptAndDecodeVideo() call and the |
| 159 // matching DecryptCB call (in DoDeliverFrame()). |
| 160 uint32 trace_id_; |
| 161 |
| 158 DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder); | 162 DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder); |
| 159 }; | 163 }; |
| 160 | 164 |
| 161 } // namespace media | 165 } // namespace media |
| 162 | 166 |
| 163 #endif // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 167 #endif // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ |
| OLD | NEW |