Format *_jni.cc files

PiperOrigin-RevId: 374830877

Format *_jni.cc files
PiperOrigin-RevId: 374830877
0de6bc86 · olly · Oliver Woodman · 9e4315f4 · 0de6bc86 · 0de6bc86
Commit 0de6bc86 authored May 20, 2021 by olly Committed by Oliver Woodman May 20, 2021
Showing with 59 additions and 62 deletions
extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
extensions/flac/src/main/jni/flac_jni.cc
extensions/opus/src/main/jni/opus_jni.cc
extensions/vp9/src/main/jni/vpx_jni.cc
--- a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
+++ b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+#include <android/log.h>
 #include <jni.h>
 #include <stdlib.h>
-#include <android/log.h>
 extern "C" {
 #ifdef __cplusplus
@@ -33,8 +33,8 @@ extern "C" {
 }
 #define LOG_TAG "ffmpeg_jni"
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, \
+#define LOGE(...) \
-                   __VA_ARGS__))
+  ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
 #define LIBRARY_FUNC(RETURN_TYPE, NAME, ...)                              \
  extern "C" {                                                            \
@@ -69,7 +69,7 @@ static const int AUDIO_DECODER_ERROR_OTHER = -2;
 /**
 * Returns the AVCodec with the specified name, or NULL if it is not available.
 */
-AVCodec *getCodecByName(JNIEnv* env, jstring codecName);
+AVCodec *getCodecByName(JNIEnv *env, jstring codecName);
 /**
 * Allocates and opens a new AVCodecContext for the specified codec, passing the
@@ -100,7 +100,7 @@ void releaseContext(AVCodecContext *context);
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
  JNIEnv *env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+  if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
    return -1;
  }
  avcodec_register_all();
@@ -149,13 +149,13 @@ AUDIO_DECODER_FUNC(jint, ffmpegDecode, jlong context, jobject inputData,
    LOGE("Invalid output buffer length: %d", outputSize);
    return -1;
  }
-  uint8_t *inputBuffer = (uint8_t *) env->GetDirectBufferAddress(inputData);
+  uint8_t *inputBuffer = (uint8_t *)env->GetDirectBufferAddress(inputData);
-  uint8_t *outputBuffer = (uint8_t *) env->GetDirectBufferAddress(outputData);
+  uint8_t *outputBuffer = (uint8_t *)env->GetDirectBufferAddress(outputData);
  AVPacket packet;
  av_init_packet(&packet);
  packet.data = inputBuffer;
  packet.size = inputSize;
-  return decodePacket((AVCodecContext *) context, &packet, outputBuffer,
+  return decodePacket((AVCodecContext *)context, &packet, outputBuffer,
                      outputSize);
 }
@@ -164,7 +164,7 @@ AUDIO_DECODER_FUNC(jint, ffmpegGetChannelCount, jlong context) {
    LOGE("Context must be non-NULL.");
    return -1;
  }
-  return ((AVCodecContext *) context)->channels;
+  return ((AVCodecContext *)context)->channels;
 }
 AUDIO_DECODER_FUNC(jint, ffmpegGetSampleRate, jlong context) {
@@ -172,11 +172,11 @@ AUDIO_DECODER_FUNC(jint, ffmpegGetSampleRate, jlong context) {
    LOGE("Context must be non-NULL.");
    return -1;
  }
-  return ((AVCodecContext *) context)->sample_rate;
+  return ((AVCodecContext *)context)->sample_rate;
 }
 AUDIO_DECODER_FUNC(jlong, ffmpegReset, jlong jContext, jbyteArray extraData) {
-  AVCodecContext *context = (AVCodecContext *) jContext;
+  AVCodecContext *context = (AVCodecContext *)jContext;
  if (!context) {
    LOGE("Tried to reset without a context.");
    return 0L;
@@ -200,16 +200,16 @@ AUDIO_DECODER_FUNC(jlong, ffmpegReset, jlong jContext, jbyteArray extraData) {
  }
  avcodec_flush_buffers(context);
-  return (jlong) context;
+  return (jlong)context;
 }
 AUDIO_DECODER_FUNC(void, ffmpegRelease, jlong context) {
  if (context) {
-    releaseContext((AVCodecContext *) context);
+    releaseContext((AVCodecContext *)context);
  }
 }
-AVCodec *getCodecByName(JNIEnv* env, jstring codecName) {
+AVCodec *getCodecByName(JNIEnv *env, jstring codecName) {
  if (!codecName) {
    return NULL;
  }
@@ -233,13 +233,13 @@ AVCodecContext *createContext(JNIEnv *env, AVCodec *codec, jbyteArray extraData,
    jsize size = env->GetArrayLength(extraData);
    context->extradata_size = size;
    context->extradata =
-        (uint8_t *) av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
+        (uint8_t *)av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
    if (!context->extradata) {
      LOGE("Failed to allocate extradata.");
      releaseContext(context);
      return NULL;
    }
-    env->GetByteArrayRegion(extraData, 0, size, (jbyte *) context->extradata);
+    env->GetByteArrayRegion(extraData, 0, size, (jbyte *)context->extradata);
  }
  if (context->codec_id == AV_CODEC_ID_PCM_MULAW ||
      context->codec_id == AV_CODEC_ID_PCM_ALAW) {
@@ -345,7 +345,7 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
 }
 void logError(const char *functionName, int errorNumber) {
-  char *buffer = (char *) malloc(ERROR_STRING_BUFFER_LENGTH * sizeof(char));
+  char *buffer = (char *)malloc(ERROR_STRING_BUFFER_LENGTH * sizeof(char));
  av_strerror(errorNumber, buffer, ERROR_STRING_BUFFER_LENGTH);
  LOGE("Error in %s: %s", functionName, buffer);
  free(buffer);
@@ -362,4 +362,3 @@ void releaseContext(AVCodecContext *context) {
  }
  avcodec_free_context(&context);
 }
--- a/extensions/flac/src/main/jni/flac_jni.cc
+++ b/extensions/flac/src/main/jni/flac_jni.cc
@@ -32,8 +32,9 @@
 #define DECODER_FUNC(RETURN_TYPE, NAME, ...)                                  \
  extern "C" {                                                                \
  JNIEXPORT RETURN_TYPE                                                       \
-      Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME( \
+      Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME(JNIEnv *env,    \
-          JNIEnv *env, jobject thiz, ##__VA_ARGS__);                       \
+                                                              jobject thiz,   \
+                                                              ##__VA_ARGS__); \
  }                                                                           \
  JNIEXPORT RETURN_TYPE                                                       \
      Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME(                \

--- a/extensions/opus/src/main/jni/opus_jni.cc
+++ b/extensions/opus/src/main/jni/opus_jni.cc
@@ -14,9 +14,8 @@
 * limitations under the License.
 */
-#include <jni.h>
 #include <android/log.h>
+#include <jni.h>
 #include <cstdlib>
@@ -24,28 +23,28 @@
 #include "opus_multistream.h"  // NOLINT
 #define LOG_TAG "opus_jni"
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, \
+#define LOGE(...) \
-                                             __VA_ARGS__))
+  ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
 #define DECODER_FUNC(RETURN_TYPE, NAME, ...)                          \
  extern "C" {                                                        \
  JNIEXPORT RETURN_TYPE                                               \
-    Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_ ## NAME \
+      Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_##NAME( \
-      (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\
+          JNIEnv* env, jobject thiz, ##__VA_ARGS__);                  \
  }                                                                   \
  JNIEXPORT RETURN_TYPE                                               \
-    Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_ ## NAME \
+      Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_##NAME( \
-      (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
+          JNIEnv* env, jobject thiz, ##__VA_ARGS__)
 #define LIBRARY_FUNC(RETURN_TYPE, NAME, ...)                          \
  extern "C" {                                                        \
  JNIEXPORT RETURN_TYPE                                               \
-    Java_com_google_android_exoplayer2_ext_opus_OpusLibrary_ ## NAME \
+      Java_com_google_android_exoplayer2_ext_opus_OpusLibrary_##NAME( \
-      (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\
+          JNIEnv* env, jobject thiz, ##__VA_ARGS__);                  \
  }                                                                   \
  JNIEXPORT RETURN_TYPE                                               \
-    Java_com_google_android_exoplayer2_ext_opus_OpusLibrary_ ## NAME \
+      Java_com_google_android_exoplayer2_ext_opus_OpusLibrary_##NAME( \
-      (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
+          JNIEnv* env, jobject thiz, ##__VA_ARGS__)
 // JNI references for SimpleOutputBuffer class.
 static jmethodID outputBufferInit;
@@ -66,7 +65,8 @@ static int errorCode;
 static bool outputFloat = false;
 DECODER_FUNC(jlong, opusInit, jint sampleRate, jint channelCount,
-     jint numStreams, jint numCoupled, jint gain, jbyteArray jStreamMap) {
+             jint numStreams, jint numCoupled, jint gain,
+             jbyteArray jStreamMap) {
  int status = OPUS_INVALID_STATE;
  ::channelCount = channelCount;
  errorCode = 0;
@@ -88,8 +88,8 @@ DECODER_FUNC(jlong, opusInit, jint sampleRate, jint channelCount,
  // Populate JNI References.
  const jclass outputBufferClass = env->FindClass(
      "com/google/android/exoplayer2/decoder/SimpleOutputBuffer");
-  outputBufferInit = env->GetMethodID(outputBufferClass, "init",
+  outputBufferInit =
-      "(JI)Ljava/nio/ByteBuffer;");
+      env->GetMethodID(outputBufferClass, "init", "(JI)Ljava/nio/ByteBuffer;");
  return reinterpret_cast<intptr_t>(decoder);
 }
@@ -97,12 +97,11 @@ DECODER_FUNC(jlong, opusInit, jint sampleRate, jint channelCount,
 DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs,
             jobject jInputBuffer, jint inputSize, jobject jOutputBuffer) {
  OpusMSDecoder* decoder = reinterpret_cast<OpusMSDecoder*>(jDecoder);
-  const uint8_t* inputBuffer =
+  const uint8_t* inputBuffer = reinterpret_cast<const uint8_t*>(
-      reinterpret_cast<const uint8_t*>(
      env->GetDirectBufferAddress(jInputBuffer));
-  const int byteSizePerSample = outputFloat ?
+  const int byteSizePerSample =
-      kBytesPerFloatSample : kBytesPerIntPcmSample;
+      outputFloat ? kBytesPerFloatSample : kBytesPerIntPcmSample;
  const jint outputSize =
      kMaxOpusOutputPacketSizeSamples * byteSizePerSample * channelCount;
@@ -111,8 +110,8 @@ DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs,
    // Exception is thrown in Java when returning from the native call.
    return -1;
  }
-  const jobject jOutputBufferData = env->CallObjectMethod(jOutputBuffer,
+  const jobject jOutputBufferData = env->CallObjectMethod(
-      outputBufferInit, jTimeUs, outputSize);
+      jOutputBuffer, outputBufferInit, jTimeUs, outputSize);
  if (env->ExceptionCheck()) {
    // Exception is thrown in Java when returning from the native call.
    return -1;
@@ -122,13 +121,15 @@ DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs,
  if (outputFloat) {
    float* outputBufferData = reinterpret_cast<float*>(
        env->GetDirectBufferAddress(jOutputBufferData));
-    sampleCount = opus_multistream_decode_float(decoder, inputBuffer, inputSize,
+    sampleCount = opus_multistream_decode_float(
-      outputBufferData, kMaxOpusOutputPacketSizeSamples, 0);
+        decoder, inputBuffer, inputSize, outputBufferData,
+        kMaxOpusOutputPacketSizeSamples, 0);
  } else {
    int16_t* outputBufferData = reinterpret_cast<int16_t*>(
        env->GetDirectBufferAddress(jOutputBufferData));
    sampleCount = opus_multistream_decode(decoder, inputBuffer, inputSize,
-      outputBufferData, kMaxOpusOutputPacketSizeSamples, 0);
+                                          outputBufferData,
+                                          kMaxOpusOutputPacketSizeSamples, 0);
  }
  // record error code
@@ -139,9 +140,9 @@ DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs,
 DECODER_FUNC(jint, opusSecureDecode, jlong jDecoder, jlong jTimeUs,
             jobject jInputBuffer, jint inputSize, jobject jOutputBuffer,
-     jint sampleRate, jobject mediaCrypto, jint inputMode, jbyteArray key,
+             jint sampleRate, jobject mediaCrypto, jint inputMode,
-     jbyteArray javaIv, jint inputNumSubSamples, jintArray numBytesOfClearData,
+             jbyteArray key, jbyteArray javaIv, jint inputNumSubSamples,
-     jintArray numBytesOfEncryptedData) {
+             jintArray numBytesOfClearData, jintArray numBytesOfEncryptedData) {
  // Doesn't support
  // Java client should have checked vpxSupportSecureDecode
  // and avoid calling this
@@ -163,13 +164,9 @@ DECODER_FUNC(jstring, opusGetErrorMessage, jlong jContext) {
  return env->NewStringUTF(opus_strerror(errorCode));
 }
-DECODER_FUNC(jint, opusGetErrorCode, jlong jContext) {
+DECODER_FUNC(jint, opusGetErrorCode, jlong jContext) { return errorCode; }
-  return errorCode;
-}
-DECODER_FUNC(void, opusSetFloatOutput) {
+DECODER_FUNC(void, opusSetFloatOutput) { outputFloat = true; }
-  outputFloat = true;
-}
 LIBRARY_FUNC(jstring, opusIsSecureDecodeSupported) {
  // Doesn't support

--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -18,12 +18,12 @@
 #ifdef __ARM_NEON__
 #include <arm_neon.h>
 #endif
-#include <jni.h>
 #include <android/log.h>
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
+#include <jni.h>
 #include <pthread.h>
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>
@@ -31,12 +31,12 @@
 #include <new>
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "vpx/vpx_decoder.h"
 #include "vpx/vp8dx.h"
+#include "vpx/vpx_decoder.h"
 #define LOG_TAG "vpx_jni"
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, \
+#define LOGE(...) \
-                                             __VA_ARGS__))
+  ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
 #define DECODER_FUNC(RETURN_TYPE, NAME, ...)                        \
  extern "C" {                                                      \
@@ -480,12 +480,12 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
  // Populate JNI References.
  const jclass outputBufferClass = env->FindClass(
      "com/google/android/exoplayer2/video/VideoDecoderOutputBuffer");
-  initForYuvFrame = env->GetMethodID(outputBufferClass, "initForYuvFrame",
+  initForYuvFrame =
-                                     "(IIIII)Z");
+      env->GetMethodID(outputBufferClass, "initForYuvFrame", "(IIIII)Z");
  initForPrivateFrame =
      env->GetMethodID(outputBufferClass, "initForPrivateFrame", "(II)V");
-  dataField = env->GetFieldID(outputBufferClass, "data",
+  dataField =
-                              "Ljava/nio/ByteBuffer;");
+      env->GetFieldID(outputBufferClass, "data", "Ljava/nio/ByteBuffer;");
  outputModeField = env->GetFieldID(outputBufferClass, "mode", "I");
  decoderPrivateField =
      env->GetFieldID(outputBufferClass, "decoderPrivate", "I");