Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc

Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged ddorwin's CL (https://codereview.chromium.org/12221102/) Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc
diff --git a/webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc b/webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc
index 665f9c77ec63b90e3bb668ff4de2609f306270db..62d3383c2f5ea79972eda6569b2c92ccbceaa712 100644
--- a/webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc
+++ b/webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc
@@ -9,9 +9,9 @@
namespace webkit_media {
-FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Allocator* allocator)
+FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Host* host)
: is_initialized_(false),
- allocator_(allocator) {
+ host_(host) {
}
FakeCdmVideoDecoder::~FakeCdmVideoDecoder() {
@@ -67,7 +67,7 @@ cdm::Status FakeCdmVideoDecoder::DecodeFrame(const uint8_t* compressed_frame,
int u_offset = v_offset + uv_stride * uv_rows + kPlanePadding;
int frame_size = u_offset + uv_stride * uv_rows + kPlanePadding;
- decoded_frame->SetFrameBuffer(allocator_->Allocate(frame_size));
+ decoded_frame->SetFrameBuffer(host_->Allocate(frame_size));
decoded_frame->FrameBuffer()->SetSize(frame_size);
decoded_frame->SetFormat(cdm::kYv12);

Powered by Google App Engine
This is Rietveld 408576698