Moved injection of AudioDecoderFactory into voe::Channel.

webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 // TODO(hlundin): The functionality in this file should be moved into one or
 // several classes.
 
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>  // For ULONG_MAX returned by strtoul.
 #include <stdio.h>
 #include <stdlib.h>  // For strtoul.
 
 #include <algorithm>
 #include <iostream>
 #include <memory>
 #include <limits>
 #include <string>
 
 #include "gflags/gflags.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/safe_conversions.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/output_audio_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/system_wrappers/include/trace.h"
@@ skipping 428 matching lines @@
   std::cout << "Output file: " << argv[2] << std::endl;
 
   // Enable tracing.
   Trace::CreateTrace();
   Trace::SetTraceFile((OutputPath() + "neteq_trace.txt").c_str());
   Trace::set_level_filter(kTraceAll);
 
   // Initialize NetEq instance.
   NetEq::Config config;
   config.sample_rate_hz = sample_rate_hz;
-  NetEq* neteq = NetEq::Create(config);
+  NetEq* neteq =
+      NetEq::Create(config, CreateBuiltinAudioDecoderFactory());
   RegisterPayloadTypes(neteq);
 
 
   // Set up variables for audio replacement if needed.
   std::unique_ptr<Packet> next_packet;
   bool next_packet_available = false;
   size_t input_frame_size_timestamps = 0;
   std::unique_ptr<int16_t[]> replacement_audio;
   std::unique_ptr<uint8_t[]> payload;
   size_t payload_mem_size_bytes = 0;
@@ skipping 136 matching lines @@
   printf("Produced %i ms of audio\n",
          static_cast<int>(time_now_ms - start_time_ms));
 
   delete neteq;
   Trace::ReturnTrace();
   return 0;
 }
 
 }  // namespace test
 }  // namespace webrtc