Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4.

webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc

 // 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.
 
 #include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
@@ skipping 110 matching lines @@
 
   for (int i = 0; i < rows; ++i) {
     const int source_offset = i * source_stride;
     const int target_offset = i * target_stride;
     memcpy(target + target_offset,
            source + source_offset,
            copy_bytes_per_row);
   }
 }
 
-FFmpegCdmVideoDecoder::FFmpegCdmVideoDecoder(cdm::Allocator* allocator)
+FFmpegCdmVideoDecoder::FFmpegCdmVideoDecoder(cdm::Host* host)
     : codec_context_(NULL),
       av_frame_(NULL),
       is_initialized_(false),
-      allocator_(allocator) {
+      host_(host) {
 }
 
 FFmpegCdmVideoDecoder::~FFmpegCdmVideoDecoder() {
   ReleaseFFmpegResources();
 }
 
 bool FFmpegCdmVideoDecoder::Initialize(const cdm::VideoDecoderConfig& config) {
   DVLOG(1) << "Initialize()";
 
   if (!IsValidOutputConfig(config.format, config.coded_size)) {
@@ skipping 122 matching lines @@
   DCHECK(cdm_video_frame);
   DCHECK_EQ(av_frame_->format, PIX_FMT_YUV420P);
   DCHECK_EQ(av_frame_->width % 2, 0);
   DCHECK_EQ(av_frame_->height % 2, 0);
 
   const int y_size = av_frame_->width * av_frame_->height;
   const int uv_size = y_size / 2;
   const int space_required = y_size + (uv_size * 2);
 
   DCHECK(!cdm_video_frame->FrameBuffer());
-  cdm_video_frame->SetFrameBuffer(allocator_->Allocate(space_required));
+  cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
   if (!cdm_video_frame->FrameBuffer()) {
-    LOG(ERROR) << "CopyAvFrameTo() cdm::Allocator::Allocate failed.";
+    LOG(ERROR) << "CopyAvFrameTo() cdm::Host::Allocate failed.";
     return false;
   }
   cdm_video_frame->FrameBuffer()->SetSize(space_required);
 
   CopyPlane(av_frame_->base[cdm::VideoFrame::kYPlane],
             av_frame_->linesize[cdm::VideoFrame::kYPlane],
             av_frame_->width,
             av_frame_->height,
             av_frame_->width,
             cdm_video_frame->FrameBuffer()->Data());
@@ skipping 45 matching lines @@
     av_free(codec_context_);
     codec_context_ = NULL;
   }
   if (av_frame_) {
     av_free(av_frame_);
     av_frame_ = NULL;
   }
 }
 
 }  // namespace webkit_media