summaryrefslogtreecommitdiffstats
path: root/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc')
-rw-r--r--webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc b/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
index f06b729..ef12c22 100644
--- a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
+++ b/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
@@ -50,9 +50,9 @@ static void CopyPlane(const uint8_t* source,
}
#endif // USE_COPYPLANE_WITH_LIBVPX
-LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Allocator* allocator)
+LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Host* host)
: is_initialized_(false),
- allocator_(allocator),
+ host_(host),
vpx_codec_(NULL),
vpx_image_(NULL) {
}
@@ -175,9 +175,9 @@ bool LibvpxCdmVideoDecoder::CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame) {
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) << "CopyVpxImageTo() cdm::Allocator::Allocate failed.";
+ LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
return false;
}
cdm_video_frame->FrameBuffer()->SetSize(space_required);
@@ -228,9 +228,9 @@ bool LibvpxCdmVideoDecoder::CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame) {
const int space_required = y_size + u_size + v_size;
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) << "CopyVpxImageTo() cdm::Allocator::Allocate failed.";
+ LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
return false;
}
cdm_video_frame->FrameBuffer()->SetSize(space_required);