Add a libvpx video decoder to ClearKeyCdm and move the fake video decoder to its own class.

webkit/media/crypto/ppapi/cdm_video_decoder.h

+// 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.
+
+#ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+#define WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"

[ddorwin, 2012/11/17 02:56:22]

Why is this needed?

[Tom Finegan, 2012/11/17 04:35:06]

Done.

+#include "base/memory/scoped_ptr.h"
+#include "webkit/media/crypto/ppapi/content_decryption_module.h"
+
+namespace webkit_media {

[ddorwin, 2012/11/17 02:56:22]

Should this be in a cdm namespace instead? It's not really WK.

[Tom Finegan, 2012/11/17 04:35:06]

All of the decoder wrappers are in webkit_media. I think all would need to be
changed if we're changing the base class namespace. If we're going to do that, I
would prefer to leave it for another CL. SG?

[ddorwin, 2012/12/04 04:22:37]

SG. Please add a TODO or story. Either is fine.

[Tom Finegan, 2012/12/04 20:59:40]

Done. (added story)

+
+class CdmVideoDecoder {
+ public:
+  virtual ~CdmVideoDecoder() {}
+  virtual bool Initialize(const cdm::VideoDecoderConfig& config) = 0;
+  virtual void Deinitialize() = 0;
+  virtual void Reset() = 0;
+
+  // Decodes |compressed_frame|. Stores output frame in |decoded_frame| and
+  // returns |cdm::kSuccess| when an output frame is available. Returns
+  // |cdm::kNeedMoreData| when |compressed_frame| does not produce an output
+  // frame. Returns |cdm::kDecodeError| when decoding fails.
+  virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,
+                                  int32_t compressed_frame_size,
+                                  int64_t timestamp,
+                                  cdm::VideoFrame* decoded_frame) = 0;
+};
+
+// Initializes appropriate video decoder based on GYP flags and the value of
+// |config.codec|. Returns a scoped_ptr containing a non-null initialized
+// CdmVideoDecoder* upon success.
+scoped_ptr<CdmVideoDecoder> InitializeVideoDecoder(
+    cdm::Allocator* allocator,
+    const cdm::VideoDecoderConfig& config);
+
+}  // namespace webkit_media
+
+#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_