Implement WebKitClientImpl::loadAudioResource() to decode in-memory audio fil...

webkit/glue/media/audio_decoder.cc

Index: webkit/glue/media/audio_decoder.cc
===================================================================
--- webkit/glue/media/audio_decoder.cc	(revision 0)
+++ webkit/glue/media/audio_decoder.cc	(revision 0)
@@ -0,0 +1,74 @@
+// Copyright (c) 2010 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/media/audio_decoder.h"
+
+#include <vector>
+#include "base/basictypes.h"
+#include "base/string_util.h"
+#include "base/time.h"
+#include "media/filters/audio_file_reader.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebAudioBus.h"
+
+using media::AudioFileReader;
+using media::InMemoryDataReader;
+using std::vector;
+using WebKit::WebAudioBus;
+
+namespace webkit_glue {
+
+// Decode in-memory audio file data.
+bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus,
+    const char* data, size_t data_size, double sample_rate) {

[scherkus (not reviewing), 2010/12/11 02:31:12]

wrap these args at (

[Chris Rogers, 2010/12/13 20:25:27]

Done.

+  DCHECK(destination_bus);
+  if (!destination_bus)
+    return false;
+
+  // Uses the FFMPEG library for audio file reading.

[scherkus (not reviewing), 2010/12/11 02:31:12]

nit: FFMPEG -> FFmpeg

(crazy, I know!)

[Chris Rogers, 2010/12/13 20:25:27]

Done.

+  InMemoryDataReader data_reader(data, data_size);
+  AudioFileReader reader(&data_reader);
+
+  if (!reader.Open())
+    return false;
+
+  unsigned number_of_channels = reader.channels();

[scherkus (not reviewing), 2010/12/11 02:31:12]

nit: unsigned -> size_t

[Chris Rogers, 2010/12/13 20:25:27]

Done.

+  double file_sample_rate = reader.sample_rate();
+  double duration = reader.duration().InSecondsF();
+  size_t number_of_frames = reader.number_of_frames();
+
+  // TODO(crogers) : do sample-rate conversion with FFMPEG.

[scherkus (not reviewing), 2010/12/11 02:31:12]

ditto

[Chris Rogers, 2010/12/13 20:25:27]

Done.

+  // For now, we're ignoring the requested 'sample_rate' and returning
+  // the WebAudioBus at the file's sample-rate.
+  // double destination_sample_rate =
+  //   (sample_rate != 0.0) ? sample_rate : file_sample_rate;
+  double destination_sample_rate = file_sample_rate;
+
+  DLOG(INFO) << "Decoding file data -"
+    << " data: " << data

[scherkus (not reviewing), 2010/12/11 02:31:12]

all these extra << lines should be indented by extra 2 spaces

[Chris Rogers, 2010/12/13 20:25:27]

Done.

+    << " data size: " << data_size
+    << " duration: " << duration
+    << " number of frames: " << number_of_frames
+    << " sample rate: " << file_sample_rate
+    << " number of channels: " << number_of_channels;
+
+  // Change to destination sample-rate.
+  number_of_frames *= (destination_sample_rate / file_sample_rate);
+
+  // Allocate and configure the output audio channel data.
+  destination_bus->initialize(number_of_channels,
+                              number_of_frames,
+                              destination_sample_rate);
+
+  // Wrap the channel pointers which will receive the decoded PCM audio.
+  vector<float*> audio_data;
+  audio_data.reserve(number_of_channels);
+  for (unsigned i = 0; i < number_of_channels; ++i) {

[scherkus (not reviewing), 2010/12/11 02:31:12]

unsigned -> size_t (or use int, etc...)

[Chris Rogers, 2010/12/13 20:25:27]

Done.

+    audio_data.push_back(destination_bus->channelData(i));
+  }
+
+  // Decode the audio file data.
+  return reader.Read(audio_data, number_of_frames);
+}
+
+}  // namespace webkit_glue
Property changes on: webkit/glue/media/audio_decoder.cc
___________________________________________________________________
Added: svn:eol-style
   + LF