Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/jni/androidmediacodeccommon.h

Index: webrtc/api/java/jni/androidmediacodeccommon.h
diff --git a/webrtc/api/java/jni/androidmediacodeccommon.h b/webrtc/api/java/jni/androidmediacodeccommon.h
deleted file mode 100644
index 4926f4d98b7eeb8c726c602d907b706168f1f164..0000000000000000000000000000000000000000
--- a/webrtc/api/java/jni/androidmediacodeccommon.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
-
-#include <android/log.h>
-#include <string>
-
-#include "webrtc/base/thread.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
-
-namespace webrtc_jni {
-
-// Uncomment this define to enable verbose logging for every encoded/decoded
-// video frame.
-//#define TRACK_BUFFER_TIMING
-
-#define TAG_COMMON "MediaCodecVideo"
-
-// Color formats supported by encoder - should mirror supportedColorList
-// from MediaCodecVideoEncoder.java
-enum COLOR_FORMATTYPE {
-  COLOR_FormatYUV420Planar = 0x13,
-  COLOR_FormatYUV420SemiPlanar = 0x15,
-  COLOR_QCOM_FormatYUV420SemiPlanar = 0x7FA30C00,
-  // NV12 color format supported by QCOM codec, but not declared in MediaCodec -
-  // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h
-  // This format is presumably similar to COLOR_FormatYUV420SemiPlanar,
-  // but requires some (16, 32?) byte alignment.
-  COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04
-};
-
-// Arbitrary interval to poll the codec for new outputs.
-enum { kMediaCodecPollMs = 10 };
-// Arbitrary interval to poll at when there should be no more frames.
-enum { kMediaCodecPollNoFramesMs = 100 };
-// Media codec maximum output buffer ready timeout.
-enum { kMediaCodecTimeoutMs = 1000 };
-// Interval to print codec statistics (bitrate, fps, encoding/decoding time).
-enum { kMediaCodecStatisticsIntervalMs = 3000 };
-// Maximum amount of pending frames for VP8 decoder.
-enum { kMaxPendingFramesVp8 = 1 };
-// Maximum amount of pending frames for VP9 decoder.
-enum { kMaxPendingFramesVp9 = 1 };
-// Maximum amount of pending frames for H.264 decoder.
-enum { kMaxPendingFramesH264 = 3 };
-// Maximum amount of decoded frames for which per-frame logging is enabled.
-enum { kMaxDecodedLogFrames = 10 };
-// Maximum amount of encoded frames for which per-frame logging is enabled.
-enum { kMaxEncodedLogFrames = 10 };
-
-static inline void AllowBlockingCalls() {
-  rtc::Thread* current_thread = rtc::Thread::Current();
-  if (current_thread != NULL)
-    current_thread->SetAllowBlockingCalls(true);
-}
-
-// Return the (singleton) Java Enum object corresponding to |index|;
-// |state_class_fragment| is something like "MediaSource$State".
-static inline jobject JavaEnumFromIndexAndClassName(
-    JNIEnv* jni, const std::string& state_class_fragment, int index) {
-  const std::string state_class = "org/webrtc/" + state_class_fragment;
-  return JavaEnumFromIndex(jni, FindClass(jni, state_class.c_str()),
-                           state_class, index);
-}
-
-// Checks for any Java exception, prints stack backtrace and clears
-// currently thrown exception.
-static inline bool CheckException(JNIEnv* jni) {
-  if (jni->ExceptionCheck()) {
-    LOG_TAG(rtc::LS_ERROR, TAG_COMMON) << "Java JNI exception.";
-    jni->ExceptionDescribe();
-    jni->ExceptionClear();
-    return true;
-  }
-  return false;
-}
-
-}  // namespace webrtc_jni
-
-#endif  // WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_