Skip to content

Commit 94545b1

Browse files
committed
Bug 1366415: Unprefix mozAutoGainControl and mozNoiseSuppression w/deprecation warnings. r=jesup,smaug
MozReview-Commit-ID: EdWjSsIhtIM UltraBlame original commit: c5ba9cddd3908e819a415e5c1d9ca3dc506cda2d
1 parent 17f88b4 commit 94545b1

9 files changed

+405
-51
lines changed

dom/locales/en-US/chrome/dom/dom.properties

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6924,6 +6924,48 @@ NOTE
69246924
Do
69256925
not
69266926
translate
6927+
MozAutoGainControl
6928+
or
6929+
autoGainControl
6930+
.
6931+
MozAutoGainControlWarning
6932+
=
6933+
mozAutoGainControl
6934+
is
6935+
deprecated
6936+
.
6937+
Use
6938+
autoGainControl
6939+
instead
6940+
.
6941+
#
6942+
LOCALIZATION
6943+
NOTE
6944+
:
6945+
Do
6946+
not
6947+
translate
6948+
mozNoiseSuppression
6949+
or
6950+
noiseSuppression
6951+
.
6952+
MozNoiseSuppressionWarning
6953+
=
6954+
mozNoiseSuppression
6955+
is
6956+
deprecated
6957+
.
6958+
Use
6959+
noiseSuppression
6960+
instead
6961+
.
6962+
#
6963+
LOCALIZATION
6964+
NOTE
6965+
:
6966+
Do
6967+
not
6968+
translate
69276969
xml
69286970
:
69296971
base

dom/media/MediaManager.cpp

Lines changed: 86 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13433,6 +13433,40 @@ GetAsMediaTrackConstraints
1343313433
(
1343413434
)
1343513435
;
13436+
MediaConstraintsHelper
13437+
:
13438+
:
13439+
ConvertOldWithWarning
13440+
(
13441+
ac
13442+
.
13443+
mMozAutoGainControl
13444+
ac
13445+
.
13446+
mAutoGainControl
13447+
"
13448+
MozAutoGainControlWarning
13449+
"
13450+
aWindow
13451+
)
13452+
;
13453+
MediaConstraintsHelper
13454+
:
13455+
:
13456+
ConvertOldWithWarning
13457+
(
13458+
ac
13459+
.
13460+
mMozNoiseSuppression
13461+
ac
13462+
.
13463+
mNoiseSuppression
13464+
"
13465+
MozNoiseSuppressionWarning
13466+
"
13467+
aWindow
13468+
)
13469+
;
1343613470
audioType
1343713471
=
1343813472
StringToEnum
@@ -23116,12 +23150,9 @@ aWindow
2311623150
TrackID
2311723151
aTrackID
2311823152
const
23119-
dom
23120-
:
23121-
:
2312223153
MediaTrackConstraints
2312323154
&
23124-
aConstraints
23155+
aConstraintsPassedIn
2312523156
dom
2312623157
:
2312723158
:
@@ -23277,6 +23308,52 @@ forget
2327723308
)
2327823309
;
2327923310
}
23311+
MediaTrackConstraints
23312+
c
23313+
(
23314+
aConstraintsPassedIn
23315+
)
23316+
;
23317+
/
23318+
/
23319+
use
23320+
a
23321+
modifiable
23322+
copy
23323+
MediaConstraintsHelper
23324+
:
23325+
:
23326+
ConvertOldWithWarning
23327+
(
23328+
c
23329+
.
23330+
mMozAutoGainControl
23331+
c
23332+
.
23333+
mAutoGainControl
23334+
"
23335+
MozAutoGainControlWarning
23336+
"
23337+
aWindow
23338+
)
23339+
;
23340+
MediaConstraintsHelper
23341+
:
23342+
:
23343+
ConvertOldWithWarning
23344+
(
23345+
c
23346+
.
23347+
mMozNoiseSuppression
23348+
c
23349+
.
23350+
mNoiseSuppression
23351+
"
23352+
MozNoiseSuppressionWarning
23353+
"
23354+
aWindow
23355+
)
23356+
;
2328023357
RefPtr
2328123358
<
2328223359
MediaManager
@@ -23342,7 +23419,7 @@ id
2334223419
windowId
2334323420
audioDevice
2334423421
videoDevice
23345-
aConstraints
23422+
c
2334623423
isChrome
2334723424
]
2334823425
(
@@ -23396,7 +23473,7 @@ audioDevice
2339623473
>
2339723474
Restart
2339823475
(
23399-
aConstraints
23476+
c
2340023477
mgr
2340123478
-
2340223479
>
@@ -23442,7 +23519,7 @@ SelectSettings
2344223519
(
2344323520
NormalizedConstraints
2344423521
(
23445-
aConstraints
23522+
c
2344623523
)
2344723524
audios
2344823525
isChrome
@@ -23459,7 +23536,7 @@ videoDevice
2345923536
>
2346023537
Restart
2346123538
(
23462-
aConstraints
23539+
c
2346323540
mgr
2346423541
-
2346523542
>
@@ -23505,7 +23582,7 @@ SelectSettings
2350523582
(
2350623583
NormalizedConstraints
2350723584
(
23508-
aConstraints
23585+
c
2350923586
)
2351023587
videos
2351123588
isChrome

dom/media/tests/mochitest/test_getUserMedia_constraints.html

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,15 @@
657657
'
658658
deviceId
659659
'
660+
'
661+
echoCancellation
662+
'
663+
'
664+
noiseSuppression
665+
'
666+
'
667+
autoGainControl
668+
'
660669
/
661670
/
662671
Yet
@@ -669,9 +678,6 @@
669678
aspectRatio
670679
'
671680
'
672-
frameRate
673-
'
674-
'
675681
volume
676682
'
677683
'
@@ -680,8 +686,6 @@
680686
'
681687
sampleSize
682688
'
683-
/
684-
/
685689
'
686690
latency
687691
'
@@ -776,15 +780,6 @@
776780
'
777781
viewportHeight
778782
'
779-
'
780-
echoCancellation
781-
'
782-
'
783-
mozNoiseSuppression
784-
'
785-
'
786-
mozAutoGainControl
787-
'
788783
]
789784
;
790785
var

dom/media/webrtc/MediaEngineWebRTCAudio.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Construct
12401240
;
12411241
mSettings
12421242
.
1243-
mMozAutoGainControl
1243+
mAutoGainControl
12441244
.
12451245
Construct
12461246
(
@@ -1249,7 +1249,7 @@ Construct
12491249
;
12501250
mSettings
12511251
.
1252-
mMozNoiseSuppression
1252+
mNoiseSuppression
12531253
.
12541254
Construct
12551255
(
@@ -1617,7 +1617,7 @@ mAgcOn
16171617
=
16181618
c
16191619
.
1620-
mMozAutoGainControl
1620+
mAutoGainControl
16211621
.
16221622
Get
16231623
(
@@ -1632,7 +1632,7 @@ mNoiseOn
16321632
=
16331633
c
16341634
.
1635-
mMozNoiseSuppression
1635+
mNoiseSuppression
16361636
.
16371637
Get
16381638
(
@@ -2265,7 +2265,7 @@ that
22652265
>
22662266
mSettings
22672267
.
2268-
mMozAutoGainControl
2268+
mAutoGainControl
22692269
.
22702270
Value
22712271
(
@@ -2280,7 +2280,7 @@ that
22802280
>
22812281
mSettings
22822282
.
2283-
mMozNoiseSuppression
2283+
mNoiseSuppression
22842284
.
22852285
Value
22862286
(

0 commit comments

Comments
 (0)