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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.cpp

Issue 2386213002: Reflow comments in modules/mediastream/. (Closed)
Patch Set: Created 4 years, 2 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 | third_party/WebKit/Source/modules/mediastream/MediaStream.h » ('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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 const char kGoogAutoGainControl[] = "googAutoGainControl"; 90 const char kGoogAutoGainControl[] = "googAutoGainControl";
91 const char kGoogExperimentalAutoGainControl[] = "googAutoGainControl2"; 91 const char kGoogExperimentalAutoGainControl[] = "googAutoGainControl2";
92 const char kGoogNoiseSuppression[] = "googNoiseSuppression"; 92 const char kGoogNoiseSuppression[] = "googNoiseSuppression";
93 const char kGoogExperimentalNoiseSuppression[] = "googNoiseSuppression2"; 93 const char kGoogExperimentalNoiseSuppression[] = "googNoiseSuppression2";
94 const char kGoogBeamforming[] = "googBeamforming"; 94 const char kGoogBeamforming[] = "googBeamforming";
95 const char kGoogArrayGeometry[] = "googArrayGeometry"; 95 const char kGoogArrayGeometry[] = "googArrayGeometry";
96 const char kGoogHighpassFilter[] = "googHighpassFilter"; 96 const char kGoogHighpassFilter[] = "googHighpassFilter";
97 const char kGoogTypingNoiseDetection[] = "googTypingNoiseDetection"; 97 const char kGoogTypingNoiseDetection[] = "googTypingNoiseDetection";
98 const char kGoogAudioMirroring[] = "googAudioMirroring"; 98 const char kGoogAudioMirroring[] = "googAudioMirroring";
99 99
100 // From third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.c c 100 // From
101 // third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.cc
102
101 // Audio constraints. 103 // Audio constraints.
102 // const char kExtendedFilterEchoCancellation[] = "googEchoCancellation2"; // du plicate k-name
103 const char kDAEchoCancellation[] = "googDAEchoCancellation"; 104 const char kDAEchoCancellation[] = "googDAEchoCancellation";
104 // const char kNoiseSuppression[] = "googNoiseSuppression"; // duplicate k-name
105 // const char kExperimentalNoiseSuppression[] = "googNoiseSuppression2"; // dupl icate k-name
106 // const char kHighpassFilter[] = "googHighpassFilter"; // duplicate k-name
107 // const char kTypingNoiseDetection[] = "googTypingNoiseDetection"; // duplicate k-name
108 // const char kAudioMirroring[] = "googAudioMirroring"; // duplicate k-name
109 105
110 // Google-specific constraint keys for a local video source (getUserMedia). 106 // Google-specific constraint keys for a local video source (getUserMedia).
111 const char kNoiseReduction[] = "googNoiseReduction"; 107 const char kNoiseReduction[] = "googNoiseReduction";
112 108
113 // Constraint keys for CreateOffer / CreateAnswer defined in W3C specification. 109 // Constraint keys for CreateOffer / CreateAnswer defined in W3C specification.
114 const char kOfferToReceiveAudio[] = "OfferToReceiveAudio"; 110 const char kOfferToReceiveAudio[] = "OfferToReceiveAudio";
115 const char kOfferToReceiveVideo[] = "OfferToReceiveVideo"; 111 const char kOfferToReceiveVideo[] = "OfferToReceiveVideo";
116 const char kVoiceActivityDetection[] = "VoiceActivityDetection"; 112 const char kVoiceActivityDetection[] = "VoiceActivityDetection";
117 const char kIceRestart[] = "IceRestart"; 113 const char kIceRestart[] = "IceRestart";
118 // Google specific constraint for BUNDLE enable/disable. 114 // Google specific constraint for BUNDLE enable/disable.
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 MediaTrackConstraintSet element; 794 MediaTrackConstraintSet element;
799 convertConstraintSet(it, element); 795 convertConstraintSet(it, element);
800 advancedVector.append(element); 796 advancedVector.append(element);
801 } 797 }
802 if (!advancedVector.isEmpty()) 798 if (!advancedVector.isEmpty())
803 output.setAdvanced(advancedVector); 799 output.setAdvanced(advancedVector);
804 } 800 }
805 801
806 } // namespace MediaConstraintsImpl 802 } // namespace MediaConstraintsImpl
807 } // namespace blink 803 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/mediastream/MediaStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698