Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: media/gpu/android_video_decode_accelerator.cc

Issue 2786473003: Fix one gn check failure of cast for Android build (Closed)
Patch Set: nogncheck Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 25 matching lines...) Expand all
36 #include "media/base/video_decoder_config.h" 36 #include "media/base/video_decoder_config.h"
37 #include "media/gpu/avda_picture_buffer_manager.h" 37 #include "media/gpu/avda_picture_buffer_manager.h"
38 #include "media/gpu/content_video_view_overlay.h" 38 #include "media/gpu/content_video_view_overlay.h"
39 #include "media/gpu/shared_memory_region.h" 39 #include "media/gpu/shared_memory_region.h"
40 #include "media/video/picture.h" 40 #include "media/video/picture.h"
41 #include "ui/gl/android/scoped_java_surface.h" 41 #include "ui/gl/android/scoped_java_surface.h"
42 #include "ui/gl/android/surface_texture.h" 42 #include "ui/gl/android/surface_texture.h"
43 #include "ui/gl/gl_bindings.h" 43 #include "ui/gl/gl_bindings.h"
44 44
45 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) 45 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
46 #include "media/mojo/services/mojo_cdm_service.h" 46 #include "media/mojo/services/mojo_cdm_service.h" // nogncheck
47 #endif 47 #endif
48 48
49 #define NOTIFY_ERROR(error_code, error_message) \ 49 #define NOTIFY_ERROR(error_code, error_message) \
50 do { \ 50 do { \
51 DLOG(ERROR) << error_message; \ 51 DLOG(ERROR) << error_message; \
52 NotifyError(VideoDecodeAccelerator::error_code); \ 52 NotifyError(VideoDecodeAccelerator::error_code); \
53 } while (0) 53 } while (0)
54 54
55 namespace media { 55 namespace media {
56 56
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 if (!media_codec_) 1627 if (!media_codec_)
1628 return; 1628 return;
1629 1629
1630 picture_buffer_manager_.CodecChanged(nullptr); 1630 picture_buffer_manager_.CodecChanged(nullptr);
1631 codec_allocator_->ReleaseMediaCodec(std::move(media_codec_), 1631 codec_allocator_->ReleaseMediaCodec(std::move(media_codec_),
1632 codec_config_->task_type, 1632 codec_config_->task_type,
1633 codec_config_->surface_bundle); 1633 codec_config_->surface_bundle);
1634 } 1634 }
1635 1635
1636 } // namespace media 1636 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698