Plumb texture target to VideoDecodeAccelerator::Client

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>
@@ skipping 42 matching lines @@
   // pp::Graphics3DClient implementation.
   virtual void Graphics3DContextLost() {
     // TODO(vrk/fischman): Properly reset after a lost graphics context.  In
     // particular need to delete context_ and re-create textures.
     // Probably have to recreate the decoder from scratch, because old textures
     // can still be outstanding in the decoder!
     assert(!"Unexpectedly lost graphics context");
   }
 
   // pp::VideoDecoderClient_Dev implementation.
-  virtual void ProvidePictureBuffers(PP_Resource decoder,
-                                     uint32_t req_num_of_bufs,
-                                     const PP_Size& dimensions);
+  virtual void ProvidePictureBuffers(
+      PP_Resource decoder,
+      uint32_t req_num_of_bufs,
+      const PP_Size& dimensions,
+      PP_VideoDecoder_TextureTarget_Dev texture_target);
   virtual void DismissPictureBuffer(PP_Resource decoder,
                                     int32_t picture_buffer_id);
   virtual void PictureReady(PP_Resource decoder, const PP_Picture_Dev& picture);
   virtual void NotifyError(PP_Resource decoder, PP_VideoDecodeError_Dev error);
 
  private:
   enum { kNumConcurrentDecodes = 7,
          kNumDecoders = 2 };  // Baked into viewport rendering.
 
   // A single decoder's client interface.
   class DecoderClient {
    public:
     DecoderClient(VideoDecodeDemoInstance* gles2,
                   pp::VideoDecoder_Dev* decoder);
     ~DecoderClient();
 
     void DecodeNextNALUs();
 
     // Per-decoder implementation of part of pp::VideoDecoderClient_Dev.
-    void ProvidePictureBuffers(uint32_t req_num_of_bufs,
-                               PP_Size dimensions);
+    void ProvidePictureBuffers(
+        uint32_t req_num_of_bufs,
+        PP_Size dimensions,
+        PP_VideoDecoder_TextureTarget_Dev texture_target);
     void DismissPictureBuffer(int32_t picture_buffer_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);
@@ skipping 219 matching lines @@
 
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(
           &VideoDecodeDemoInstance::DecoderClient::DecoderBitstreamDone, id);
   assert(bitstream_ids_at_decoder_.insert(id).second);
   encoded_data_next_pos_to_decode_ = end_pos;
   decoder_->Decode(bitstream_buffer, cb);
 }
 
 void VideoDecodeDemoInstance::ProvidePictureBuffers(
-    PP_Resource decoder, uint32_t req_num_of_bufs, const PP_Size& dimensions) {
+    PP_Resource decoder,
+    uint32_t req_num_of_bufs,
+    const PP_Size& dimensions,
+    PP_VideoDecoder_TextureTarget_Dev texture_target) {
   DecoderClient* client = video_decoders_[decoder];
   assert(client);
-  client->ProvidePictureBuffers(req_num_of_bufs, dimensions);
+  client->ProvidePictureBuffers(req_num_of_bufs, dimensions, texture_target);
 }
 
 void VideoDecodeDemoInstance::DecoderClient::ProvidePictureBuffers(
-    uint32_t req_num_of_bufs, PP_Size dimensions) {
+    uint32_t req_num_of_bufs,
+    PP_Size dimensions,
+    PP_VideoDecoder_TextureTarget_Dev texture_target) {
+  // TODO(sail): Add support for ARB texture types.

[Ami GONE FROM CHROMIUM, 2012/05/23 23:42:33]

Can you do this as part of this CL?

[sail, 2012/05/29 18:58:09]

This part is implemented in this CL:
http://codereview.chromium.org/10411042/

I'd like to keep the change in a separate CL. If feel strongly that this
shouldn't be submitted like this then maybe I can wait for both to get an LGTM
and submit a single patch?

+  assert(texture_target == PP_VIDEODECODER_TEXTURE_TARGET_2D);
   std::vector<PP_PictureBuffer_Dev> buffers;
   for (uint32_t i = 0; i < req_num_of_bufs; ++i) {
     PP_PictureBuffer_Dev buffer;
     buffer.size = dimensions;
     buffer.texture_id =
         gles2_->CreateTexture(dimensions.width, dimensions.height);
     int id = ++next_picture_buffer_id_;
     buffer.id = id;
     buffers.push_back(buffer);
     assert(picture_buffers_by_id_.insert(std::make_pair(id, buffer)).second);
@@ skipping 234 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 VideoDecodeDemoModule();
 }
 }  // namespace pp