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

Unified Diff: media/mojo/services/mojo_decryptor_service.cc

Issue 2411573002: media: Use new wrapper types for media mojo interfaces (Closed)
Patch Set: comments addressed Created 4 years, 2 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
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_provision_fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_decryptor_service.cc
diff --git a/media/mojo/services/mojo_decryptor_service.cc b/media/mojo/services/mojo_decryptor_service.cc
index 8d3ab71f8b50573ce17cffaab138902c2ebf3a2e..f8c484e60c0523230423742f55565ffbc3220919 100644
--- a/media/mojo/services/mojo_decryptor_service.cc
+++ b/media/mojo/services/mojo_decryptor_service.cc
@@ -98,7 +98,8 @@ void MojoDecryptorService::DecryptAndDecodeAudio(
scoped_refptr<DecoderBuffer> media_buffer =
mojo_decoder_buffer_reader_->ReadDecoderBuffer(encrypted);
if (!media_buffer) {
- callback.Run(Status::DECRYPTION_ERROR, nullptr);
+ callback.Run(Status::DECRYPTION_ERROR,
+ std::vector<mojom::AudioBufferPtr>());
return;
}
@@ -190,7 +191,7 @@ void MojoDecryptorService::OnAudioDecoded(
<< status << ")";
DVLOG_IF(3, status == media::Decryptor::kSuccess) << __FUNCTION__;
- mojo::Array<mojom::AudioBufferPtr> audio_buffers;
+ std::vector<mojom::AudioBufferPtr> audio_buffers;
for (const auto& frame : frames)
audio_buffers.push_back(mojom::AudioBuffer::From(frame));
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_provision_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698