Re-added decoder id to PPP_VideoDecoder_Dev methods

This supports having multiple decoders per PP_Instance, which was removed as
part of 92704.

BUG=none
TEST=gles2 works, trybots

Review URL: http://codereview.chromium.org/7489012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93691 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/ppapi/cpp/dev/video_decoder_client_dev.h b/ppapi/cpp/dev/video_decoder_client_dev.h
index 3d1a96b..5249fed 100644
--- a/ppapi/cpp/dev/video_decoder_client_dev.h
+++ b/ppapi/cpp/dev/video_decoder_client_dev.h
@@ -23,23 +23,26 @@ class VideoDecoderClient_Dev {
   virtual ~VideoDecoderClient_Dev();
 
   // Callback to provide buffers for the decoded output pictures.
-  virtual void ProvidePictureBuffers(
-      uint32_t req_num_of_bufs,
-      struct PP_Size dimensions) = 0;
+  virtual void ProvidePictureBuffers(PP_Resource decoder,
+                                     uint32_t req_num_of_bufs,
+                                     struct PP_Size dimensions) = 0;
 
   // Callback for decoder to deliver unneeded picture buffers back to the
   // plugin.
-  virtual void DismissPictureBuffer(int32_t picture_buffer_id) = 0;
+  virtual void DismissPictureBuffer(PP_Resource decoder,
+                                    int32_t picture_buffer_id) = 0;
 
   // Callback to deliver decoded pictures ready to be displayed.
-  virtual void PictureReady(const PP_Picture_Dev& picture) = 0;
+  virtual void PictureReady(PP_Resource decoder,
+                            const PP_Picture_Dev& picture) = 0;
 
   // Callback to notify that decoder has decoded end of stream marker and has
   // outputted all displayable pictures.
-  virtual void EndOfStream() = 0;
+  virtual void EndOfStream(PP_Resource decoder) = 0;
 
   // Callback to notify about decoding errors.
-  virtual void NotifyError(PP_VideoDecodeError_Dev error) = 0;
+  virtual void NotifyError(PP_Resource decoder,
+                           PP_VideoDecodeError_Dev error) = 0;
 
  private:
   Instance* associated_instance_;