Pepper: Add VP9 support to PPB_VideoDecoder API.

content/renderer/pepper/video_decoder_shim.cc

 // Copyright 2014 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 "content/renderer/pepper/video_decoder_shim.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/pepper/pepper_video_decoder_host.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/limits.h"
 #include "media/base/video_decoder.h"
 #include "media/filters/ffmpeg_video_decoder.h"
+#include "media/filters/vpx_video_decoder.h"
 #include "media/video/picture.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ppapi/c/pp_errors.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "webkit/common/gpu/context_provider_web_context.h"
 
 namespace content {
 
 struct VideoDecoderShim::PendingDecode {
   PendingDecode(uint32_t decode_id,
@@ skipping 86 matching lines @@
       decode_id_(0) {
 }
 
 VideoDecoderShim::DecoderImpl::~DecoderImpl() {
   DCHECK(pending_decodes_.empty());
 }
 
 void VideoDecoderShim::DecoderImpl::Initialize(
     media::VideoDecoderConfig config) {
   DCHECK(!decoder_);
-  scoped_ptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder(
-      new media::FFmpegVideoDecoder(base::MessageLoopProxy::current()));
-  ffmpeg_video_decoder->set_decode_nalus(true);
-  decoder_ = ffmpeg_video_decoder.Pass();
+  if (config.codec() == media::kCodecVP9) {
+    decoder_.reset(
+        new media::VpxVideoDecoder(base::MessageLoopProxy::current()));
+  } else {
+    scoped_ptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder(
+        new media::FFmpegVideoDecoder(base::MessageLoopProxy::current()));
+    ffmpeg_video_decoder->set_decode_nalus(true);
+    decoder_ = ffmpeg_video_decoder.Pass();
+  }
   max_decodes_at_decoder_ = decoder_->GetMaxDecodeRequests();
   // We can use base::Unretained() safely in decoder callbacks because we call
   // VideoDecoder::Stop() before deletion. Stop() guarantees there will be no
   // outstanding callbacks after it returns.
   decoder_->Initialize(
       config,
       true /* low_delay */,
       base::Bind(&VideoDecoderShim::DecoderImpl::OnPipelineStatus,
                  base::Unretained(this)),
       base::Bind(&VideoDecoderShim::DecoderImpl::OnOutputComplete,
@@ skipping 176 matching lines @@
     media::VideoCodecProfile profile,
     media::VideoDecodeAccelerator::Client* client) {
   DCHECK_EQ(client, host_);
   DCHECK(RenderThreadImpl::current());
   DCHECK_EQ(state_, UNINITIALIZED);
   media::VideoCodec codec = media::kUnknownVideoCodec;
   if (profile <= media::H264PROFILE_MAX)
     codec = media::kCodecH264;
   else if (profile <= media::VP8PROFILE_MAX)
     codec = media::kCodecVP8;
+  else if (profile <= media::VP9PROFILE_MAX)
+    codec = media::kCodecVP9;
   DCHECK_NE(codec, media::kUnknownVideoCodec);
 
   media::VideoDecoderConfig config(
       codec,
       profile,
       media::VideoFrame::YV12,
       gfx::Size(32, 24),  // Small sizes that won't fail.
       gfx::Rect(32, 24),
       gfx::Size(32, 24),
       NULL /* extra_data */,  // TODO(bbudge) Verify this isn't needed.
@@ skipping 241 matching lines @@
 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   gles2->DeleteTextures(1, &texture_id);
 }
 
 void VideoDecoderShim::FlushCommandBuffer() {
   context_provider_->ContextGL()->Flush();
 }
 
 }  // namespace content