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

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

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.cc ('k') | media/mojo/services/mojo_audio_decoder_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_audio_decoder_service.h
diff --git a/media/mojo/services/mojo_audio_decoder_service.h b/media/mojo/services/mojo_audio_decoder_service.h
index 0774e9a1740e1a7ac80c8242aa06d8b0e1717386..02e24cbcbbcebdac76e9aedb4d830a7334b01874 100644
--- a/media/mojo/services/mojo_audio_decoder_service.h
+++ b/media/mojo/services/mojo_audio_decoder_service.h
@@ -21,24 +21,24 @@ namespace media {
class MediaKeys;
class MojoCdmServiceContext;
-class MojoAudioDecoderService : public interfaces::AudioDecoder {
+class MojoAudioDecoderService : public mojom::AudioDecoder {
public:
MojoAudioDecoderService(
base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
std::unique_ptr<media::AudioDecoder> decoder,
- mojo::InterfaceRequest<interfaces::AudioDecoder> request);
+ mojo::InterfaceRequest<mojom::AudioDecoder> request);
~MojoAudioDecoderService() final;
- // interfaces::AudioDecoder implementation
- void Initialize(interfaces::AudioDecoderClientPtr client,
- interfaces::AudioDecoderConfigPtr config,
+ // mojom::AudioDecoder implementation
+ void Initialize(mojom::AudioDecoderClientPtr client,
+ mojom::AudioDecoderConfigPtr config,
int32_t cdm_id,
const InitializeCallback& callback) final;
void SetDataSource(mojo::ScopedDataPipeConsumerHandle receive_pipe) final;
- void Decode(interfaces::DecoderBufferPtr buffer,
+ void Decode(mojom::DecoderBufferPtr buffer,
const DecodeCallback& callback) final;
void Reset(const ResetCallback& callback) final;
@@ -62,11 +62,11 @@ class MojoAudioDecoderService : public interfaces::AudioDecoder {
// A helper method to read and deserialize DecoderBuffer from data pipe.
// Returns empty scoped_refptr in case of an error.
scoped_refptr<DecoderBuffer> ReadDecoderBuffer(
- interfaces::DecoderBufferPtr buffer);
+ mojom::DecoderBufferPtr buffer);
// A binding represents the association between the service and the
// communication channel, i.e. the pipe.
- mojo::StrongBinding<interfaces::AudioDecoder> binding_;
+ mojo::StrongBinding<mojom::AudioDecoder> binding_;
// DataPipe for serializing the data section of DecoderBuffer.
mojo::ScopedDataPipeConsumerHandle consumer_handle_;
@@ -78,7 +78,7 @@ class MojoAudioDecoderService : public interfaces::AudioDecoder {
std::unique_ptr<media::AudioDecoder> decoder_;
// The destination for the decoded buffers.
- interfaces::AudioDecoderClientPtr client_;
+ mojom::AudioDecoderClientPtr client_;
// Hold a reference to the CDM to keep it alive for the lifetime of the
// |decoder_|. The |cdm_| owns the CdmContext which is passed to |decoder_|.
« no previous file with comments | « media/mojo/services/mojo_audio_decoder.cc ('k') | media/mojo/services/mojo_audio_decoder_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698