From 0de6bc861a7e0939386090c648aad8cc7c34a51e Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 20 May 2021 11:00:13 +0100 Subject: [PATCH] Format *_jni.cc files PiperOrigin-RevId: 374830877 --- extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc | 39 ++++---- extensions/flac/src/main/jni/flac_jni.cc | 17 ++-- extensions/opus/src/main/jni/opus_jni.cc | 93 ++++++++++---------- extensions/vp9/src/main/jni/vpx_jni.cc | 26 +++--- 4 files changed, 86 insertions(+), 89 deletions(-) diff --git a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc index 089fe7ed53..947d535c7d 100644 --- 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 #include #include -#include 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, \ - __VA_ARGS__)) +#define LOGE(...) \ + ((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(&env), JNI_VERSION_1_6) != JNI_OK) { + if (vm->GetEnv(reinterpret_cast(&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 *outputBuffer = (uint8_t *) env->GetDirectBufferAddress(outputData); + uint8_t *inputBuffer = (uint8_t *)env->GetDirectBufferAddress(inputData); + 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) { @@ -299,14 +299,14 @@ int decodePacket(AVCodecContext *context, AVPacket *packet, resampleContext = (SwrContext *)context->opaque; } else { resampleContext = swr_alloc(); - av_opt_set_int(resampleContext, "in_channel_layout", channelLayout, 0); + av_opt_set_int(resampleContext, "in_channel_layout", channelLayout, 0); av_opt_set_int(resampleContext, "out_channel_layout", channelLayout, 0); av_opt_set_int(resampleContext, "in_sample_rate", sampleRate, 0); av_opt_set_int(resampleContext, "out_sample_rate", sampleRate, 0); av_opt_set_int(resampleContext, "in_sample_fmt", sampleFormat, 0); // The output format is always the requested format. av_opt_set_int(resampleContext, "out_sample_fmt", - context->request_sample_fmt, 0); + context->request_sample_fmt, 0); result = swr_init(resampleContext); if (result < 0) { logError("swr_init", result); @@ -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); } - diff --git a/extensions/flac/src/main/jni/flac_jni.cc b/extensions/flac/src/main/jni/flac_jni.cc index 50db06f436..d59e8b0615 100644 --- a/extensions/flac/src/main/jni/flac_jni.cc +++ b/extensions/flac/src/main/jni/flac_jni.cc @@ -29,14 +29,15 @@ #define ALOGV(...) \ ((void)__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) -#define DECODER_FUNC(RETURN_TYPE, NAME, ...) \ - extern "C" { \ - JNIEXPORT RETURN_TYPE \ - Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME( \ - JNIEnv *env, jobject thiz, ##__VA_ARGS__); \ - } \ - JNIEXPORT RETURN_TYPE \ - Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME( \ +#define DECODER_FUNC(RETURN_TYPE, NAME, ...) \ + extern "C" { \ + JNIEXPORT RETURN_TYPE \ + Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME(JNIEnv *env, \ + jobject thiz, \ + ##__VA_ARGS__); \ + } \ + JNIEXPORT RETURN_TYPE \ + Java_com_google_android_exoplayer2_ext_flac_FlacDecoderJni_##NAME( \ JNIEnv *env, jobject thiz, ##__VA_ARGS__) class JavaDataSource : public DataSource { diff --git a/extensions/opus/src/main/jni/opus_jni.cc b/extensions/opus/src/main/jni/opus_jni.cc index a2515be7f6..96c2838039 100644 --- a/extensions/opus/src/main/jni/opus_jni.cc +++ b/extensions/opus/src/main/jni/opus_jni.cc @@ -14,38 +14,37 @@ * limitations under the License. */ -#include - #include +#include #include -#include "opus.h" // NOLINT +#include "opus.h" // NOLINT #include "opus_multistream.h" // NOLINT #define LOG_TAG "opus_jni" -#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, \ - __VA_ARGS__)) +#define LOGE(...) \ + ((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 \ - (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\ - } \ - JNIEXPORT RETURN_TYPE \ - Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_ ## NAME \ - (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\ +#define DECODER_FUNC(RETURN_TYPE, NAME, ...) \ + extern "C" { \ + JNIEXPORT RETURN_TYPE \ + Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_##NAME( \ + JNIEnv* env, jobject thiz, ##__VA_ARGS__); \ + } \ + JNIEXPORT RETURN_TYPE \ + Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_##NAME( \ + 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 \ - (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\ - } \ - JNIEXPORT RETURN_TYPE \ - Java_com_google_android_exoplayer2_ext_opus_OpusLibrary_ ## NAME \ - (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( \ + JNIEnv* env, jobject thiz, ##__VA_ARGS__); \ + } \ + JNIEXPORT RETURN_TYPE \ + Java_com_google_android_exoplayer2_ext_opus_OpusLibrary_##NAME( \ + 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,21 +88,20 @@ 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", - "(JI)Ljava/nio/ByteBuffer;"); + outputBufferInit = + env->GetMethodID(outputBufferClass, "init", "(JI)Ljava/nio/ByteBuffer;"); return reinterpret_cast(decoder); } DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs, - jobject jInputBuffer, jint inputSize, jobject jOutputBuffer) { + jobject jInputBuffer, jint inputSize, jobject jOutputBuffer) { OpusMSDecoder* decoder = reinterpret_cast(jDecoder); - const uint8_t* inputBuffer = - reinterpret_cast( - env->GetDirectBufferAddress(jInputBuffer)); + const uint8_t* inputBuffer = reinterpret_cast( + env->GetDirectBufferAddress(jInputBuffer)); - const int byteSizePerSample = outputFloat ? - kBytesPerFloatSample : kBytesPerIntPcmSample; + const int byteSizePerSample = + 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, - outputBufferInit, jTimeUs, outputSize); + const jobject jOutputBufferData = env->CallObjectMethod( + jOutputBuffer, outputBufferInit, jTimeUs, outputSize); if (env->ExceptionCheck()) { // Exception is thrown in Java when returning from the native call. return -1; @@ -122,26 +121,28 @@ DECODER_FUNC(jint, opusDecode, jlong jDecoder, jlong jTimeUs, if (outputFloat) { float* outputBufferData = reinterpret_cast( env->GetDirectBufferAddress(jOutputBufferData)); - sampleCount = opus_multistream_decode_float(decoder, inputBuffer, inputSize, - outputBufferData, kMaxOpusOutputPacketSizeSamples, 0); + sampleCount = opus_multistream_decode_float( + decoder, inputBuffer, inputSize, outputBufferData, + kMaxOpusOutputPacketSizeSamples, 0); } else { int16_t* outputBufferData = reinterpret_cast( env->GetDirectBufferAddress(jOutputBufferData)); sampleCount = opus_multistream_decode(decoder, inputBuffer, inputSize, - outputBufferData, kMaxOpusOutputPacketSizeSamples, 0); + outputBufferData, + kMaxOpusOutputPacketSizeSamples, 0); } // record error code errorCode = (sampleCount < 0) ? sampleCount : 0; return (sampleCount < 0) ? sampleCount - : sampleCount * byteSizePerSample * channelCount; + : sampleCount * byteSizePerSample * channelCount; } DECODER_FUNC(jint, opusSecureDecode, jlong jDecoder, jlong jTimeUs, - jobject jInputBuffer, jint inputSize, jobject jOutputBuffer, - jint sampleRate, jobject mediaCrypto, jint inputMode, jbyteArray key, - jbyteArray javaIv, jint inputNumSubSamples, jintArray numBytesOfClearData, - jintArray numBytesOfEncryptedData) { + jobject jInputBuffer, jint inputSize, jobject jOutputBuffer, + jint sampleRate, jobject mediaCrypto, jint inputMode, + jbyteArray key, jbyteArray javaIv, jint inputNumSubSamples, + 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) { - return errorCode; -} +DECODER_FUNC(jint, opusGetErrorCode, jlong jContext) { return errorCode; } -DECODER_FUNC(void, opusSetFloatOutput) { - outputFloat = true; -} +DECODER_FUNC(void, opusSetFloatOutput) { outputFloat = true; } LIBRARY_FUNC(jstring, opusIsSecureDecodeSupported) { // Doesn't support diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc index 59426e302e..3f4c89dc7b 100644 --- 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 #endif -#include - #include #include #include +#include #include + #include #include #include @@ -31,12 +31,12 @@ #include #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, \ - __VA_ARGS__)) +#define LOGE(...) \ + ((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", - "(IIIII)Z"); + initForYuvFrame = + env->GetMethodID(outputBufferClass, "initForYuvFrame", "(IIIII)Z"); initForPrivateFrame = env->GetMethodID(outputBufferClass, "initForPrivateFrame", "(II)V"); - dataField = env->GetFieldID(outputBufferClass, "data", - "Ljava/nio/ByteBuffer;"); + dataField = + env->GetFieldID(outputBufferClass, "data", "Ljava/nio/ByteBuffer;"); outputModeField = env->GetFieldID(outputBufferClass, "mode", "I"); decoderPrivateField = env->GetFieldID(outputBufferClass, "decoderPrivate", "I"); @@ -508,9 +508,9 @@ DECODER_FUNC(jlong, vpxDecode, jlong jContext, jobject encoded, jint len) { } DECODER_FUNC(jlong, vpxSecureDecode, jlong jContext, jobject encoded, jint len, - jobject mediaCrypto, jint inputMode, jbyteArray&, jbyteArray&, - jint inputNumSubSamples, jintArray numBytesOfClearData, - jintArray numBytesOfEncryptedData) { + jobject mediaCrypto, jint inputMode, jbyteArray&, jbyteArray&, + jint inputNumSubSamples, jintArray numBytesOfClearData, + jintArray numBytesOfEncryptedData) { // Doesn't support // Java client should have checked vpxSupportSecureDecode // and avoid calling this @@ -552,7 +552,7 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) { case VPX_CS_BT_709: colorspace = kColorspaceBT709; break; - case VPX_CS_BT_2020: + case VPX_CS_BT_2020: colorspace = kColorspaceBT2020; break; default: