Revert "Issue #1267 - Part 1: Update libcubeb to a1200c34."

This reverts commit d162ecbaffe845c9707da5d2f6cab11f343ef00e.

1 files changed, 0 insertions, 76 deletions

diff --git a/media/libcubeb/src/android/cubeb-output-latency.h b/media/libcubeb/src/android/cubeb-output-latency.h
deleted file mode 100644
index a824fc1c2..000000000
--- a/media/libcubeb/src/android/cubeb-output-latency.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _CUBEB_OUTPUT_LATENCY_H_
-#define _CUBEB_OUTPUT_LATENCY_H_
-
-#include <stdbool.h>
-#include "cubeb_media_library.h"
-#include "../cubeb-jni.h"
-
-struct output_latency_function {
-  media_lib * from_lib;
-  cubeb_jni * from_jni;
-  int version;
-};
-
-typedef struct output_latency_function output_latency_function;
-
-const int ANDROID_JELLY_BEAN_MR1_4_2 = 17;
-
-output_latency_function *
-cubeb_output_latency_load_method(int version)
-{
-  output_latency_function * ol = NULL;
-  ol = calloc(1, sizeof(output_latency_function));
-
-  ol->version = version;
-
-  if (ol->version > ANDROID_JELLY_BEAN_MR1_4_2){
-    ol->from_jni = cubeb_jni_init();
-    return ol;
-  }
-
-  ol->from_lib = cubeb_load_media_library();
-  return ol;
-}
-
-bool
-cubeb_output_latency_method_is_loaded(output_latency_function * ol)
-{
-  assert(ol && (ol->from_jni || ol->from_lib));
-  if (ol->version > ANDROID_JELLY_BEAN_MR1_4_2){
-    return !!ol->from_jni;
-  }
-
-  return !!ol->from_lib;
-}
-
-void
-cubeb_output_latency_unload_method(output_latency_function * ol)
-{
-  if (!ol) {
-    return;
-  }
-
-  if (ol->version > ANDROID_JELLY_BEAN_MR1_4_2 && ol->from_jni) {
-    cubeb_jni_destroy(ol->from_jni);
-  }
-
-  if (ol->version <= ANDROID_JELLY_BEAN_MR1_4_2 && ol->from_lib) {
-    cubeb_close_media_library(ol->from_lib);
-  }
-
-  free(ol);
-}
-
-uint32_t
-cubeb_get_output_latency(output_latency_function * ol)
-{
-  assert(cubeb_output_latency_method_is_loaded(ol));
-
-  if (ol->version > ANDROID_JELLY_BEAN_MR1_4_2){
-    return cubeb_get_output_latency_from_jni(ol->from_jni);
-  }
-
-  return cubeb_get_output_latency_from_media_library(ol->from_lib);
-}
-
-#endif // _CUBEB_OUTPUT_LATENCY_H_