Skip to content

Commit 92f1aaa

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 9ab36f3 commit 92f1aaa

9 files changed

+386
-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: 80 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10511,6 +10511,40 @@ GetAsMediaTrackConstraints
1051110511
(
1051210512
)
1051310513
;
10514+
MediaConstraintsHelper
10515+
:
10516+
:
10517+
ConvertOldWithWarning
10518+
(
10519+
ac
10520+
.
10521+
mMozAutoGainControl
10522+
ac
10523+
.
10524+
mAutoGainControl
10525+
"
10526+
MozAutoGainControlWarning
10527+
"
10528+
aWindow
10529+
)
10530+
;
10531+
MediaConstraintsHelper
10532+
:
10533+
:
10534+
ConvertOldWithWarning
10535+
(
10536+
ac
10537+
.
10538+
mMozNoiseSuppression
10539+
ac
10540+
.
10541+
mNoiseSuppression
10542+
"
10543+
MozNoiseSuppressionWarning
10544+
"
10545+
aWindow
10546+
)
10547+
;
1051410548
audioType
1051510549
=
1051610550
StringToEnum
@@ -18923,12 +18957,9 @@ aWindow
1892318957
TrackID
1892418958
aTrackID
1892518959
const
18926-
dom
18927-
:
18928-
:
1892918960
MediaTrackConstraints
1893018961
&
18931-
aConstraints
18962+
aConstraintsPassedIn
1893218963
dom
1893318964
:
1893418965
:
@@ -19058,6 +19089,46 @@ forget
1905819089
)
1905919090
;
1906019091
}
19092+
MediaTrackConstraints
19093+
c
19094+
(
19095+
aConstraintsPassedIn
19096+
)
19097+
;
19098+
MediaConstraintsHelper
19099+
:
19100+
:
19101+
ConvertOldWithWarning
19102+
(
19103+
c
19104+
.
19105+
mMozAutoGainControl
19106+
c
19107+
.
19108+
mAutoGainControl
19109+
"
19110+
MozAutoGainControlWarning
19111+
"
19112+
aWindow
19113+
)
19114+
;
19115+
MediaConstraintsHelper
19116+
:
19117+
:
19118+
ConvertOldWithWarning
19119+
(
19120+
c
19121+
.
19122+
mMozNoiseSuppression
19123+
c
19124+
.
19125+
mNoiseSuppression
19126+
"
19127+
MozNoiseSuppressionWarning
19128+
"
19129+
aWindow
19130+
)
19131+
;
1906119132
RefPtr
1906219133
<
1906319134
MediaManager
@@ -19123,7 +19194,7 @@ id
1912319194
windowId
1912419195
audioDevice
1912519196
videoDevice
19126-
aConstraints
19197+
c
1912719198
isChrome
1912819199
]
1912919200
(
@@ -19177,7 +19248,7 @@ audioDevice
1917719248
>
1917819249
Restart
1917919250
(
19180-
aConstraints
19251+
c
1918119252
mgr
1918219253
-
1918319254
>
@@ -19223,7 +19294,7 @@ SelectSettings
1922319294
(
1922419295
NormalizedConstraints
1922519296
(
19226-
aConstraints
19297+
c
1922719298
)
1922819299
audios
1922919300
isChrome
@@ -19240,7 +19311,7 @@ videoDevice
1924019311
>
1924119312
Restart
1924219313
(
19243-
aConstraints
19314+
c
1924419315
mgr
1924519316
-
1924619317
>
@@ -19286,7 +19357,7 @@ SelectSettings
1928619357
(
1928719358
NormalizedConstraints
1928819359
(
19289-
aConstraints
19360+
c
1929019361
)
1929119362
videos
1929219363
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
@@ -1038,7 +1038,7 @@ Construct
10381038
;
10391039
mSettings
10401040
.
1041-
mMozAutoGainControl
1041+
mAutoGainControl
10421042
.
10431043
Construct
10441044
(
@@ -1047,7 +1047,7 @@ Construct
10471047
;
10481048
mSettings
10491049
.
1050-
mMozNoiseSuppression
1050+
mNoiseSuppression
10511051
.
10521052
Construct
10531053
(
@@ -1302,7 +1302,7 @@ mAgcOn
13021302
=
13031303
c
13041304
.
1305-
mMozAutoGainControl
1305+
mAutoGainControl
13061306
.
13071307
Get
13081308
(
@@ -1317,7 +1317,7 @@ mNoiseOn
13171317
=
13181318
c
13191319
.
1320-
mMozNoiseSuppression
1320+
mNoiseSuppression
13211321
.
13221322
Get
13231323
(
@@ -1901,7 +1901,7 @@ that
19011901
>
19021902
mSettings
19031903
.
1904-
mMozAutoGainControl
1904+
mAutoGainControl
19051905
.
19061906
Value
19071907
(
@@ -1916,7 +1916,7 @@ that
19161916
>
19171917
mSettings
19181918
.
1919-
mMozNoiseSuppression
1919+
mNoiseSuppression
19201920
.
19211921
Value
19221922
(

0 commit comments

Comments
 (0)