Motown: Change media type (stream type) representation

services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc

Index: services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc
diff --git a/services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc b/services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc
index 7c341dc4f094b36231498534cd6a147e71c522de..39316badae4a1cc441b4b6918dcf10cd7541b777 100644
--- a/services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc
+++ b/services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc
@@ -20,7 +20,7 @@ FfmpegAudioDecoder::FfmpegAudioDecoder(AvCodecContextPtr av_codec_context)
   if (av_sample_fmt_is_planar(context()->sample_fmt)) {
     // Prepare for interleaving.
     stream_type_ = output_stream_type();
-    lpcm_util_ = LpcmUtil::Create(*stream_type_->lpcm());
+    lpcm_util_ = LpcmUtil::Create(*stream_type_->audio());
   }
 }
 
@@ -87,8 +87,8 @@ PacketPtr FfmpegAudioDecoder::CreateOutputPacket(const AVFrame& av_frame,
     // later in ReleaseBufferForAvFrame. We need a new buffer for the
     // interleaved frames, which we get from the provided allocator.
     DCHECK(stream_type_);
-    DCHECK(stream_type_->lpcm());
-    payload_size = stream_type_->lpcm()->min_buffer_size(av_frame.nb_samples);
+    DCHECK(stream_type_->audio());
+    payload_size = stream_type_->audio()->min_buffer_size(av_frame.nb_samples);
     payload_buffer = allocator->AllocatePayloadBuffer(payload_size);
 
     lpcm_util_->Interleave(av_buffer_context->buffer(),