OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/decoder_stream.h" | 5 #include "media/filters/decoder_stream.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 DCHECK(reset_cb_.is_null()); | 282 DCHECK(reset_cb_.is_null()); |
283 } else if (state_ == STATE_REINITIALIZING_DECODER) { | 283 } else if (state_ == STATE_REINITIALIZING_DECODER) { |
284 DCHECK(decoder_); | 284 DCHECK(decoder_); |
285 } | 285 } |
286 | 286 |
287 decoder_ = std::move(selected_decoder); | 287 decoder_ = std::move(selected_decoder); |
288 if (decrypting_demuxer_stream) { | 288 if (decrypting_demuxer_stream) { |
289 decrypting_demuxer_stream_ = std::move(decrypting_demuxer_stream); | 289 decrypting_demuxer_stream_ = std::move(decrypting_demuxer_stream); |
290 stream_ = decrypting_demuxer_stream_.get(); | 290 stream_ = decrypting_demuxer_stream_.get(); |
291 } | 291 } |
| 292 if (decoder_change_observer_cb_) |
| 293 decoder_change_observer_cb_.Run(decoder_.get()); |
292 | 294 |
293 // TODO(tguilbert): crbug.com/603713 support config changes on decoder reinit. | 295 // TODO(tguilbert): crbug.com/603713 support config changes on decoder reinit. |
294 if (received_config_change_during_reinit_) { | 296 if (received_config_change_during_reinit_) { |
295 CompleteDecoderReinitialization(false); | 297 CompleteDecoderReinitialization(false); |
296 return; | 298 return; |
297 } | 299 } |
298 | 300 |
299 // Attempt to decode buffers from previous decoders (when those decoders have | 301 // Attempt to decode buffers from previous decoders (when those decoders have |
300 // never successfully outputed a frame). | 302 // never successfully outputed a frame). |
301 fallback_buffers_ = pending_buffers_; | 303 fallback_buffers_ = pending_buffers_; |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
769 } | 771 } |
770 | 772 |
771 // The resetting process will be continued in OnDecoderReinitialized(). | 773 // The resetting process will be continued in OnDecoderReinitialized(). |
772 ReinitializeDecoder(); | 774 ReinitializeDecoder(); |
773 } | 775 } |
774 | 776 |
775 template class DecoderStream<DemuxerStream::VIDEO>; | 777 template class DecoderStream<DemuxerStream::VIDEO>; |
776 template class DecoderStream<DemuxerStream::AUDIO>; | 778 template class DecoderStream<DemuxerStream::AUDIO>; |
777 | 779 |
778 } // namespace media | 780 } // namespace media |
OLD | NEW |