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

Side by Side Diff: content/renderer/pepper/video_decoder_shim.cc

Issue 371463009: Making use of bindless variants mailbox produce/consume on remainders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cc tests Created 6 years, 5 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 | « content/renderer/media/webmediaplayer_impl.cc ('k') | 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/video_decoder_shim.h" 5 #include "content/renderer/pepper/video_decoder_shim.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #include <GLES2/gl2ext.h> 8 #include <GLES2/gl2ext.h>
9 #include <GLES2/gl2extchromium.h> 9 #include <GLES2/gl2extchromium.h>
10 10
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 DCHECK(RenderThreadImpl::current()); 378 DCHECK(RenderThreadImpl::current());
379 DCHECK_EQ(state_, DECODING); 379 DCHECK_EQ(state_, DECODING);
380 if (buffers.empty()) { 380 if (buffers.empty()) {
381 NOTREACHED(); 381 NOTREACHED();
382 return; 382 return;
383 } 383 }
384 DCHECK_EQ(buffers.size(), pending_texture_mailboxes_.size()); 384 DCHECK_EQ(buffers.size(), pending_texture_mailboxes_.size());
385 GLuint num_textures = base::checked_cast<GLuint>(buffers.size()); 385 GLuint num_textures = base::checked_cast<GLuint>(buffers.size());
386 std::vector<uint32_t> local_texture_ids(num_textures); 386 std::vector<uint32_t> local_texture_ids(num_textures);
387 gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL(); 387 gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
388 gles2->GenTextures(num_textures, &local_texture_ids.front());
389 for (uint32_t i = 0; i < num_textures; i++) { 388 for (uint32_t i = 0; i < num_textures; i++) {
390 gles2->ActiveTexture(GL_TEXTURE0); 389 local_texture_ids[i] = gles2->CreateAndConsumeTextureCHROMIUM(
391 gles2->BindTexture(GL_TEXTURE_2D, local_texture_ids[i]); 390 GL_TEXTURE_2D, pending_texture_mailboxes_[i].name);
392 gles2->ConsumeTextureCHROMIUM(GL_TEXTURE_2D,
393 pending_texture_mailboxes_[i].name);
394 // Map the plugin texture id to the local texture id. 391 // Map the plugin texture id to the local texture id.
395 uint32_t plugin_texture_id = buffers[i].texture_id(); 392 uint32_t plugin_texture_id = buffers[i].texture_id();
396 texture_id_map_[plugin_texture_id] = local_texture_ids[i]; 393 texture_id_map_[plugin_texture_id] = local_texture_ids[i];
397 available_textures_.insert(plugin_texture_id); 394 available_textures_.insert(plugin_texture_id);
398 } 395 }
399 pending_texture_mailboxes_.clear(); 396 pending_texture_mailboxes_.clear();
400 SendPictures(); 397 SendPictures();
401 } 398 }
402 399
403 void VideoDecoderShim::ReusePictureBuffer(int32 picture_buffer_id) { 400 void VideoDecoderShim::ReusePictureBuffer(int32 picture_buffer_id) {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) { 577 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
581 gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL(); 578 gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
582 gles2->DeleteTextures(1, &texture_id); 579 gles2->DeleteTextures(1, &texture_id);
583 } 580 }
584 581
585 void VideoDecoderShim::FlushCommandBuffer() { 582 void VideoDecoderShim::FlushCommandBuffer() {
586 context_provider_->ContextGL()->Flush(); 583 context_provider_->ContextGL()->Flush();
587 } 584 }
588 585
589 } // namespace content 586 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698