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

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

Issue 1899363002: Finish plumbing MojoVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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: media/mojo/services/mojo_audio_decoder_service.cc
diff --git a/media/mojo/services/mojo_audio_decoder_service.cc b/media/mojo/services/mojo_audio_decoder_service.cc
index dc01e3451aca6740665f583c61afd2ced553af21..13b3a309e16936e522cc6b24dfb6ec83df93b9ca 100644
--- a/media/mojo/services/mojo_audio_decoder_service.cc
+++ b/media/mojo/services/mojo_audio_decoder_service.cc
@@ -14,20 +14,6 @@
namespace media {
-static interfaces::AudioDecoder::DecodeStatus ConvertDecodeStatus(
- media::DecodeStatus status) {
- switch (status) {
- case media::DecodeStatus::OK:
- return interfaces::AudioDecoder::DecodeStatus::OK;
- case media::DecodeStatus::ABORTED:
- return interfaces::AudioDecoder::DecodeStatus::ABORTED;
- case media::DecodeStatus::DECODE_ERROR:
- return interfaces::AudioDecoder::DecodeStatus::DECODE_ERROR;
- }
- NOTREACHED();
- return interfaces::AudioDecoder::DecodeStatus::DECODE_ERROR;
-}
-
MojoAudioDecoderService::MojoAudioDecoderService(
base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
std::unique_ptr<media::AudioDecoder> decoder,
@@ -96,7 +82,7 @@ void MojoAudioDecoderService::Decode(interfaces::DecoderBufferPtr buffer,
scoped_refptr<DecoderBuffer> media_buffer =
ReadDecoderBuffer(std::move(buffer));
if (!media_buffer) {
- callback.Run(ConvertDecodeStatus(media::DecodeStatus::DECODE_ERROR));
+ callback.Run(interfaces::DecodeStatus::DECODE_ERROR);
return;
}
@@ -128,7 +114,7 @@ void MojoAudioDecoderService::OnInitialized(const InitializeCallback& callback,
void MojoAudioDecoderService::OnDecodeStatus(const DecodeCallback& callback,
media::DecodeStatus status) {
DVLOG(3) << __FUNCTION__ << " status:" << status;
- callback.Run(ConvertDecodeStatus(status));
+ callback.Run(static_cast<interfaces::DecodeStatus>(status));
}
void MojoAudioDecoderService::OnResetDone(const ResetCallback& callback) {

Powered by Google App Engine
This is Rietveld 408576698