media: Enabling direct rendering for VP9

media/filters/vpx_video_decoder.h

Index: media/filters/vpx_video_decoder.h
diff --git a/media/filters/vpx_video_decoder.h b/media/filters/vpx_video_decoder.h
index cc02e89aad0b57027818b3f1702c8f8d5e9f2669..e27ebba67f0f0af99b491c2df14c55d187fcc498 100644
--- a/media/filters/vpx_video_decoder.h
+++ b/media/filters/vpx_video_decoder.h
@@ -14,6 +14,7 @@
 #include "media/base/video_frame_pool.h"
 
 struct vpx_codec_ctx;
+struct vpx_codec_frame_buffer;
 struct vpx_image;
 
 namespace base {
@@ -41,6 +42,15 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder {
   virtual void Stop(const base::Closure& closure) OVERRIDE;
   virtual bool HasAlpha() const OVERRIDE;
 
+  // Callback that will be called by libvpx if the frame buffer size needs to
+  // increase. Parameters:
+  // user_priv  Data passed into libvpx (we pass NULL).
+  // new_size   Minimum size needed by libvpx to decompress the next frame.
+  // fb         Pointer to the frame buffer to update.
+  // Returns VPX_CODEC_OK on success. Returns < 0 on failure.
+  static int32 ReallocVP9FrameBuffer(void *user_priv, size_t new_size,
+                                     vpx_codec_frame_buffer *fb);

[fgalligan1, 2013/12/16 19:38:43]

'*' should be next to the type in this file (I know in libvpx it is the other
way)

[vignesh, 2013/12/16 21:10:57]

Done.

+
  private:
   enum DecoderState {
     kUninitialized,
@@ -50,6 +60,11 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder {
     kError
   };
 
+  // Maximum number of frame buffers allowed to be used by libvpx for VP9
+  // decoding. 8 (libvpx reference buffers) + 4 (gitter buffers) + 1 (work

[fgalligan1, 2013/12/16 19:38:43]

jitter

[vignesh, 2013/12/16 21:10:57]

whoops. done.

+  // buffer) = 13.
+  const int kVP9MaxFrameBuffers = 13;
+
   // Handles (re-)initializing the decoder with a (new) config.
   // Returns true when initialization was successful.
   bool ConfigureDecoder(const VideoDecoderConfig& config);
@@ -83,6 +98,9 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder {
 
   VideoFramePool frame_pool_;
 
+  // Frame Buffers used for VP9 decoding.
+  vpx_codec_frame_buffer* frame_buffers_;
+
   DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder);
 };