Android implementation of WebAudio audio file decoder

media/base/android/webaudio_media_codec_bridge.cc

Index: media/base/android/webaudio_media_codec_bridge.cc
diff --git a/media/base/android/webaudio_media_codec_bridge.cc b/media/base/android/webaudio_media_codec_bridge.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0d59ed3b3f29976428fd60e716cb52712574fc2d
--- /dev/null
+++ b/media/base/android/webaudio_media_codec_bridge.cc
@@ -0,0 +1,122 @@
+// 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 "media/base/android/webaudio_media_codec_bridge.h"
+
+#include <errno.h>
+#include <unistd.h>
+#include <vector>
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "base/basictypes.h"
+#include "base/logging.h"
+#include "base/posix/eintr_wrapper.h"
+#include "jni/WebAudioMediaCodecBridge_jni.h"
+
+
+using base::android::AttachCurrentThread;
+
+namespace media {
+
+void WebAudioMediaCodecBridge::RunWebAudioMediaCodec(
+    base::SharedMemoryHandle encoded_audio_handle,
+    base::FileDescriptor pcm_output) {
+  WebAudioMediaCodecBridge bridge(encoded_audio_handle, pcm_output);
+
+  bridge.DecodeInMemoryAudioFile();
+}
+
+WebAudioMediaCodecBridge::WebAudioMediaCodecBridge(
+    base::SharedMemoryHandle encoded_audio_handle,
+    base::FileDescriptor pcm_output)
+    : encoded_audio_handle_(encoded_audio_handle.fd),
+      pcm_output_(pcm_output.fd) {
+  DVLOG(0) << "WebAudioMediaCodecBridge start **********************"
+           << "input fd = " << encoded_audio_handle_
+           << " output fd = " << pcm_output.fd;
+}
+
+WebAudioMediaCodecBridge::~WebAudioMediaCodecBridge() {
+  if (close(pcm_output_)) {
+    DVLOG(0) << "Couldn't close output fd " << pcm_output_
+             << ": " << strerror(errno);
+  }
+
+  if (close(encoded_audio_handle_)) {
+    DVLOG(0) << "Couldn't close shared mem fd " << encoded_audio_handle_
+             << ": " << strerror(errno);
+  }
+}
+
+bool WebAudioMediaCodecBridge::DecodeInMemoryAudioFile() {
+  // Process the encoded data from |encoded_data_handle_|.
+
+  JNIEnv* env = AttachCurrentThread();
+  CHECK(env);
+  jboolean decoded = Java_WebAudioMediaCodecBridge_decodeAudioFile(
+      env,
+      base::android::GetApplicationContext(),
+      reinterpret_cast<intptr_t>(this),
+      encoded_audio_handle_);
+
+  DVLOG(0) << "decoded = " << decoded;
+  return decoded;
+}
+
+void WebAudioMediaCodecBridge::InitializeDestination(
+    JNIEnv* env,
+    jobject /*java object*/,
+    jint channel_count,
+    jint sample_rate,
+    jlong duration_microsec,
+    jboolean is_vorbis) {
+  // Send information about this audio file: number of channels,
+  // sample rate (Hz), number of frames, a flag indicating whether
+  // this file is an audio/vorbis file.  Information is sent as a set of
+  // 4 longs. This must be coordinated with DecodeAudioFileData!
+
+  unsigned long info[4] = {channel_count,
+                           sample_rate,
+                           // The number of frames is the duration of the file
+                           // (in microseconds) times the sample rate.
+                           0.5 + (duration_microsec * 0.000001 * sample_rate),
+                           is_vorbis ? 1 : 0};
+
+  DVLOG(0) << "InitializeDestination:"
+           << "  channel count = " << channel_count
+           << "  rate = " << sample_rate
+           << "  duration = " << duration_microsec << " microsec"
+           << "  vorbis = " << (is_vorbis ? "yes" : "no");
+
+  HANDLE_EINTR(write(pcm_output_, info, sizeof(info)));
+}
+
+void WebAudioMediaCodecBridge::OnChunkDecoded(
+    JNIEnv* env,
+    jobject /*java object*/,
+    jobject buf,
+    jint buf_size) {
+  int8_t* buffer =
+      static_cast<int8_t*>(env->GetDirectBufferAddress(buf));
+
+  // Write out the data to the pipe in small chunks if necessary.
+  while (buf_size > 0) {
+    int bytes_to_write = (buf_size >= PIPE_BUF) ? PIPE_BUF : buf_size;

[palmer, 2013/04/12 18:34:49]

I feel wary of using signed types for sizes and size-related arithmetic. I know
it comes in as a jint, but I think the best thing to do is sanity-check, and
then cast to the correct type:

void WebAudioMediaCodecBridge::OnChunkDecoded(
    JNIEnv* env,
    jobject /*java object*/,
    jobject buf,
    jint buf_size) {
  if (buf_size <= 0 || !buf)
    return;

  int8_t* buffer = static_cast<int8_t*>(env->GetDirectBufferAddress(buf));
  size_t count = static_cast<size_t>(buf_size);

  // Write out the data to the pipe in small chunks if necessary.
  while (buf_size > 0) {
    size_t bytes_to_write = std::min(count, PIPE_BUF);
    ssize_t bytes_written = HANDLE_EINTR(write(pcm_output_,
                                               buffer,
                                               bytes_to_write));
    if (bytes_written == -1)
      break;
    count -= bytes_written;
    buffer += bytes_written;
  }
}

+    ssize_t bytes_written = HANDLE_EINTR(write(pcm_output_,
+                                               buffer,
+                                               bytes_to_write));
+    if (bytes_written == -1)
+      break;
+    buf_size -= bytes_written;
+    buffer += bytes_written;
+  }
+}
+
+bool WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+} // namespace