Add callback in VideoDecoder and AudioDecoder to return decoded frames.

media/filters/decoder_stream_traits.cc

 // Copyright 2014 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 "media/filters/decoder_stream_traits.h"
 
 #include "base/logging.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 std::string DecoderStreamTraits<DemuxerStream::AUDIO>::ToString() {
   return "Audio";
 }
 
 void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize(
     DecoderType* decoder,
     const DecoderConfigType& config,
     bool low_delay,
-    const PipelineStatusCB& status_cb) {
-  decoder->Initialize(config, status_cb);
+    const PipelineStatusCB& status_cb,
+    const OutputCB& output_cb) {
+  decoder->Initialize(config, status_cb, output_cb);
 }
 
 bool DecoderStreamTraits<DemuxerStream::AUDIO>::FinishInitialization(
     const StreamInitCB& init_cb,
     DecoderType* decoder,
     DemuxerStream* stream) {
   DCHECK(stream);
   if (!decoder) {
     init_cb.Run(false);
     return false;
@@ skipping 17 matching lines @@
 }
 
 std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() {
   return "Video";
 }
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize(
     DecoderType* decoder,
     const DecoderConfigType& config,
     bool low_delay,
-    const PipelineStatusCB& status_cb) {
-  decoder->Initialize(config, low_delay, status_cb);
+    const PipelineStatusCB& status_cb,
+    const OutputCB& output_cb) {
+  decoder->Initialize(config, low_delay, status_cb, output_cb);
 }
 
 bool DecoderStreamTraits<DemuxerStream::VIDEO>::FinishInitialization(
     const StreamInitCB& init_cb,
     DecoderType* decoder,
     DemuxerStream* stream) {
   DCHECK(stream);
   if (!decoder) {
     init_cb.Run(false);
     return false;
@@ skipping 12 matching lines @@
   statistics_cb.Run(statistics);
 }
 
 DecoderStreamTraits<DemuxerStream::VIDEO>::DecoderConfigType
     DecoderStreamTraits<DemuxerStream::VIDEO>::GetDecoderConfig(
         DemuxerStream& stream) {
   return stream.video_decoder_config();
 }
 
 }  // namespace media