OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "media/gpu/android_video_decode_accelerator.h" | 5 #include "media/gpu/android_video_decode_accelerator.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
11 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
17 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
| 18 #include "base/single_thread_task_runner.h" |
18 #include "base/threading/thread_task_runner_handle.h" | 19 #include "base/threading/thread_task_runner_handle.h" |
19 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" | 20 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" |
20 #include "media/base/android/media_codec_util.h" | 21 #include "media/base/android/media_codec_util.h" |
21 #include "media/base/android/media_jni_registrar.h" | 22 #include "media/base/android/media_jni_registrar.h" |
22 #include "media/base/android/mock_android_overlay.h" | 23 #include "media/base/android/mock_android_overlay.h" |
23 #include "media/base/android/mock_media_codec_bridge.h" | 24 #include "media/base/android/mock_media_codec_bridge.h" |
24 #include "media/gpu/android_video_decode_accelerator.h" | 25 #include "media/gpu/android_video_decode_accelerator.h" |
25 #include "media/gpu/android_video_surface_chooser.h" | 26 #include "media/gpu/android_video_surface_chooser.h" |
26 #include "media/gpu/avda_codec_allocator.h" | 27 #include "media/gpu/avda_codec_allocator.h" |
27 #include "media/video/picture.h" | 28 #include "media/video/picture.h" |
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
687 InitializeAVDAWithSurfaceTexture(); | 688 InitializeAVDAWithSurfaceTexture(); |
688 | 689 |
689 // This should do nothing. | 690 // This should do nothing. |
690 EXPECT_CALL(*codec_allocator_.most_recent_codec(), SetSurface(_)).Times(0); | 691 EXPECT_CALL(*codec_allocator_.most_recent_codec(), SetSurface(_)).Times(0); |
691 chooser_->ProvideSurfaceTexture(); | 692 chooser_->ProvideSurfaceTexture(); |
692 | 693 |
693 base::RunLoop().RunUntilIdle(); | 694 base::RunLoop().RunUntilIdle(); |
694 } | 695 } |
695 | 696 |
696 } // namespace media | 697 } // namespace media |
OLD | NEW |