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

Side by Side Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 166273009: PpapiDecryptor: Call NewKeyCB on OnSessionReady(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 5 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 uint32 last_session_id_; 126 uint32 last_session_id_;
127 std::string next_heartbeat_message_; 127 std::string next_heartbeat_message_;
128 128
129 // TODO(xhwang): Extract testing code from main implementation. 129 // TODO(xhwang): Extract testing code from main implementation.
130 // See http://crbug.com/341751 130 // See http://crbug.com/341751
131 uint32 session_id_for_emulated_loadsession_; 131 uint32 session_id_for_emulated_loadsession_;
132 132
133 // Timer delay in milliseconds for the next host_->SetTimer() call. 133 // Timer delay in milliseconds for the next host_->SetTimer() call.
134 int64 timer_delay_ms_; 134 int64 timer_delay_ms_;
135 135
136 // Indicates whether a timer has been set to prevent multiple timers from 136 // Indicates whether a heartbeat timer has been set to prevent multiple timers
137 // running. 137 // from running.
138 bool timer_set_; 138 bool heartbeat_timer_set_;
139 139
140 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) 140 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
141 int channel_count_; 141 int channel_count_;
142 int bits_per_channel_; 142 int bits_per_channel_;
143 int samples_per_second_; 143 int samples_per_second_;
144 int64 output_timestamp_base_in_microseconds_; 144 int64 output_timestamp_base_in_microseconds_;
145 int total_samples_generated_; 145 int total_samples_generated_;
146 #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER 146 #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
147 147
148 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) 148 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
149 scoped_ptr<FFmpegCdmAudioDecoder> audio_decoder_; 149 scoped_ptr<FFmpegCdmAudioDecoder> audio_decoder_;
150 #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER 150 #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
151 151
152 scoped_ptr<CdmVideoDecoder> video_decoder_; 152 scoped_ptr<CdmVideoDecoder> video_decoder_;
153 153
154 scoped_ptr<FileIOTestRunner> file_io_test_runner_; 154 scoped_ptr<FileIOTestRunner> file_io_test_runner_;
155 155
156 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); 156 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
157 }; 157 };
158 158
159 } // namespace media 159 } // namespace media
160 160
161 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 161 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698