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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine.cc

Issue 2746763002: Revert to allowing only 1 unsignaled receive stream for audio. (Closed)
Patch Set: fix tests Created 3 years, 9 months 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
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 29 matching lines...) Expand all
40 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" 40 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
41 #include "webrtc/modules/audio_processing/include/audio_processing.h" 41 #include "webrtc/modules/audio_processing/include/audio_processing.h"
42 #include "webrtc/system_wrappers/include/field_trial.h" 42 #include "webrtc/system_wrappers/include/field_trial.h"
43 #include "webrtc/system_wrappers/include/metrics.h" 43 #include "webrtc/system_wrappers/include/metrics.h"
44 #include "webrtc/system_wrappers/include/trace.h" 44 #include "webrtc/system_wrappers/include/trace.h"
45 #include "webrtc/voice_engine/transmit_mixer.h" 45 #include "webrtc/voice_engine/transmit_mixer.h"
46 46
47 namespace cricket { 47 namespace cricket {
48 namespace { 48 namespace {
49 49
50 constexpr size_t kMaxUnsignaledRecvStreams = 50; 50 constexpr size_t kMaxUnsignaledRecvStreams = 1;
51 51
52 const int kDefaultTraceFilter = webrtc::kTraceNone | webrtc::kTraceTerseInfo | 52 const int kDefaultTraceFilter = webrtc::kTraceNone | webrtc::kTraceTerseInfo |
53 webrtc::kTraceWarning | webrtc::kTraceError | 53 webrtc::kTraceWarning | webrtc::kTraceError |
54 webrtc::kTraceCritical; 54 webrtc::kTraceCritical;
55 const int kElevatedTraceFilter = kDefaultTraceFilter | webrtc::kTraceStateInfo | 55 const int kElevatedTraceFilter = kDefaultTraceFilter | webrtc::kTraceStateInfo |
56 webrtc::kTraceInfo; 56 webrtc::kTraceInfo;
57 57
58 // On Windows Vista and newer, Microsoft introduced the concept of "Default 58 // On Windows Vista and newer, Microsoft introduced the concept of "Default
59 // Communications Device". This means that there are two types of default 59 // Communications Device". This means that there are two types of default
60 // devices (old Wave Audio style default and Default Communications Device). 60 // devices (old Wave Audio style default and Default Communications Device).
(...skipping 2632 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 ssrc); 2693 ssrc);
2694 if (it != unsignaled_recv_ssrcs_.end()) { 2694 if (it != unsignaled_recv_ssrcs_.end()) {
2695 unsignaled_recv_ssrcs_.erase(it); 2695 unsignaled_recv_ssrcs_.erase(it);
2696 return true; 2696 return true;
2697 } 2697 }
2698 return false; 2698 return false;
2699 } 2699 }
2700 } // namespace cricket 2700 } // namespace cricket
2701 2701
2702 #endif // HAVE_WEBRTC_VOICE 2702 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698