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 "content/renderer/pepper/content_decryptor_delegate.h" | 5 #include "content/renderer/pepper/content_decryptor_delegate.h" |
6 | 6 |
7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "base/metrics/sparse_histogram.h" | 9 #include "base/metrics/sparse_histogram.h" |
10 #include "base/numerics/safe_conversions.h" | 10 #include "base/numerics/safe_conversions.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
13 #include "content/renderer/pepper/ppb_buffer_impl.h" | 13 #include "content/renderer/pepper/ppb_buffer_impl.h" |
14 #include "media/base/audio_buffer.h" | 14 #include "media/base/audio_buffer.h" |
15 #include "media/base/audio_decoder_config.h" | 15 #include "media/base/audio_decoder_config.h" |
16 #include "media/base/bind_to_current_loop.h" | 16 #include "media/base/bind_to_current_loop.h" |
17 #include "media/base/cdm_config.h" | |
ddorwin
2015/05/13 06:03:20
unused
sandersd (OOO until July 31)
2015/05/14 00:06:57
Done.
| |
17 #include "media/base/cdm_key_information.h" | 18 #include "media/base/cdm_key_information.h" |
18 #include "media/base/channel_layout.h" | 19 #include "media/base/channel_layout.h" |
19 #include "media/base/data_buffer.h" | 20 #include "media/base/data_buffer.h" |
20 #include "media/base/decoder_buffer.h" | 21 #include "media/base/decoder_buffer.h" |
21 #include "media/base/decrypt_config.h" | 22 #include "media/base/decrypt_config.h" |
22 #include "media/base/key_systems.h" | 23 #include "media/base/key_systems.h" |
23 #include "media/base/limits.h" | 24 #include "media/base/limits.h" |
24 #include "media/base/video_decoder_config.h" | 25 #include "media/base/video_decoder_config.h" |
25 #include "media/base/video_frame.h" | 26 #include "media/base/video_frame.h" |
26 #include "media/base/video_util.h" | 27 #include "media/base/video_util.h" |
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1290 empty_frames); | 1291 empty_frames); |
1291 } | 1292 } |
1292 | 1293 |
1293 if (!video_decode_cb_.is_null()) | 1294 if (!video_decode_cb_.is_null()) |
1294 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL); | 1295 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL); |
1295 | 1296 |
1296 cdm_promise_adapter_.Clear(); | 1297 cdm_promise_adapter_.Clear(); |
1297 } | 1298 } |
1298 | 1299 |
1299 } // namespace content | 1300 } // namespace content |
OLD | NEW |