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

Side by Side Diff: webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h

Issue 1484343003: NetEq: Add codec name and RTP timestamp rate to DecoderInfo (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H_
13 13
14 #include <string>
15
14 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 17 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
16 #include "webrtc/modules/audio_coding/neteq/include/neteq.h" 18 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
17 #include "webrtc/modules/include/module_common_types.h" 19 #include "webrtc/modules/include/module_common_types.h"
18 20
19 namespace webrtc { 21 namespace webrtc {
20 namespace test { 22 namespace test {
21 // This test class provides a way run NetEQ with an external decoder. 23 // This test class provides a way run NetEQ with an external decoder.
22 class NetEqExternalDecoderTest { 24 class NetEqExternalDecoderTest {
23 protected: 25 protected:
(...skipping 18 matching lines...) Expand all
42 44
43 // Get 10 ms of audio data. The data is written to |output|, which can hold 45 // Get 10 ms of audio data. The data is written to |output|, which can hold
44 // (at least) |max_length| elements. Returns number of samples. 46 // (at least) |max_length| elements. Returns number of samples.
45 size_t GetOutputAudio(size_t max_length, int16_t* output, 47 size_t GetOutputAudio(size_t max_length, int16_t* output,
46 NetEqOutputType* output_type); 48 NetEqOutputType* output_type);
47 49
48 NetEq* neteq() { return neteq_.get(); } 50 NetEq* neteq() { return neteq_.get(); }
49 51
50 private: 52 private:
51 NetEqDecoder codec_; 53 NetEqDecoder codec_;
54 std::string name_ = "dummy name";
52 AudioDecoder* decoder_; 55 AudioDecoder* decoder_;
53 int sample_rate_hz_; 56 int sample_rate_hz_;
54 int channels_; 57 int channels_;
55 rtc::scoped_ptr<NetEq> neteq_; 58 rtc::scoped_ptr<NetEq> neteq_;
56 }; 59 };
57 60
58 } // namespace test 61 } // namespace test
59 } // namespace webrtc 62 } // namespace webrtc
60 63
61 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H _ 64 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_EXTERNAL_DECODER_TEST_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698