Revert 141302 - hook up new MacVideoDecodeAccelerator

ppapi/examples/video_decode/video_decode.cc

 // Copyright (c) 2012 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 <string.h>
 
 #include <iostream>
 #include <sstream>
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/cpp/dev/video_decoder_client_dev.h"
 #include "ppapi/cpp/dev/video_decoder_dev.h"
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/graphics_3d_client.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/examples/video_decode/testdata.h"
 #include "ppapi/lib/gl/include/GLES2/gl2.h"
-#include "ppapi/lib/gl/include/GLES2/gl2ext.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 // Use assert as a poor-man's CHECK, even in non-debug mode.
 // Since <assert.h> redefines assert on every inclusion (it doesn't use
 // include-guards), make sure this is the last file #include'd in this file.
 #undef NDEBUG
 #include <assert.h>
 
 // Assert |context_| isn't holding any GL Errors.  Done as a macro instead of a
 // function to preserve line number information in the failure message.
 #define assertNoGLError() \
   assert(!gles2_if_->GetError(context_->pp_resource()));
 
 namespace {
 
-struct PictureBufferInfo {
-  PP_PictureBuffer_Dev buffer;
-  GLenum texture_target;
-};
-
-struct Shader {
-  Shader() : program(0),
-             texcoord_scale_location(0) {}
-
-  GLuint program;
-  GLint texcoord_scale_location;
-};
-
 class VideoDecodeDemoInstance : public pp::Instance,
                                 public pp::Graphics3DClient,
                                 public pp::VideoDecoderClient_Dev {
  public:
   VideoDecodeDemoInstance(PP_Instance instance, pp::Module* module);
   virtual ~VideoDecodeDemoInstance();
 
   // pp::Instance implementation (see PPP_Instance).
   virtual void DidChangeView(const pp::Rect& position,
                              const pp::Rect& clip_ignored);
@@ skipping 31 matching lines @@
 
     void DecodeNextNALUs();
 
     // Per-decoder implementation of part of pp::VideoDecoderClient_Dev.
     void ProvidePictureBuffers(
         uint32_t req_num_of_bufs,
         PP_Size dimensions,
         uint32_t texture_target);
     void DismissPictureBuffer(int32_t picture_buffer_id);
 
-    const PictureBufferInfo& GetPictureBufferInfoById(int id);
+    const PP_PictureBuffer_Dev& GetPictureBufferById(int id);
     pp::VideoDecoder_Dev* decoder() { return decoder_; }
 
    private:
     void DecodeNextNALU();
     static void GetNextNALUBoundary(size_t start_pos, size_t* end_pos);
     void DecoderBitstreamDone(int32_t result, int bitstream_buffer_id);
     void DecoderFlushDone(int32_t result);
 
     VideoDecodeDemoInstance* gles2_;
     pp::VideoDecoder_Dev* decoder_;
     pp::CompletionCallbackFactory<DecoderClient> callback_factory_;
     int next_picture_buffer_id_;
     int next_bitstream_buffer_id_;
     size_t encoded_data_next_pos_to_decode_;
     std::set<int> bitstream_ids_at_decoder_;
     // Map of texture buffers indexed by buffer id.
-    typedef std::map<int, PictureBufferInfo> PictureBufferMap;
+    typedef std::map<int, PP_PictureBuffer_Dev> PictureBufferMap;
     PictureBufferMap picture_buffers_by_id_;
     // Map of bitstream buffers indexed by id.
     typedef std::map<int, pp::Buffer_Dev*> BitstreamBufferMap;
     BitstreamBufferMap bitstream_buffers_by_id_;
   };
 
   // Initialize Video Decoders.
   void InitializeDecoders();
 
   // GL-related functions.
   void InitGL();
-  GLuint CreateTexture(int32_t width, int32_t height, GLenum texture_target);
+  GLuint CreateTexture(int32_t width, int32_t height);
   void CreateGLObjects();
-  Shader CreateProgram(const char* vertex_shader,
-                       const char* fragment_shader);
   void CreateShader(GLuint program, GLenum type, const char* source, int size);
   void DeleteTexture(GLuint id);
   void PaintFinished(int32_t result, PP_Resource decoder,
                      int picture_buffer_id);
 
   // Log an error to the developer console and stderr (though the latter may be
   // closed due to sandboxing or blackholed for other reasons) by creating a
   // temporary of this type and streaming to it.  Example usage:
   // LogError(this).s() << "Hello world: " << 42;
   class LogError {
@@ skipping 27 matching lines @@
 
   // Unowned pointers.
   const PPB_Console_Dev* console_if_;
   const PPB_Core* core_if_;
   const PPB_OpenGLES2* gles2_if_;
 
   // Owned data.
   pp::Graphics3D* context_;
   typedef std::map<int, DecoderClient*> Decoders;
   Decoders video_decoders_;
-
-  // Shader program to draw GL_TEXTURE_2D target.
-  Shader shader_2d_;
-  // Shader program to draw GL_TEXTURE_RECTANGLE_ARB target.
-  Shader shader_rectangle_arb_;
 };
 
 VideoDecodeDemoInstance::DecoderClient::DecoderClient(
       VideoDecodeDemoInstance* gles2, pp::VideoDecoder_Dev* decoder)
     : gles2_(gles2), decoder_(decoder), callback_factory_(this),
       next_picture_buffer_id_(0),
       next_bitstream_buffer_id_(0), encoded_data_next_pos_to_decode_(0) {
 }
 
 VideoDecodeDemoInstance::DecoderClient::~DecoderClient() {
   delete decoder_;
   decoder_ = NULL;
 
   for (BitstreamBufferMap::iterator it = bitstream_buffers_by_id_.begin();
        it != bitstream_buffers_by_id_.end(); ++it) {
     delete it->second;
   }
   bitstream_buffers_by_id_.clear();
 
   for (PictureBufferMap::iterator it = picture_buffers_by_id_.begin();
        it != picture_buffers_by_id_.end(); ++it) {
-    gles2_->DeleteTexture(it->second.buffer.texture_id);
+    gles2_->DeleteTexture(it->second.texture_id);
   }
   picture_buffers_by_id_.clear();
 }
 
 VideoDecodeDemoInstance::VideoDecodeDemoInstance(PP_Instance instance,
                                                  pp::Module* module)
     : pp::Instance(instance), pp::Graphics3DClient(this),
       pp::VideoDecoderClient_Dev(this),
       num_frames_rendered_(0),
       first_frame_delivered_ticks_(-1),
       swap_ticks_(0),
       callback_factory_(this),
       context_(NULL) {
   assert((console_if_ = static_cast<const PPB_Console_Dev*>(
       module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE))));
   assert((core_if_ = static_cast<const PPB_Core*>(
       module->GetBrowserInterface(PPB_CORE_INTERFACE))));
   assert((gles2_if_ = static_cast<const PPB_OpenGLES2*>(
       module->GetBrowserInterface(PPB_OPENGLES2_INTERFACE))));
 }
 
 VideoDecodeDemoInstance::~VideoDecodeDemoInstance() {
-  if (shader_2d_.program)
-    gles2_if_->DeleteProgram(context_->pp_resource(), shader_2d_.program);
-  if (shader_rectangle_arb_.program) {
-    gles2_if_->DeleteProgram(
-        context_->pp_resource(), shader_rectangle_arb_.program);
-  }
-
   for (Decoders::iterator it = video_decoders_.begin();
        it != video_decoders_.end(); ++it) {
     delete it->second;
   }
   video_decoders_.clear();
   delete context_;
 }
 
 void VideoDecodeDemoInstance::DidChangeView(
     const pp::Rect& position, const pp::Rect& clip_ignored) {
@@ skipping 105 matching lines @@
                                                     uint32_t texture_target) {
   DecoderClient* client = video_decoders_[decoder];
   assert(client);
   client->ProvidePictureBuffers(req_num_of_bufs, dimensions, texture_target);
 }
 
 void VideoDecodeDemoInstance::DecoderClient::ProvidePictureBuffers(
     uint32_t req_num_of_bufs,
     PP_Size dimensions,
     uint32_t texture_target) {
+  // TODO(sail): Add support for GL_TEXTURE_RECTANGLE_ARB.
+  assert(texture_target == GL_TEXTURE_2D);
   std::vector<PP_PictureBuffer_Dev> buffers;
   for (uint32_t i = 0; i < req_num_of_bufs; ++i) {
-    PictureBufferInfo info;
-    info.buffer.size = dimensions;
-    info.texture_target = texture_target;
-    info.buffer.texture_id = gles2_->CreateTexture(
-        dimensions.width, dimensions.height, info.texture_target);
+    PP_PictureBuffer_Dev buffer;
+    buffer.size = dimensions;
+    buffer.texture_id =
+        gles2_->CreateTexture(dimensions.width, dimensions.height);
     int id = ++next_picture_buffer_id_;
-    info.buffer.id = id;
-    buffers.push_back(info.buffer);
-    assert(picture_buffers_by_id_.insert(std::make_pair(id, info)).second);
+    buffer.id = id;
+    buffers.push_back(buffer);
+    assert(picture_buffers_by_id_.insert(std::make_pair(id, buffer)).second);
   }
   decoder_->AssignPictureBuffers(buffers);
 }
 
-const PictureBufferInfo&
-VideoDecodeDemoInstance::DecoderClient::GetPictureBufferInfoById(
+const PP_PictureBuffer_Dev&
+VideoDecodeDemoInstance::DecoderClient::GetPictureBufferById(
     int id) {
   PictureBufferMap::iterator it = picture_buffers_by_id_.find(id);
   assert(it != picture_buffers_by_id_.end());
   return it->second;
 }
 
 void VideoDecodeDemoInstance::DismissPictureBuffer(PP_Resource decoder,
                                              int32_t picture_buffer_id) {
   DecoderClient* client = video_decoders_[decoder];
   assert(client);
   client->DismissPictureBuffer(picture_buffer_id);
 }
 
 void VideoDecodeDemoInstance::DecoderClient::DismissPictureBuffer(
     int32_t picture_buffer_id) {
-  gles2_->DeleteTexture(GetPictureBufferInfoById(
-      picture_buffer_id).buffer.texture_id);
+  gles2_->DeleteTexture(GetPictureBufferById(picture_buffer_id).texture_id);
   picture_buffers_by_id_.erase(picture_buffer_id);
 }
 
 void VideoDecodeDemoInstance::PictureReady(PP_Resource decoder,
                                      const PP_Picture_Dev& picture) {
   if (first_frame_delivered_ticks_ == -1)
     assert((first_frame_delivered_ticks_ = core_if_->GetTimeTicks()) != -1);
   if (is_painting_) {
     pictures_pending_paint_.push_back(std::make_pair(decoder, picture));
     return;
   }
   DecoderClient* client = video_decoders_[decoder];
   assert(client);
-  const PictureBufferInfo& info =
-      client->GetPictureBufferInfoById(picture.picture_buffer_id);
+  const PP_PictureBuffer_Dev& buffer =
+      client->GetPictureBufferById(picture.picture_buffer_id);
   assert(!is_painting_);
   is_painting_ = true;
   int x = 0;
   int y = 0;
   if (client != video_decoders_.begin()->second) {
     x = plugin_size_.width() / kNumDecoders;
     y = plugin_size_.height() / kNumDecoders;
   }
 
-  if (info.texture_target == GL_TEXTURE_2D) {
-    gles2_if_->UseProgram(context_->pp_resource(), shader_2d_.program);
-    gles2_if_->Uniform2f(
-        context_->pp_resource(), shader_2d_.texcoord_scale_location, 1.0, 1.0);
-  } else {
-    assert(info.texture_target == GL_TEXTURE_RECTANGLE_ARB);
-    gles2_if_->UseProgram(
-        context_->pp_resource(), shader_rectangle_arb_.program);
-    gles2_if_->Uniform2f(context_->pp_resource(),
-                         shader_rectangle_arb_.texcoord_scale_location,
-                         info.buffer.size.width,
-                         info.buffer.size.height);
-  }
-
   gles2_if_->Viewport(context_->pp_resource(), x, y,
                       plugin_size_.width() / kNumDecoders,
                       plugin_size_.height() / kNumDecoders);
   gles2_if_->ActiveTexture(context_->pp_resource(), GL_TEXTURE0);
   gles2_if_->BindTexture(
-      context_->pp_resource(), info.texture_target, info.buffer.texture_id);
+      context_->pp_resource(), GL_TEXTURE_2D, buffer.texture_id);
   gles2_if_->DrawArrays(context_->pp_resource(), GL_TRIANGLE_STRIP, 0, 4);
-
-  gles2_if_->UseProgram(context_->pp_resource(), 0);
-
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(
-          &VideoDecodeDemoInstance::PaintFinished, decoder, info.buffer.id);
+          &VideoDecodeDemoInstance::PaintFinished, decoder, buffer.id);
   last_swap_request_ticks_ = core_if_->GetTimeTicks();
   assert(context_->SwapBuffers(cb) == PP_OK_COMPLETIONPENDING);
 }
 
 void VideoDecodeDemoInstance::NotifyError(PP_Resource decoder,
                                     PP_VideoDecodeError_Dev error) {
   LogError(this).s() << "Received error: " << error;
   assert(!"Unexpected error; see stderr for details");
 }
 
@@ skipping 58 matching lines @@
   if (client && client->decoder())
     client->decoder()->ReusePictureBuffer(picture_buffer_id);
   if (!pictures_pending_paint_.empty()) {
     std::pair<PP_Resource, PP_Picture_Dev> decoder_picture =
         pictures_pending_paint_.front();
     pictures_pending_paint_.pop_front();
     PictureReady(decoder_picture.first, decoder_picture.second);
   }
 }
 
-GLuint VideoDecodeDemoInstance::CreateTexture(int32_t width,
-                                              int32_t height,
-                                              GLenum texture_target) {
+GLuint VideoDecodeDemoInstance::CreateTexture(int32_t width, int32_t height) {
   GLuint texture_id;
   gles2_if_->GenTextures(context_->pp_resource(), 1, &texture_id);
   assertNoGLError();
   // Assign parameters.
   gles2_if_->ActiveTexture(context_->pp_resource(), GL_TEXTURE0);
-  gles2_if_->BindTexture(context_->pp_resource(), texture_target, texture_id);
+  gles2_if_->BindTexture(context_->pp_resource(), GL_TEXTURE_2D, texture_id);
   gles2_if_->TexParameteri(
-      context_->pp_resource(), texture_target, GL_TEXTURE_MIN_FILTER,
+      context_->pp_resource(), GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
       GL_NEAREST);
   gles2_if_->TexParameteri(
-      context_->pp_resource(), texture_target, GL_TEXTURE_MAG_FILTER,
+      context_->pp_resource(), GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
       GL_NEAREST);
   gles2_if_->TexParameterf(
-      context_->pp_resource(), texture_target, GL_TEXTURE_WRAP_S,
+      context_->pp_resource(), GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
       GL_CLAMP_TO_EDGE);
   gles2_if_->TexParameterf(
-      context_->pp_resource(), texture_target, GL_TEXTURE_WRAP_T,
+      context_->pp_resource(), GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
       GL_CLAMP_TO_EDGE);
 
-  if (texture_target == GL_TEXTURE_2D) {
-    gles2_if_->TexImage2D(
-        context_->pp_resource(), texture_target, 0, GL_RGBA, width, height, 0,
-        GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-  }
+  gles2_if_->TexImage2D(
+      context_->pp_resource(), GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
+      GL_RGBA, GL_UNSIGNED_BYTE, NULL);
   assertNoGLError();
   return texture_id;
 }
 
 void VideoDecodeDemoInstance::DeleteTexture(GLuint id) {
   gles2_if_->DeleteTextures(context_->pp_resource(), 1, &id);
 }
 
 void VideoDecodeDemoInstance::CreateGLObjects() {
   // Code and constants for shader.
   static const char kVertexShader[] =
       "varying vec2 v_texCoord;            \n"
       "attribute vec4 a_position;          \n"
       "attribute vec2 a_texCoord;          \n"
-      "uniform vec2 v_scale;               \n"
       "void main()                         \n"
       "{                                   \n"
-      "    v_texCoord = v_scale * a_texCoord; \n"
+      "    v_texCoord = a_texCoord;        \n"
       "    gl_Position = a_position;       \n"
       "}";
 
-  static const char kFragmentShader2D[] =
+  static const char kFragmentShader[] =
       "precision mediump float;            \n"
       "varying vec2 v_texCoord;            \n"
       "uniform sampler2D s_texture;        \n"
       "void main()                         \n"
       "{"
       "    gl_FragColor = texture2D(s_texture, v_texCoord); \n"
       "}";
 
-  static const char kFragmentShaderRectangle[] =
-      "#extension GL_ARB_texture_rectangle : require\n"
-      "precision mediump float;            \n"
-      "varying vec2 v_texCoord;            \n"
-      "uniform sampler2DRect s_texture;    \n"
-      "void main()                         \n"
-      "{"
-      "    gl_FragColor = texture2DRect(s_texture, v_texCoord).rgba; \n"
-      "}";
+  // Create shader program.
+  GLuint program = gles2_if_->CreateProgram(context_->pp_resource());
+  CreateShader(program, GL_VERTEX_SHADER, kVertexShader, sizeof(kVertexShader));
+  CreateShader(
+      program, GL_FRAGMENT_SHADER, kFragmentShader, sizeof(kFragmentShader));
+  gles2_if_->LinkProgram(context_->pp_resource(), program);
+  gles2_if_->UseProgram(context_->pp_resource(), program);
+  gles2_if_->DeleteProgram(context_->pp_resource(), program);
+  gles2_if_->Uniform1i(
+      context_->pp_resource(),
+      gles2_if_->GetUniformLocation(
+          context_->pp_resource(), program, "s_texture"), 0);
+  assertNoGLError();
 
   // Assign vertex positions and texture coordinates to buffers for use in
   // shader program.
   static const float kVertices[] = {
     -1, 1, -1, -1, 1, 1, 1, -1,  // Position coordinates.
-    0, 1, 0, 0, 1, 1, 1, 0,      // Texture coordinates.
+    0, 1, 0, 0, 1, 1, 1, 0,  // Texture coordinates.
   };
 
   GLuint buffer;
   gles2_if_->GenBuffers(context_->pp_resource(), 1, &buffer);
   gles2_if_->BindBuffer(context_->pp_resource(), GL_ARRAY_BUFFER, buffer);
-
   gles2_if_->BufferData(context_->pp_resource(), GL_ARRAY_BUFFER,
                         sizeof(kVertices), kVertices, GL_STATIC_DRAW);
   assertNoGLError();
-
-  shader_2d_ = CreateProgram(kVertexShader, kFragmentShader2D);
-  shader_rectangle_arb_ =
-      CreateProgram(kVertexShader, kFragmentShaderRectangle);
-}
-
-Shader VideoDecodeDemoInstance::CreateProgram(const char* vertex_shader,
-                                              const char* fragment_shader) {
-  Shader shader;
-
-  // Create shader program.
-  shader.program = gles2_if_->CreateProgram(context_->pp_resource());
-  CreateShader(shader.program, GL_VERTEX_SHADER, vertex_shader,
-               strlen(vertex_shader));
-  CreateShader(shader.program, GL_FRAGMENT_SHADER, fragment_shader,
-               strlen(fragment_shader));
-  gles2_if_->LinkProgram(context_->pp_resource(), shader.program);
-  gles2_if_->UseProgram(context_->pp_resource(), shader.program);
-  gles2_if_->Uniform1i(
-      context_->pp_resource(),
-      gles2_if_->GetUniformLocation(
-          context_->pp_resource(), shader.program, "s_texture"), 0);
+  GLint pos_location = gles2_if_->GetAttribLocation(
+      context_->pp_resource(), program, "a_position");
+  GLint tc_location = gles2_if_->GetAttribLocation(
+      context_->pp_resource(), program, "a_texCoord");
   assertNoGLError();
-
-  shader.texcoord_scale_location = gles2_if_->GetUniformLocation(
-      context_->pp_resource(), shader.program, "v_scale");
-
-  GLint pos_location = gles2_if_->GetAttribLocation(
-      context_->pp_resource(), shader.program, "a_position");
-  GLint tc_location = gles2_if_->GetAttribLocation(
-      context_->pp_resource(), shader.program, "a_texCoord");
-  assertNoGLError();
-
   gles2_if_->EnableVertexAttribArray(context_->pp_resource(), pos_location);
   gles2_if_->VertexAttribPointer(context_->pp_resource(), pos_location, 2,
                                  GL_FLOAT, GL_FALSE, 0, 0);
   gles2_if_->EnableVertexAttribArray(context_->pp_resource(), tc_location);
   gles2_if_->VertexAttribPointer(
       context_->pp_resource(), tc_location, 2, GL_FLOAT, GL_FALSE, 0,
       static_cast<float*>(0) + 8);  // Skip position coordinates.
-
-  gles2_if_->UseProgram(context_->pp_resource(), 0);
   assertNoGLError();
-  return shader;
 }
 
 void VideoDecodeDemoInstance::CreateShader(
     GLuint program, GLenum type, const char* source, int size) {
   GLuint shader = gles2_if_->CreateShader(context_->pp_resource(), type);
   gles2_if_->ShaderSource(context_->pp_resource(), shader, 1, &source, &size);
   gles2_if_->CompileShader(context_->pp_resource(), shader);
   gles2_if_->AttachShader(context_->pp_resource(), program, shader);
   gles2_if_->DeleteShader(context_->pp_resource(), shader);
 }
 }  // anonymous namespace
 
 namespace pp {
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new VideoDecodeDemoModule();
 }
 }  // namespace pp