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

Unified Diff: content/renderer/pepper/video_decoder_shim.cc

Issue 1751323002: Allow multiple texture ids per picture buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/video_decoder_shim.cc
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
index 92ffcdb562302e3e2c69ecd9424a397c85e80001..f1d090e27a53774c44dc18d4a4d85697a47c56ec 100644
--- a/content/renderer/pepper/video_decoder_shim.cc
+++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -944,10 +944,12 @@ void VideoDecoderShim::AssignPictureBuffers(
std::vector<uint32_t> local_texture_ids(num_textures);
gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
for (uint32_t i = 0; i < num_textures; i++) {
+ if (buffers[i].texture_ids().empty())
+ continue;
raymes 2016/03/31 00:09:25 Could this case actually happen?
local_texture_ids[i] = gles2->CreateAndConsumeTextureCHROMIUM(
GL_TEXTURE_2D, pending_texture_mailboxes_[i].name);
// Map the plugin texture id to the local texture id.
- uint32_t plugin_texture_id = buffers[i].texture_id();
+ uint32_t plugin_texture_id = buffers[i].texture_ids()[0];
texture_id_map_[plugin_texture_id] = local_texture_ids[i];
available_textures_.insert(plugin_texture_id);
}

Powered by Google App Engine
This is Rietveld 408576698