Fix PPB_VideoDecoder_Impl::NotifyEndOfBitstreamBuffer to use correct ID.

ppapi/examples/gles2/gles2.cc

 // Copyright (c) 2011 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 <map>
+#include <set>
+#include <vector>
+
 #include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/dev/context_3d_dev.h"
 #include "ppapi/cpp/dev/graphics_3d_client_dev.h"
 #include "ppapi/cpp/dev/graphics_3d_dev.h"
 #include "ppapi/cpp/dev/surface_3d_dev.h"
 #include "ppapi/cpp/dev/video_decoder_client_dev.h"
 #include "ppapi/cpp/dev/video_decoder_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/examples/gles2/testdata.h"
 #include "ppapi/lib/gl/include/GLES2/gl2.h"
 
-// Prevent "unused variable" warnings when building in Release mode.
-#ifdef NDEBUG
-#undef assert
-#define assert(expr) while (0 && (expr))
-#endif  // NDEBUG
+// 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.

[scherkus (not reviewing), 2011/06/21 01:22:27]

:(

+#undef NDEBUG
+#include <assert.h>
 
 namespace {
 
 class GLES2DemoInstance : public pp::Instance, public pp::Graphics3DClient_Dev,
                           public pp::VideoDecoderClient_Dev {
  public:
   GLES2DemoInstance(PP_Instance instance, pp::Module* module);
   virtual ~GLES2DemoInstance();
 
   // pp::Instance implementation (see PPP_Instance).
@@ skipping 15 matching lines @@
       PP_Size dimensions, PP_PictureBufferType_Dev type);
   virtual void DismissPictureBuffer(
       pp::VideoDecoder_Dev decoder, int32_t picture_buffer_id);
   virtual void PictureReady(
       pp::VideoDecoder_Dev decoder, const PP_Picture_Dev& picture);
   virtual void EndOfStream(pp::VideoDecoder_Dev decoder);
   virtual void NotifyError(
       pp::VideoDecoder_Dev decoder, PP_VideoDecodeError_Dev error);
 
  private:
+  enum { kNumConcurrentDecodes = 7 };
+
   // Helper struct that stores data used by the shader program.
   struct ShaderInfo {
     GLint pos_location;
     GLint tc_location;
     GLint tex_location;
     GLuint vertex_buffers[2];
   };
 
   // Serialize PPB_Video_Decoder_Dev operations w.r.t. GPU command buffer.
   // TODO(fischman): figure out how much of this is actually necessary.
   // Probably any necessary serialization ought to be happening in the
   // PPAPI implementation, not in the plugin!
   void FinishGL() {
     gles2_if_->Finish(context_->pp_resource());
   }
 
   // Initialize Video Decoder.
   void InitializeDecoder();
 
   // Callbacks passed into pp:VideoDecoder_Dev functions.
   void DecoderInitDone(int32_t result);
   void DecoderBitstreamDone(int32_t result, int bitstream_buffer_id);
   void DecoderFlushDone(int32_t result);
   void DecoderAbortDone(int32_t result);
 
   // Decode helpers.
+  void DecodeNextNALUs();
   void DecodeNextNALU();
   void GetNextNALUBoundary(size_t start_pos, size_t* end_pos);
   void Render(const PP_GLESBuffer_Dev& buffer);
 
   // GL-related functions.
   void InitGL();
   GLuint CreateTexture(int32_t width, int32_t height);
   void CreateGLObjects();
   void CreateShader(GLuint program, GLenum type, const char* source, int size);
   void DeleteTexture(GLuint id);
   void PaintFinished(int32_t result, int picture_buffer_id);
 
   // Assert |context_| isn't holding any GL Errors.
   void assertNoGLError() {
     assert(!gles2_if_->GetError(context_->pp_resource()));
   }
 
   pp::Size position_size_;
   ShaderInfo program_data_;
   int next_picture_buffer_id_;
   int next_bitstream_buffer_id_;
   bool is_painting_;
   pp::CompletionCallbackFactory<GLES2DemoInstance> callback_factory_;
   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, PP_GLESBuffer_Dev> PictureBufferMap;
   PictureBufferMap buffers_by_id_;
   // Map of bitstream buffers indexed by id.
   typedef std::map<int, pp::Buffer_Dev*> BitstreamBufferMap;
   BitstreamBufferMap bitstream_buffers_by_id_;
 
   // Unowned pointers.
   const struct PPB_OpenGLES2_Dev* gles2_if_;
@@ skipping 45 matching lines @@
     return;
   video_decoder_ = new pp::VideoDecoder_Dev(*this);
 
   PP_VideoConfigElement configs = PP_VIDEOATTR_DICTIONARY_TERMINATOR;
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(&GLES2DemoInstance::DecoderInitDone);
   video_decoder_->Initialize(&configs, *context_, cb);
 }
 
 void GLES2DemoInstance::DecoderInitDone(int32_t result) {
-  DecodeNextNALU();
+  DecodeNextNALUs();
 }
 
 void GLES2DemoInstance::DecoderBitstreamDone(
     int32_t result, int bitstream_buffer_id) {
+  assert(bitstream_ids_at_decoder_.erase(bitstream_buffer_id) == 1);
   BitstreamBufferMap::iterator it =
       bitstream_buffers_by_id_.find(bitstream_buffer_id);
   assert(it != bitstream_buffers_by_id_.end());
   delete it->second;
-  DecodeNextNALU();
+  DecodeNextNALUs();
 }
 
 void GLES2DemoInstance::DecoderFlushDone(int32_t result) {
+  // Check that each bitstream buffer ID we handed to the decoder got handed
+  // back to us.
+  assert(!bitstream_ids_at_decoder_.size());

[scherkus (not reviewing), 2011/06/21 01:22:27]

empty?

[Ami GONE FROM CHROMIUM, 2011/06/21 01:35:22]

Done.

 }
 
 void GLES2DemoInstance::DecoderAbortDone(int32_t result) {
 }
 
 static bool LookingAtNAL(const unsigned char* encoded, size_t pos) {
   return pos + 3 < kDataLen &&
       encoded[pos] == 0 && encoded[pos + 1] == 0 &&
       encoded[pos + 2] == 0 && encoded[pos + 3] == 1;
 }
 
 void GLES2DemoInstance::GetNextNALUBoundary(
     size_t start_pos, size_t* end_pos) {
   assert(LookingAtNAL(kData, start_pos));
   *end_pos = start_pos;
   *end_pos += 4;
   while (*end_pos + 3 < kDataLen &&
          !LookingAtNAL(kData, *end_pos)) {
     ++*end_pos;
   }
   if (*end_pos + 3 >= kDataLen) {
     *end_pos = kDataLen;
     return;
   }
 }
 
+void GLES2DemoInstance::DecodeNextNALUs() {
+  while (encoded_data_next_pos_to_decode_ <= kDataLen &&
+         bitstream_ids_at_decoder_.size() < kNumConcurrentDecodes) {
+    DecodeNextNALU();
+  }
+}
+
 void GLES2DemoInstance::DecodeNextNALU() {
   if (encoded_data_next_pos_to_decode_ == kDataLen) {
+    ++encoded_data_next_pos_to_decode_;
     pp::CompletionCallback cb =
         callback_factory_.NewCallback(&GLES2DemoInstance::DecoderFlushDone);
     video_decoder_->Flush(cb);
     return;
   }
   size_t start_pos = encoded_data_next_pos_to_decode_;
   size_t end_pos;
   GetNextNALUBoundary(start_pos, &end_pos);
   pp::Buffer_Dev* buffer = new pp::Buffer_Dev (this, end_pos - start_pos);
   PP_VideoBitstreamBuffer_Dev bitstream_buffer;
   int id = ++next_bitstream_buffer_id_;
   bitstream_buffer.id = id;
   bitstream_buffer.size = end_pos - start_pos;
   bitstream_buffer.data = buffer->pp_resource();
   memcpy(buffer->data(), kData + start_pos, end_pos - start_pos);
-  bool result =
-      bitstream_buffers_by_id_.insert(std::make_pair(id, buffer)).second;
-  assert(result);
+  assert(bitstream_buffers_by_id_.insert(std::make_pair(id, buffer)).second);

[scherkus (not reviewing), 2011/06/21 01:22:27]

I'm guessing assert doesn't get optimized out in release modes if you're doing
this, right?

 
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(
           &GLES2DemoInstance::DecoderBitstreamDone, id);
+  assert(bitstream_ids_at_decoder_.insert(id).second);

[scherkus (not reviewing), 2011/06/21 01:22:27]

ditto here

   video_decoder_->Decode(bitstream_buffer, cb);
   encoded_data_next_pos_to_decode_ = end_pos;
 }
 
 void GLES2DemoInstance::ProvidePictureBuffers(
     pp::VideoDecoder_Dev decoder, uint32_t req_num_of_bufs, PP_Size dimensions,
     PP_PictureBufferType_Dev type) {
   std::vector<PP_GLESBuffer_Dev> buffers;
   for (uint32_t i = 0; i < req_num_of_bufs; i++) {
     PP_GLESBuffer_Dev buffer;
     buffer.texture_id = CreateTexture(dimensions.width, dimensions.height);
     int id = ++next_picture_buffer_id_;
     buffer.info.id= id;
     buffers.push_back(buffer);
-    bool result = buffers_by_id_.insert(std::make_pair(id, buffer)).second;
-    assert(result);
+    assert(buffers_by_id_.insert(std::make_pair(id, buffer)).second);

[scherkus (not reviewing), 2011/06/21 01:22:27]

etc

   }
   FinishGL();
   video_decoder_->AssignGLESBuffers(buffers);
 }
 
 void GLES2DemoInstance::DismissPictureBuffer(
     pp::VideoDecoder_Dev decoder, int32_t picture_buffer_id) {
   PictureBufferMap::iterator it = buffers_by_id_.find(picture_buffer_id);
   assert(it != buffers_by_id_.end());
   DeleteTexture(it->second.texture_id);
@@ skipping 38 matching lines @@
   assert(!context_->is_null());
 
   int32_t surface_attributes[] = {
     PP_GRAPHICS3DATTRIB_WIDTH, position_size_.width(),
     PP_GRAPHICS3DATTRIB_HEIGHT, position_size_.height(),
     PP_GRAPHICS3DATTRIB_NONE
   };
   surface_ = new pp::Surface3D_Dev(*this, 0, surface_attributes);
   assert(!surface_->is_null());
 
-  int32_t bind_error = context_->BindSurfaces(*surface_, *surface_);
-  assert(!bind_error);
+  assert(!context_->BindSurfaces(*surface_, *surface_));
 
   // Set viewport window size and clear color bit.
   gles2_if_->Clear(context_->pp_resource(), GL_COLOR_BUFFER_BIT);
   gles2_if_->Viewport(context_->pp_resource(), 0, 0,
                       position_size_.width(), position_size_.height());
 
-  bool success = BindGraphics(*surface_);
-  assert(success);
+  assert(BindGraphics(*surface_));
   assertNoGLError();
 
   CreateGLObjects();
 
   FinishGL();
 }
 
 void GLES2DemoInstance::Render(const PP_GLESBuffer_Dev& buffer) {
   if (is_painting_) {
     // We are dropping frames if we don't render fast enough -
     // that is why sometimes the last frame rendered is < 249.
     if (video_decoder_) {
       FinishGL();
       video_decoder_->ReusePictureBuffer(buffer.info.id);
     }
     return;
   }
   is_painting_ = true;
   gles2_if_->ActiveTexture(context_->pp_resource(), GL_TEXTURE0);
   gles2_if_->BindTexture(
       context_->pp_resource(), GL_TEXTURE_2D, buffer.texture_id);
   gles2_if_->Uniform1i(context_->pp_resource(), program_data_.tex_location, 0);
   gles2_if_->DrawArrays(context_->pp_resource(), GL_TRIANGLE_STRIP, 0, 4);
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(
           &GLES2DemoInstance::PaintFinished, buffer.info.id);
-  int32_t error = surface_->SwapBuffers(cb);
-  assert(error == PP_ERROR_WOULDBLOCK);
+  assert(surface_->SwapBuffers(cb) == PP_ERROR_WOULDBLOCK);
   assertNoGLError();
 }
 
 void GLES2DemoInstance::PaintFinished(int32_t result, int picture_buffer_id) {
   is_painting_ = false;
   FinishGL();
   if (video_decoder_)
     video_decoder_->ReusePictureBuffer(picture_buffer_id);
 }
 
@@ skipping 130 matching lines @@
   gles2_if_->DeleteShader(context_->pp_resource(), shader);
 }
 }  // anonymous namespace
 
 namespace pp {
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new GLES2DemoModule();
 }
 }  // namespace pp