| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "gpu/command_buffer/service/mailbox_manager.h" | 27 #include "gpu/command_buffer/service/mailbox_manager.h" |
| 28 #include "gpu/ipc/service/gpu_channel.h" | 28 #include "gpu/ipc/service/gpu_channel.h" |
| 29 #include "media/base/android/media_codec_bridge_impl.h" | 29 #include "media/base/android/media_codec_bridge_impl.h" |
| 30 #include "media/base/android/media_codec_util.h" | 30 #include "media/base/android/media_codec_util.h" |
| 31 #include "media/base/bind_to_current_loop.h" | 31 #include "media/base/bind_to_current_loop.h" |
| 32 #include "media/base/bitstream_buffer.h" | 32 #include "media/base/bitstream_buffer.h" |
| 33 #include "media/base/limits.h" | 33 #include "media/base/limits.h" |
| 34 #include "media/base/media.h" | 34 #include "media/base/media.h" |
| 35 #include "media/base/timestamp_constants.h" | 35 #include "media/base/timestamp_constants.h" |
| 36 #include "media/base/video_decoder_config.h" | 36 #include "media/base/video_decoder_config.h" |
| 37 #include "media/cdm/cdm_manager.h" | |
| 38 #include "media/gpu/android_video_surface_chooser_impl.h" | 37 #include "media/gpu/android_video_surface_chooser_impl.h" |
| 39 #include "media/gpu/avda_picture_buffer_manager.h" | 38 #include "media/gpu/avda_picture_buffer_manager.h" |
| 40 #include "media/gpu/content_video_view_overlay.h" | 39 #include "media/gpu/content_video_view_overlay.h" |
| 41 #include "media/gpu/shared_memory_region.h" | 40 #include "media/gpu/shared_memory_region.h" |
| 42 #include "media/video/picture.h" | 41 #include "media/video/picture.h" |
| 43 #include "ui/gl/android/scoped_java_surface.h" | 42 #include "ui/gl/android/scoped_java_surface.h" |
| 44 #include "ui/gl/android/surface_texture.h" | 43 #include "ui/gl/android/surface_texture.h" |
| 45 #include "ui/gl/gl_bindings.h" | 44 #include "ui/gl/gl_bindings.h" |
| 46 | 45 |
| 46 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) |
| 47 #include "media/cdm/cdm_manager.h" // nogncheck |
| 48 #endif |
| 49 |
| 47 #define NOTIFY_ERROR(error_code, error_message) \ | 50 #define NOTIFY_ERROR(error_code, error_message) \ |
| 48 do { \ | 51 do { \ |
| 49 DLOG(ERROR) << error_message; \ | 52 DLOG(ERROR) << error_message; \ |
| 50 NotifyError(VideoDecodeAccelerator::error_code); \ | 53 NotifyError(VideoDecodeAccelerator::error_code); \ |
| 51 } while (0) | 54 } while (0) |
| 52 | 55 |
| 53 namespace media { | 56 namespace media { |
| 54 | 57 |
| 55 namespace { | 58 namespace { |
| 56 | 59 |
| (...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1675 codec_allocator_->ReleaseMediaCodec(std::move(media_codec_), | 1678 codec_allocator_->ReleaseMediaCodec(std::move(media_codec_), |
| 1676 codec_config_->surface_bundle); | 1679 codec_config_->surface_bundle); |
| 1677 } | 1680 } |
| 1678 | 1681 |
| 1679 void AndroidVideoDecodeAccelerator::ReleaseCodecAndBundle() { | 1682 void AndroidVideoDecodeAccelerator::ReleaseCodecAndBundle() { |
| 1680 ReleaseCodec(); | 1683 ReleaseCodec(); |
| 1681 codec_config_->surface_bundle = nullptr; | 1684 codec_config_->surface_bundle = nullptr; |
| 1682 } | 1685 } |
| 1683 | 1686 |
| 1684 } // namespace media | 1687 } // namespace media |
| OLD | NEW |