Motown: Change media type (stream type) representation

services/media/framework_ffmpeg/ffmpeg_audio_decoder.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "services/media/framework_ffmpeg/ffmpeg_audio_decoder.h"
 
 namespace mojo {
 namespace media {
 
 FfmpegAudioDecoder::FfmpegAudioDecoder(AvCodecContextPtr av_codec_context)
     : FfmpegDecoderBase(std::move(av_codec_context)) {
   DCHECK(context());
   DCHECK(context()->channels > 0);
 
   context()->opaque = this;
   context()->get_buffer2 = AllocateBufferForAvFrame;
   context()->refcounted_frames = 1;
 
   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());
   }
 }
 
 FfmpegAudioDecoder::~FfmpegAudioDecoder() {}
 
 void FfmpegAudioDecoder::Flush() {
   FfmpegDecoderBase::Flush();
   next_pts_ = Packet::kUnknownPts;
 }
 
@@ skipping 46 matching lines @@
 
   AvBufferContext* av_buffer_context =
       reinterpret_cast<AvBufferContext*>(av_buffer_get_opaque(av_frame.buf[0]));
 
   if (lpcm_util_) {
     // We need to interleave. The non-interleaved frames are in a buffer that
     // was allocated from the default allocator. That buffer will get released
     // 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(),
                            av_buffer_context->size(), payload_buffer,
                            av_frame.nb_samples);
   } else {
     // We don't need to interleave. The interleaved frames are in a buffer that
     // was allocated from the correct allocator. We take ownership of the buffer
     // by calling Release here so that ReleaseBufferForAvFrame won't release it.
     payload_size = av_buffer_context->size();
@@ skipping 91 matching lines @@
   DCHECK(av_buffer_context);
   // Either this buffer has already been released to someone else's ownership,
   // or it's the same as the buffer parameter.
   DCHECK(av_buffer_context->buffer() == nullptr ||
          av_buffer_context->buffer() == buffer);
   delete av_buffer_context;
 }
 
 }  // namespace media
 }  // namespace mojo