Pepper: Fix VideoDecoderShim texture upload.

content/renderer/pepper/video_decoder_shim.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/video_decoder_shim.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 505 matching lines @@
     const linked_ptr<PendingFrame>& frame = pending_frames_.front();
 
     TextureIdSet::iterator it = available_textures_.begin();
     uint32_t texture_id = *it;
     available_textures_.erase(it);
 
     uint32_t local_texture_id = texture_id_map_[texture_id];
     gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
     gles2->ActiveTexture(GL_TEXTURE0);
     gles2->BindTexture(GL_TEXTURE_2D, local_texture_id);
+#if !defined(OS_ANDROID)
+    // BGRA is the native texture format, except on Android, where textures
+    // would be uploaded as GL_RGBA.
     gles2->TexImage2D(GL_TEXTURE_2D,
                       0,
-                      GL_RGBA,
+                      GL_BGRA_EXT,
                       texture_size_.width(),
                       texture_size_.height(),
                       0,
-                      GL_RGBA,
+                      GL_BGRA_EXT,
                       GL_UNSIGNED_BYTE,
                       &frame->argb_pixels.front());
+#else
+#error Not implemented.
+#endif
 
     host_->PictureReady(media::Picture(texture_id, frame->decode_id,
                                        frame->visible_rect, false));
     pending_frames_.pop();
   }
 
   FlushCommandBuffer();
 
   if (pending_frames_.empty()) {
     // If frames aren't backing up, notify the host of any completed decodes so
@@ skipping 42 matching lines @@
 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   gles2->DeleteTextures(1, &texture_id);
 }
 
 void VideoDecoderShim::FlushCommandBuffer() {
   context_provider_->ContextGL()->Flush();
 }
 
 }  // namespace content