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

Unified Diff: services/media/factory_service/media_player_impl.cc

Issue 1902183002: Motown: Change media type (stream type) representation (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Changes per review feedback. Created 4 years, 8 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: services/media/factory_service/media_player_impl.cc
diff --git a/services/media/factory_service/media_player_impl.cc b/services/media/factory_service/media_player_impl.cc
index 69c4f4ee96bc0546cdfcbdeb6512ba846a98a887..82625ec0bab2efed4588c7e0f5fa69f38df51de3 100644
--- a/services/media/factory_service/media_player_impl.cc
+++ b/services/media/factory_service/media_player_impl.cc
@@ -53,9 +53,8 @@ MediaPlayerImpl::MediaPlayerImpl(InterfaceHandle<SeekingReader> reader,
streams_.push_back(std::unique_ptr<Stream>(
new Stream(streams_.size(), stream_type.Pass())));
Stream& stream = *streams_.back();
- switch (stream.media_type_->scheme) {
- case MediaTypeScheme::COMPRESSED_AUDIO:
- case MediaTypeScheme::LPCM:
+ switch (stream.media_type_->medium) {
+ case MediaTypeMedium::AUDIO:
stream.enabled_ = true;
PrepareStream(streams_.back(), "mojo:audio_server",
callback_joiner->NewCallback());
@@ -256,7 +255,7 @@ void MediaPlayerImpl::PrepareStream(const std::unique_ptr<Stream>& stream,
demux_->GetProducer(stream->index_, GetProxy(&stream->encoded_producer_));
- if (stream->media_type_->scheme == MediaTypeScheme::COMPRESSED_AUDIO) {
+ if (stream->media_type_->encoding != MediaType::kAudioEncodingLpcm) {
std::shared_ptr<CallbackJoiner> callback_joiner = CallbackJoiner::Create();
// Compressed audio. Insert a decoder in front of the sink. The sink would
@@ -287,7 +286,6 @@ void MediaPlayerImpl::PrepareStream(const std::unique_ptr<Stream>& stream,
// Uncompressed audio. Connect the demux stream directly to the sink. This
// would work for compressed audio as well (the sink would decode), but we
// want to test the decoder.
- DCHECK(stream->media_type_->scheme == MediaTypeScheme::LPCM);
stream->decoded_producer_ = stream->encoded_producer_.Pass();
CreateSink(stream, stream->media_type_, url, callback);
}
« no previous file with comments | « services/media/factory_service/media_demux_impl.cc ('k') | services/media/factory_service/media_sink_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698