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

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

Issue 1977173002: Rename media::interfaces to media::mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + chromeos files 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
« no previous file with comments | « media/mojo/services/mojo_audio_decoder.h ('k') | media/mojo/services/mojo_audio_decoder_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_audio_decoder.cc
diff --git a/media/mojo/services/mojo_audio_decoder.cc b/media/mojo/services/mojo_audio_decoder.cc
index 1e8938c785f15c5d20e4c89d329fdba7763933fb..c80300aef1eb79a827ad47cfdabdf6f9e61e5938 100644
--- a/media/mojo/services/mojo_audio_decoder.cc
+++ b/media/mojo/services/mojo_audio_decoder.cc
@@ -19,7 +19,7 @@ namespace media {
MojoAudioDecoder::MojoAudioDecoder(
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- interfaces::AudioDecoderPtr remote_decoder)
+ mojom::AudioDecoderPtr remote_decoder)
: task_runner_(task_runner),
remote_decoder_info_(remote_decoder.PassInterface()),
binding_(this),
@@ -75,7 +75,7 @@ void MojoAudioDecoder::Initialize(const AudioDecoderConfig& config,
// and the callback won't be dispatched if |remote_decoder_| is destroyed.
remote_decoder_->Initialize(
binding_.CreateInterfacePtrAndBind(),
- interfaces::AudioDecoderConfig::From(config), cdm_id,
+ mojom::AudioDecoderConfig::From(config), cdm_id,
base::Bind(&MojoAudioDecoder::OnInitialized, base::Unretained(this)));
}
@@ -126,7 +126,7 @@ bool MojoAudioDecoder::NeedsBitstreamConversion() const {
return needs_bitstream_conversion_;
}
-void MojoAudioDecoder::OnBufferDecoded(interfaces::AudioBufferPtr buffer) {
+void MojoAudioDecoder::OnBufferDecoded(mojom::AudioBufferPtr buffer) {
DVLOG(1) << __FUNCTION__;
DCHECK(task_runner_->BelongsToCurrentThread());
@@ -164,13 +164,13 @@ void MojoAudioDecoder::OnInitialized(bool success,
}
static media::DecodeStatus ConvertDecodeStatus(
- interfaces::AudioDecoder::DecodeStatus status) {
+ mojom::AudioDecoder::DecodeStatus status) {
switch (status) {
- case interfaces::AudioDecoder::DecodeStatus::OK:
+ case mojom::AudioDecoder::DecodeStatus::OK:
return media::DecodeStatus::OK;
- case interfaces::AudioDecoder::DecodeStatus::ABORTED:
+ case mojom::AudioDecoder::DecodeStatus::ABORTED:
return media::DecodeStatus::ABORTED;
- case interfaces::AudioDecoder::DecodeStatus::DECODE_ERROR:
+ case mojom::AudioDecoder::DecodeStatus::DECODE_ERROR:
return media::DecodeStatus::DECODE_ERROR;
}
NOTREACHED();
@@ -178,7 +178,7 @@ static media::DecodeStatus ConvertDecodeStatus(
}
void MojoAudioDecoder::OnDecodeStatus(
- interfaces::AudioDecoder::DecodeStatus status) {
+ mojom::AudioDecoder::DecodeStatus status) {
DVLOG(1) << __FUNCTION__ << ": status:" << status;
DCHECK(task_runner_->BelongsToCurrentThread());
@@ -214,10 +214,9 @@ void MojoAudioDecoder::CreateDataPipe() {
remote_decoder_->SetDataSource(std::move(write_pipe.consumer_handle));
}
-interfaces::DecoderBufferPtr MojoAudioDecoder::TransferDecoderBuffer(
+mojom::DecoderBufferPtr MojoAudioDecoder::TransferDecoderBuffer(
const scoped_refptr<DecoderBuffer>& media_buffer) {
- interfaces::DecoderBufferPtr buffer =
- interfaces::DecoderBuffer::From(media_buffer);
+ mojom::DecoderBufferPtr buffer = mojom::DecoderBuffer::From(media_buffer);
if (media_buffer->end_of_stream())
return buffer;
« no previous file with comments | « media/mojo/services/mojo_audio_decoder.h ('k') | media/mojo/services/mojo_audio_decoder_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698