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

Unified Diff: webkit/media/crypto/ppapi/ffmpeg_cdm_audio_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/ffmpeg_cdm_audio_decoder.cc
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc b/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
index eba597d9e3037a12cd80b2e4e592ce07a087b90d..0c097b358e5c720c19af0d2b606714219fc5192a 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
+++ b/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
@@ -80,9 +80,9 @@ static void CdmAudioDecoderConfigToAVCodecContext(
}
}
-FFmpegCdmAudioDecoder::FFmpegCdmAudioDecoder(cdm::Allocator* allocator)
+FFmpegCdmAudioDecoder::FFmpegCdmAudioDecoder(cdm::Host* host)
: is_initialized_(false),
- allocator_(allocator),
+ host_(host),
codec_context_(NULL),
av_frame_(NULL),
bits_per_channel_(0),
@@ -351,9 +351,9 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
if (!serialized_audio_frames_.empty()) {
decoded_frames->SetFrameBuffer(
- allocator_->Allocate(serialized_audio_frames_.size()));
+ host_->Allocate(serialized_audio_frames_.size()));
if (!decoded_frames->FrameBuffer()) {
- LOG(ERROR) << "DecodeBuffer() cdm::Allocator::Allocate failed.";
+ LOG(ERROR) << "DecodeBuffer() cdm::Host::Allocate failed.";
return cdm::kDecodeError;
}
memcpy(decoded_frames->FrameBuffer()->Data(),

Powered by Google App Engine
This is Rietveld 408576698