Bug 1373475: Remove panic from pulse_format_to_cubeb_format. r?kinetik draft
authorDan Glastonbury <dan.glastonbury@gmail.com>
Fri, 16 Jun 2017 11:15:48 +1000
changeset 595104 607f467beaac9016319bd1976d7d9684830dd333
parent 595097 79cdd4893c4607b8ad19c41ffd4ddde2f11d0151
child 633625 8f40f2530f3b2ba09ff0834fe325251cfaac38de
push id64248
push userbmo:dglastonbury@mozilla.com
push dateFri, 16 Jun 2017 01:32:20 +0000
reviewerskinetik
bugs1373475
milestone56.0a1
Bug 1373475: Remove panic from pulse_format_to_cubeb_format. r?kinetik Remove left-over panic! from this function and return default values of F32NE, just as cubeb_pulse.c does. MozReview-Commit-ID: 5MgIOSaexF2
media/libcubeb/cubeb-pulse-rs/src/backend/context.rs
--- a/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs
+++ b/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs
@@ -561,19 +561,18 @@ impl Default for PulseDevListData {
 }
 
 fn pulse_format_to_cubeb_format(format: pa_sample_format_t) -> cubeb::DeviceFmt {
     match format {
         PA_SAMPLE_S16LE => cubeb::DEVICE_FMT_S16LE,
         PA_SAMPLE_S16BE => cubeb::DEVICE_FMT_S16BE,
         PA_SAMPLE_FLOAT32LE => cubeb::DEVICE_FMT_F32LE,
         PA_SAMPLE_FLOAT32BE => cubeb::DEVICE_FMT_F32BE,
-        _ => {
-            panic!("Invalid format");
-        },
+        // Unsupported format, return F32NE
+        _ => cubeb::CUBEB_FMT_F32NE,
     }
 }
 
 unsafe extern "C" fn pulse_sink_info_cb(_context: *mut pa_context,
                                         i: *const pa_sink_info,
                                         eol: i32,
                                         user_data: *mut c_void) {
     if eol != 0 || i.is_null() {