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

Side by Side Diff: media/filters/decrypting_audio_decoder.cc

Issue 23014009: media: Opus support for WebM in Media Source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments. using base::TimeDelta for relevant fields. Created 7 years, 3 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
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 #include "media/filters/decrypting_audio_decoder.h" 5 #include "media/filters/decrypting_audio_decoder.h"
6 6
7 #include <cstdlib> 7 #include <cstdlib>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 const AudioDecoderConfig& input_config = 184 const AudioDecoderConfig& input_config =
185 demuxer_stream_->audio_decoder_config(); 185 demuxer_stream_->audio_decoder_config();
186 AudioDecoderConfig config; 186 AudioDecoderConfig config;
187 config.Initialize(input_config.codec(), 187 config.Initialize(input_config.codec(),
188 kSampleFormatS16, 188 kSampleFormatS16,
189 input_config.channel_layout(), 189 input_config.channel_layout(),
190 input_config.samples_per_second(), 190 input_config.samples_per_second(),
191 input_config.extra_data(), 191 input_config.extra_data(),
192 input_config.extra_data_size(), 192 input_config.extra_data_size(),
193 input_config.is_encrypted(), 193 input_config.is_encrypted(),
194 false); 194 false,
195 base::TimeDelta(),
196 base::TimeDelta());
195 197
196 state_ = kPendingDecoderInit; 198 state_ = kPendingDecoderInit;
197 decryptor_->InitializeAudioDecoder( 199 decryptor_->InitializeAudioDecoder(
198 config, 200 config,
199 BindToCurrentLoop(base::Bind( 201 BindToCurrentLoop(base::Bind(
200 &DecryptingAudioDecoder::FinishInitialization, weak_this_))); 202 &DecryptingAudioDecoder::FinishInitialization, weak_this_)));
201 } 203 }
202 204
203 void DecryptingAudioDecoder::FinishInitialization(bool success) { 205 void DecryptingAudioDecoder::FinishInitialization(bool success) {
204 DVLOG(2) << "FinishInitialization()"; 206 DVLOG(2) << "FinishInitialization()";
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 const AudioDecoderConfig& input_config = 277 const AudioDecoderConfig& input_config =
276 demuxer_stream_->audio_decoder_config(); 278 demuxer_stream_->audio_decoder_config();
277 AudioDecoderConfig config; 279 AudioDecoderConfig config;
278 config.Initialize(input_config.codec(), 280 config.Initialize(input_config.codec(),
279 kSampleFormatS16, 281 kSampleFormatS16,
280 input_config.channel_layout(), 282 input_config.channel_layout(),
281 input_config.samples_per_second(), 283 input_config.samples_per_second(),
282 input_config.extra_data(), 284 input_config.extra_data(),
283 input_config.extra_data_size(), 285 input_config.extra_data_size(),
284 input_config.is_encrypted(), 286 input_config.is_encrypted(),
285 false); 287 false,
288 base::TimeDelta(),
289 base::TimeDelta());
286 290
287 state_ = kPendingConfigChange; 291 state_ = kPendingConfigChange;
288 decryptor_->DeinitializeDecoder(Decryptor::kAudio); 292 decryptor_->DeinitializeDecoder(Decryptor::kAudio);
289 decryptor_->InitializeAudioDecoder( 293 decryptor_->InitializeAudioDecoder(
290 config, BindToCurrentLoop(base::Bind( 294 config, BindToCurrentLoop(base::Bind(
291 &DecryptingAudioDecoder::FinishConfigChange, weak_this_))); 295 &DecryptingAudioDecoder::FinishConfigChange, weak_this_)));
292 return; 296 return;
293 } 297 }
294 298
295 if (!reset_cb_.is_null()) { 299 if (!reset_cb_.is_null()) {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 } 467 }
464 468
465 frame->set_timestamp(current_time); 469 frame->set_timestamp(current_time);
466 frame->set_duration( 470 frame->set_duration(
467 timestamp_helper_->GetFrameDuration(frame->frame_count())); 471 timestamp_helper_->GetFrameDuration(frame->frame_count()));
468 timestamp_helper_->AddFrames(frame->frame_count()); 472 timestamp_helper_->AddFrames(frame->frame_count());
469 } 473 }
470 } 474 }
471 475
472 } // namespace media 476 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698