Bug 1601859 - Update cubeb-pulse-rs to 8069f8f4189982e0b38fa6dc8993dd…

…4fab41f728. r=kinetik

Differential Revision: https://phabricator.services.mozilla.com/D56164

.cargo/config.in

@@ -35,7 +35,7 @@ replace-with = "vendored-sources"
 [source."https://github.com/djg/cubeb-pulse-rs"]
 git = "https://github.com/djg/cubeb-pulse-rs"
 replace-with = "vendored-sources"
-rev = "f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df"
+rev = "8069f8f4189982e0b38fa6dc8993dd4fab41f728"
 
 [source."https://github.com/bytecodealliance/cranelift"]
 git = "https://github.com/bytecodealliance/cranelift"

third_party/rust/cubeb-pulse/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".travis.yml":"0394e2adb041175457685cde5ee05ff04bdab8885fd8a62551f2ff43d9e48872","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"e35841abe5d1118d3f2b4bd13d31adabea04d386080d983d5ea0dc3daf8d58bf","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"e6a98ee5630b9ce1a096a2907d095454f2770e298a5b0976ab552cc53ca96cfc","src/backend/context.rs":"33d9fdf1504fe1ae43d301e288daf6eaeabeb47aa0ef86efa135c6d984425fc4","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"374a9a3bd79fddc47739dda1dbfc5929aea5a91946794fe65fba3c8d130fbda9","src/backend/mod.rs":"06ce9250865abf0ea461f215b128470636d072a6776821efef3caf5a7b992fb9","src/backend/stream.rs":"201b0f22a78bae9741a6a196cd40a92108dfef365e009d39cc9d9e1d63fbe74a","src/capi.rs":"b2c1be8128cadd36caa65c80950440f9d6f2aa0c24cc7bae6a9eaf6347ac454d","src/lib.rs":"7282560d84b134b09acfd8d6282600982e42fb3557f72454c535637cc26c7bf6"},"package":null}
+{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".travis.yml":"0394e2adb041175457685cde5ee05ff04bdab8885fd8a62551f2ff43d9e48872","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"a45bb26050fa187376a8275d1cbee81d0c929315a05d339b86ce7ca05ae934dd","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"e6a98ee5630b9ce1a096a2907d095454f2770e298a5b0976ab552cc53ca96cfc","src/backend/context.rs":"33d9fdf1504fe1ae43d301e288daf6eaeabeb47aa0ef86efa135c6d984425fc4","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"374a9a3bd79fddc47739dda1dbfc5929aea5a91946794fe65fba3c8d130fbda9","src/backend/mod.rs":"06ce9250865abf0ea461f215b128470636d072a6776821efef3caf5a7b992fb9","src/backend/stream.rs":"055ffd356fca13aaeb8faac2917ff675bfbc8a7f82d462db487cdc1f8a280617","src/capi.rs":"b2c1be8128cadd36caa65c80950440f9d6f2aa0c24cc7bae6a9eaf6347ac454d","src/lib.rs":"7282560d84b134b09acfd8d6282600982e42fb3557f72454c535637cc26c7bf6"},"package":null}

third_party/rust/cubeb-pulse/Cargo.toml

@@ -3,6 +3,7 @@ name = "cubeb-pulse"
 version = "0.3.0"
 authors = ["Dan Glastonbury <dglastonbury@mozilla.com>"]
 description = "Cubeb backed for PulseAudio written in Rust"
+license = "ISC"
 
 [features]
 pulse-dlopen = ["pulse-ffi/dlopen"]
@@ -14,5 +15,5 @@ crate-type = ["staticlib", "rlib"]
 cubeb-backend = "0.6"
 pulse-ffi = { path = "pulse-ffi" }
 pulse = { path = "pulse-rs" }
-semver = "^0.7"
+semver = "^0.9"
 ringbuf = "0.1"

third_party/rust/cubeb-pulse/src/backend/stream.rs

@@ -84,6 +84,12 @@ fn layout_to_channel_map(layout: ChannelLayout) -> pulse::ChannelMap {
         cm.map[i] = cubeb_channel_to_pa_channel(channel.into());
     }
     cm.channels = layout.num_channels() as _;
+
+    // Special case single channel center mapping as mono.
+    if cm.channels == 1 && cm.map[0] == PA_CHANNEL_POSITION_FRONT_CENTER {
+        cm.map[0] = PA_CHANNEL_POSITION_MONO;
+    }
+
     cm
 }
 
@@ -1254,7 +1260,7 @@ mod test {
 
     map_channel_tests! {
         map_channel_mono, MONO => [
-            PA_CHANNEL_POSITION_FRONT_CENTER
+            PA_CHANNEL_POSITION_MONO
         ],
         map_channel_mono_lfe, MONO_LFE => [
             PA_CHANNEL_POSITION_FRONT_CENTER,

third_party/rust/pulse-ffi/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"d4c2d2074582372a94e3e6ad7f11c99784e90ecd7723327ac349c2b1054cd2ec","src/ffi_funcs.rs":"0aae9bb21ead31098b38a2f64a0366b9e8b129dd250b5780deae9deb1a8a1499","src/ffi_types.rs":"fd6ca280be7601ae1990d4d0626fa9c4c6c9c958040c29e651764d06386d15c1","src/lib.rs":"edb03c6d9bcddc69a688160ffda0b8bdb69f1f87ccbc3e3b005574c9d5484991"},"package":null}
+{"files":{"Cargo.toml":"86bb1c8ebc438416c3a1f71b41494f19a85f698860b8c12d4875c8247f9c3664","src/ffi_funcs.rs":"0aae9bb21ead31098b38a2f64a0366b9e8b129dd250b5780deae9deb1a8a1499","src/ffi_types.rs":"fd6ca280be7601ae1990d4d0626fa9c4c6c9c958040c29e651764d06386d15c1","src/lib.rs":"edb03c6d9bcddc69a688160ffda0b8bdb69f1f87ccbc3e3b005574c9d5484991"},"package":null}

third_party/rust/pulse-ffi/Cargo.toml

@@ -3,6 +3,7 @@ name = "pulse-ffi"
 version = "0.1.0"
 authors = ["Dan Glastonbury <dglastonbury@mozilla.com>"]
 description = "FFI for libpulse.so supporting static linking and dynamic loading."
+license = "ISC"
 
 [features]
 dlopen = []

third_party/rust/pulse/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"c1f3e23d61a434a65e8e11561ba39b8ad90d1c8909fac3d53ec26f14bfe3f523","src/context.rs":"5e43131c0a989336e149b5408e0b362c0ef8176854785f98191f86b75ef5d76a","src/error.rs":"7be0ad689b6519a5be3771c29a102ff394bdc5ee46502d418bced90268e912dd","src/lib.rs":"8636d18c55b7ccd8e79d45a8d12ea84ba94b7aeef8ac3975292c94a28ed4a2b1","src/mainloop_api.rs":"b4a6c7e1a507490157c5b4a25af367cf810e1ef64c7a96f71575a15674d9b649","src/operation.rs":"c0d3e28ef7db52d60b19f931fe7bb44271127009b2e82693da2b7e342e804022","src/proplist.rs":"65bfc2b90f31bc3969aef69eb3e26b34ac657a2149f1b6515791403d752f3fc5","src/stream.rs":"577301501d9ef0452379b82bcbf39b8d511d7091cfb8c8cbb3626a8c9a487aad","src/threaded_mainloop.rs":"958181a46363ded3ac8e0d9c9d912587cb6f9f26ae6f190881014adbda2d3211","src/util.rs":"d971486fd828b8b9d81db61a21a77960ea34a99a59b96fceaf77c2b84ed2accc"},"package":null}
+{"files":{"Cargo.toml":"961d0d5d82f0d128d23dd753ad89beccdefdc0bc830ff646c785ee87eed261db","src/context.rs":"5e43131c0a989336e149b5408e0b362c0ef8176854785f98191f86b75ef5d76a","src/error.rs":"7be0ad689b6519a5be3771c29a102ff394bdc5ee46502d418bced90268e912dd","src/lib.rs":"8636d18c55b7ccd8e79d45a8d12ea84ba94b7aeef8ac3975292c94a28ed4a2b1","src/mainloop_api.rs":"b4a6c7e1a507490157c5b4a25af367cf810e1ef64c7a96f71575a15674d9b649","src/operation.rs":"c0d3e28ef7db52d60b19f931fe7bb44271127009b2e82693da2b7e342e804022","src/proplist.rs":"65bfc2b90f31bc3969aef69eb3e26b34ac657a2149f1b6515791403d752f3fc5","src/stream.rs":"577301501d9ef0452379b82bcbf39b8d511d7091cfb8c8cbb3626a8c9a487aad","src/threaded_mainloop.rs":"958181a46363ded3ac8e0d9c9d912587cb6f9f26ae6f190881014adbda2d3211","src/util.rs":"d971486fd828b8b9d81db61a21a77960ea34a99a59b96fceaf77c2b84ed2accc"},"package":null}

third_party/rust/pulse/Cargo.toml

@@ -2,6 +2,7 @@
 name = "pulse"
 version = "0.3.0"
 authors = ["Dan Glastonbury <dglastonbury@mozilla.com>"]
+license = "ISC"
 
 [dependencies]
 bitflags = "1.2.0"