Clean up video frame sizes, types in Video Decode API

media/video/video_decode_accelerator.h

 // 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.
 
 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 164 matching lines @@
     VIDEODECODERERROR_UNINITIALIZED,
     VIDEODECODERERROR_UNSUPPORTED,
     VIDEODECODERERROR_INVALIDINPUT,
     VIDEODECODERERROR_MEMFAILURE,
     VIDEODECODERERROR_INSUFFICIENT_BUFFERS,
     VIDEODECODERERROR_INSUFFICIENT_RESOURCES,
     VIDEODECODERERROR_HARDWARE,
     VIDEODECODERERROR_UNEXPECTED_FLUSH,
   };
 
-  // Represents the type of data buffer to be used by the decoder.
-  enum MemoryType {
-    PICTUREBUFFER_MEMORYTYPE_NONE = 0,
-    PICTUREBUFFER_MEMORYTYPE_SYSTEM,
-    PICTUREBUFFER_MEMORYTYPE_GL_TEXTURE,
-  };
-
   // Interface for collaborating with picture interface to provide memory for
   // output picture and blitting them.
   // This interface is extended by the various layers that relay messages back
   // to the plugin, through the PPP_VideoDecode_Dev interface the plugin
   // implements.
   class Client {
    public:
     virtual ~Client() {}
 
     // Callback to notify client that decoder has been initialized.
     virtual void NotifyInitializeDone() = 0;
 
-    // Callback to tell the information needed by the client to provide decoding
-    // buffer to the decoder.
+    // Callback to tell client how many and what size of buffers to provide.
     virtual void ProvidePictureBuffers(
-        uint32 requested_num_of_buffers,
-        const gfx::Size& dimensions,
-        MemoryType type) = 0;
+        uint32 requested_num_of_buffers, const gfx::Size& dimensions) = 0;
 
     // Callback to dismiss picture buffer that was assigned earlier.
     virtual void DismissPictureBuffer(int32 picture_buffer_id) = 0;
 
     // Callback to deliver decoded pictures ready to be displayed.
     virtual void PictureReady(const Picture& picture) = 0;
 
     // Callback to notify that decoder has decoded end of stream marker and has
     // outputted all displayable pictures.
     virtual void NotifyEndOfStream() = 0;
@@ skipping 29 matching lines @@
   virtual void Decode(const BitstreamBuffer& bitstream_buffer) = 0;
 
   // Assigns a set of texture-backed picture buffers to the video decoder.
   //
   // Ownership of each picture buffer remains with the client, but the client
   // is not allowed to deallocate the buffer before the DismissPictureBuffer
   // callback has been initiated for a given buffer.
   //
   // Parameters:
   //  |buffers| contains the allocated picture buffers for the output.
-  virtual void AssignGLESBuffers(const std::vector<GLESBuffer>& buffers) = 0;
+  virtual void AssignPictureBuffers(
+      const std::vector<PictureBuffer>& buffers) = 0;
 
   // Sends picture buffers to be reused by the decoder. This needs to be called
   // for each buffer that has been processed so that decoder may know onto which
   // picture buffers it can write the output to.
   //
   // Parameters:
   //  |picture_buffer_id| id of the picture buffer that is to be reused.
   virtual void ReusePictureBuffer(int32 picture_buffer_id) = 0;
 
   // Flushes the decoder: all pending inputs will be decoded and pictures handed
@@ skipping 14 matching lines @@
   virtual void Destroy() = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<VideoDecodeAccelerator>;
   virtual ~VideoDecodeAccelerator();
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_