Skip to content

Commit

Permalink
WIP temporary fix for NDK 26
Browse files Browse the repository at this point in the history
  • Loading branch information
courville committed Oct 9, 2023
1 parent c80f36f commit a535a90
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
5 changes: 5 additions & 0 deletions jni/libavosjni/avos_media_metadata_retriever.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@
#include <dlfcn.h>
#include <stdio.h>
#include <pthread.h>
#include <string.h>
#include <stdlib.h>

#include "jni.h"

#include "libavos.h"

int jniThrowException(C_JNIEnv* env, const char* className, const char* msg);
int jniGetFDFromFileDescriptor(C_JNIEnv* env, jobject fileDescriptor);

static const avos_mr_handle_t *avos = NULL;
static const avos_metadata_handle_t *avos_metadata = NULL;

Expand Down
4 changes: 4 additions & 0 deletions jni/libavosjni/avos_media_player.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@
#include <dlfcn.h>
#include <pthread.h>
#include <sys/queue.h>
#include <stdlib.h>

#include <android/native_window_jni.h>

#include "jni.h"

int jniThrowException(C_JNIEnv* env, const char* className, const char* msg);
int jniGetFDFromFileDescriptor(C_JNIEnv* env, jobject fileDescriptor);

#include "libavos.h"

typedef struct event_msg {
Expand Down
4 changes: 4 additions & 0 deletions jni/libavosjni/libavos.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <stdio.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <unistd.h>

#include "jni.h"
#include "libavos.h"
Expand All @@ -38,6 +40,8 @@ void libavos_set_audio_interface(int audio_interface);
void libavos_set_codepage(int codepage);
void libavos_set_output_sample_rate(int sample_rate);
void libavos_set_passthrough(int force_passthrough);
void libavos_set_downmix(int downmix);
void libavos_set_hdmi_supported_audio_codecs(long flag);

fields_t fields;
extern JavaVM *myVm;
Expand Down

0 comments on commit a535a90

Please sign in to comment.