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

Unified Diff: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 68713007: Revert 235128 "Remove GSC usage from ExynosVideoDecodeAccelerator." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1710/src/
Patch Set: Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/media/rendering_helper.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
===================================================================
--- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 235426)
+++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy)
@@ -453,7 +453,6 @@
PictureBufferById picture_buffers_by_id_;
base::TimeTicks initialize_done_ticks_;
int profile_;
- GLenum texture_target_;
bool suppress_rendering_;
std::vector<base::TimeTicks> frame_delivery_times_;
int delay_reuse_after_frame_num_;
@@ -501,7 +500,6 @@
num_decoded_frames_(0),
num_done_bitstream_buffers_(0),
profile_(profile),
- texture_target_(0),
suppress_rendering_(suppress_rendering),
delay_reuse_after_frame_num_(delay_reuse_after_frame_num),
decode_calls_per_second_(decode_calls_per_second) {
@@ -578,13 +576,12 @@
return;
std::vector<media::PictureBuffer> buffers;
- texture_target_ = texture_target;
for (uint32 i = 0; i < requested_num_of_buffers; ++i) {
uint32 id = picture_buffers_by_id_.size();
uint32 texture_id;
base::WaitableEvent done(false, false);
rendering_helper_->CreateTexture(
- rendering_window_id_, texture_target_, &texture_id, &done);
+ rendering_window_id_, texture_target, &texture_id, &done);
done.Wait();
CHECK(outstanding_texture_ids_.insert(texture_id).second);
media::PictureBuffer* buffer =
@@ -639,8 +636,7 @@
picture_buffers_by_id_[picture.picture_buffer_id()];
CHECK(picture_buffer);
if (!suppress_rendering_) {
- rendering_helper_->RenderTexture(texture_target_,
- picture_buffer->texture_id());
+ rendering_helper_->RenderTexture(picture_buffer->texture_id());
}
if (num_decoded_frames() > delay_reuse_after_frame_num_) {
@@ -1521,7 +1517,9 @@
#if defined(OS_WIN)
content::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
#elif defined(OS_CHROMEOS)
-#if defined(ARCH_CPU_X86_FAMILY)
+#if defined(ARCH_CPU_ARMEL)
+ content::ExynosVideoDecodeAccelerator::PreSandboxInitialization();
+#elif defined(ARCH_CPU_X86_FAMILY)
content::VaapiWrapper::PreSandboxInitialization();
#endif // ARCH_CPU_ARMEL
#endif // OS_CHROMEOS
« no previous file with comments | « content/common/gpu/media/rendering_helper.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698