Bug 950026 - Bail out when we don't get an expected return value from AudioClient::IsFormatSupported, instead of asserting. r=kinetik, a=lsblakk
authorPaul Adenot <paul@paul.cx>
Fri, 13 Dec 2013 18:11:06 +0100
changeset 175601 d92422d01e6d035a1872d4da7b62773d87a244fa
parent 175600 a45514992edad2c4bb157658047927f177c75688
child 175602 c79b3ec59dff04c3a6f48be7d66f1d96fb1b7f34
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik, lsblakk
bugs950026
milestone28.0a2
Bug 950026 - Bail out when we don't get an expected return value from AudioClient::IsFormatSupported, instead of asserting. r=kinetik, a=lsblakk This will fall back to our own channel mapping code, instead of trying to use the platform's.
media/libcubeb/src/cubeb_wasapi.cpp
--- a/media/libcubeb/src/cubeb_wasapi.cpp
+++ b/media/libcubeb/src/cubeb_wasapi.cpp
@@ -687,18 +687,16 @@ handle_channel_layout(cubeb_stream * stm
     assert(closest_pcm->SubFormat == format_pcm->SubFormat);
     CoTaskMemFree(*mix_format);
     *mix_format = closest;
   } else if (hr == AUDCLNT_E_UNSUPPORTED_FORMAT) {
     /* Not supported, no suggestion, there is a bug somewhere. */
     assert(false && "Format not supported, and no suggestion from WASAPI.");
   } else if (hr == S_OK) {
     LOG("Requested format accepted by WASAPI.");
-  } else {
-    assert(false && "Not reached.");
   }
 }
 
 int
 wasapi_stream_init(cubeb * context, cubeb_stream ** stream,
                    char const * stream_name, cubeb_stream_params stream_params,
                    unsigned int latency, cubeb_data_callback data_callback,
                    cubeb_state_callback state_callback, void * user_ptr)