| 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 #include "media/filters/decrypting_video_decoder.h" | 5 #include "media/filters/decrypting_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/logging.h" |
| 10 #include "base/message_loop_proxy.h" | 11 #include "base/message_loop_proxy.h" |
| 11 #include "media/base/bind_to_loop.h" | 12 #include "media/base/bind_to_loop.h" |
| 12 #include "media/base/decoder_buffer.h" | 13 #include "media/base/decoder_buffer.h" |
| 13 #include "media/base/decryptor.h" | 14 #include "media/base/decryptor.h" |
| 14 #include "media/base/demuxer_stream.h" | 15 #include "media/base/demuxer_stream.h" |
| 15 #include "media/base/pipeline.h" | 16 #include "media/base/pipeline.h" |
| 16 #include "media/base/video_decoder_config.h" | 17 #include "media/base/video_decoder_config.h" |
| 17 #include "media/base/video_frame.h" | 18 #include "media/base/video_frame.h" |
| 18 | 19 |
| 19 namespace media { | 20 namespace media { |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 } | 406 } |
| 406 | 407 |
| 407 void DecryptingVideoDecoder::DoReset() { | 408 void DecryptingVideoDecoder::DoReset() { |
| 408 DCHECK(init_cb_.is_null()); | 409 DCHECK(init_cb_.is_null()); |
| 409 DCHECK(read_cb_.is_null()); | 410 DCHECK(read_cb_.is_null()); |
| 410 state_ = kIdle; | 411 state_ = kIdle; |
| 411 base::ResetAndReturn(&reset_cb_).Run(); | 412 base::ResetAndReturn(&reset_cb_).Run(); |
| 412 } | 413 } |
| 413 | 414 |
| 414 } // namespace media | 415 } // namespace media |
| OLD | NEW |