Turn the volume range check into a bail out return to prevent browser crash....

media/audio/audio_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

[fbarchard1, 2011/01/06 20:34:29]

update to 2011

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Software adjust volume of samples, allows each audio stream its own
 // volume without impacting master volume for chrome and other applications.
 
 // Implemented as templates to allow 8, 16 and 32 bit implementations.
 // 8 bit is unsigned and biased by 128.
 
 #include "base/basictypes.h"
@@ skipping 74 matching lines @@
 }
 }  // namespace
 
 // AdjustVolume() does an in place audio sample change.
 bool AdjustVolume(void* buf,
                   size_t buflen,
                   int channels,
                   int bytes_per_sample,
                   float volume) {
   DCHECK(buf);
-  DCHECK(volume >= 0.0f && volume <= 1.0f);
+  if (volume < 0.0f || volume > 1.0f)
+      return false;
   if (volume == 1.0f) {
     return true;
   } else if (volume == 0.0f) {
     memset(buf, 0, buflen);
     return true;
   }
   if (channels > 0 && channels <= 8 && bytes_per_sample > 0) {
     int sample_count = buflen / bytes_per_sample;
     const int fixed_volume = static_cast<int>(volume * 65536);
     if (bytes_per_sample == 1) {
@@ skipping 15 matching lines @@
   }
   return false;
 }
 
 bool FoldChannels(void* buf,
                   size_t buflen,
                   int channels,
                   int bytes_per_sample,
                   float volume) {
   DCHECK(buf);
-  DCHECK(volume >= 0.0f && volume <= 1.0f);
+  if (volume < 0.0f || volume > 1.0f)
+      return false;
   if (channels > 2 && channels <= 8 && bytes_per_sample > 0) {
     int sample_count = buflen / (channels * bytes_per_sample);
     if (bytes_per_sample == 1) {
       FoldChannels<uint8, int32, -128, 127, 128>(
           reinterpret_cast<uint8*>(buf),
           sample_count,
           volume,
           channels);
       return true;
     } else if (bytes_per_sample == 2) {
@@ skipping 55 matching lines @@
       return true;
     }
 
     default:
      break;
   }
   return false;
 }
 
 }  // namespace media