OLD | NEW |
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 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 // Identifier for an A/V synchronization group. Empty string to disable. | 52 // Identifier for an A/V synchronization group. Empty string to disable. |
53 // TODO(pbos): Synchronize streams in a sync group, not just one video | 53 // TODO(pbos): Synchronize streams in a sync group, not just one video |
54 // stream to one audio stream. Tracked by issue webrtc:4762. | 54 // stream to one audio stream. Tracked by issue webrtc:4762. |
55 std::string sync_group; | 55 std::string sync_group; |
56 | 56 |
57 // Decoders for every payload that we can receive. Call owns the | 57 // Decoders for every payload that we can receive. Call owns the |
58 // AudioDecoder instances once the Config is submitted to | 58 // AudioDecoder instances once the Config is submitted to |
59 // Call::CreateReceiveStream(). | 59 // Call::CreateReceiveStream(). |
60 // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11. | 60 // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11. |
61 std::map<uint8_t, AudioDecoder*> decoder_map; | 61 std::map<uint8_t, AudioDecoder*> decoder_map; |
| 62 |
| 63 // TODO(pbos): Remove config option once combined A/V BWE is always on. |
| 64 bool combined_audio_video_bwe = false; |
62 }; | 65 }; |
63 | 66 |
64 virtual Stats GetStats() const = 0; | 67 virtual Stats GetStats() const = 0; |
65 }; | 68 }; |
66 } // namespace webrtc | 69 } // namespace webrtc |
67 | 70 |
68 #endif // WEBRTC_AUDIO_RECEIVE_STREAM_H_ | 71 #endif // WEBRTC_AUDIO_RECEIVE_STREAM_H_ |
OLD | NEW |