Support concatenated spatialization data

webkit/glue/webkitplatformsupport_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkitplatformsupport_impl.h"
 
 #include <math.h>
 
 #include <vector>
 
@@ skipping 476 matching lines @@
   TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id,
                                   num_args, arg_names, arg_types,
                                   arg_values, NULL, flags);
 }
 
 
 namespace {
 
 WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform,
                                         const char* name) {
+#ifdef IDR_AUDIO_SPATIALIZATION_COMPOSITE
+  if (strcmp(name, "Composite") == 0) {

[Chris Rogers, 2013/04/17 22:33:31]

use !strcmp()

+    base::StringPiece resource =
+        platform->GetDataResource(IDR_AUDIO_SPATIALIZATION_COMPOSITE,
+                                  ui::SCALE_FACTOR_NONE);
+    return WebData(resource.data(), resource.size());
+  }
+#endif
+
 #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000

[Chris Rogers, 2013/04/17 22:33:31]

I assume that once you switch Blink over to using the single "composite"
resource and delete the 240 individual resources from the .grd file that you'll
remove the #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000 case??

[Raymond Toy (Google), 2013/04/17 23:32:15]

Yes, I will remove that, along with the 240 individual resources in the .grd
file.  But the actual 240 wav files will remain.

   const size_t kExpectedSpatializationNameLength = 31;
   if (strlen(name) != kExpectedSpatializationNameLength) {
     return WebData();
   }
 
   // Extract the azimuth and elevation from the resource name.
   int azimuth = 0;
   int elevation = 0;
   int values_parsed =
       sscanf(name, "IRC_Composite_C_R0195_T%3d_P%3d", &azimuth, &elevation);
@@ skipping 146 matching lines @@
 }  // namespace
 
 WebData WebKitPlatformSupportImpl::loadResource(const char* name) {
   // Some clients will call into this method with an empty |name| when they have
   // optional resources.  For example, the PopupMenuChromium code can have icons
   // for some Autofill items but not for others.
   if (!strlen(name))
     return WebData();
 
   // Check the name prefix to see if it's an audio resource.
-  if (StartsWithASCII(name, "IRC_Composite", true))
+  if (StartsWithASCII(name, "IRC_Composite", true) ||
+      StartsWithASCII(name, "Composite", true))

[Chris Rogers, 2013/04/17 22:33:31]

I assume once Blink switches to the single file that this can check just for
"Composite"

[Raymond Toy (Google), 2013/04/17 23:32:15]

Yes

     return loadAudioSpatializationResource(this, name);
 
   // TODO(flackr): We should use a better than linear search here, a trie would
   // be ideal.
   for (size_t i = 0; i < arraysize(kDataResources); ++i) {
     if (!strcmp(name, kDataResources[i].name)) {
       base::StringPiece resource =
           GetDataResource(kDataResources[i].id,
                           kDataResources[i].scale_factor);
       return WebData(resource.data(), resource.size());
@@ skipping 304 matching lines @@
 }
 
 #if defined(OS_ANDROID)
 webkit_media::WebAudioMediaCodecRunner
     WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() {
   return base::Bind(&NullRunWebAudioMediaCodec);
 }
 #endif
 
 }  // namespace webkit_glue