atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

api-impl{-jni}: fix code style issues missed during review

Browse Source
This commit is contained in:
Mis012
2023-10-17 21:57:48 +02:00
parent 4a0755c6e0
commit 621cb866c1
3 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/api-impl-jni/media/android_media_MediaCodec.c
View File

@@ -48,7 +48,8 @@ struct ATL_codec_context {
static enum AVPixelFormat hw_pix_fmt = AV_PIX_FMT_NONE; static enum AVPixelFormat hw_pix_fmt = AV_PIX_FMT_NONE;
JNIEXPORT jlong JNICALL Java_android_media_MediaCodec_native_1constructor(JNIEnv *env, jobject this, jstring codec_name) { JNIEXPORT jlong JNICALL Java_android_media_MediaCodec_native_1constructor(JNIEnv *env, jobject this, jstring codec_name)
{
const char *name = (*env)->GetStringUTFChars(env, codec_name, NULL); const char *name = (*env)->GetStringUTFChars(env, codec_name, NULL);
const AVCodec *codec = avcodec_find_decoder_by_name(name); const AVCodec *codec = avcodec_find_decoder_by_name(name);
(*env)->ReleaseStringUTFChars(env, codec_name, name); (*env)->ReleaseStringUTFChars(env, codec_name, name);
@@ -59,7 +60,8 @@ JNIEXPORT jlong JNICALL Java_android_media_MediaCodec_native_1constructor(JNIEnv
return _INTPTR(ctx); return _INTPTR(ctx);
} }
JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1configure_1audio(JNIEnv *env, jobject this, jlong codec, jobject extradata, jint sample_rate, jint nb_channels) { JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1configure_1audio(JNIEnv *env, jobject this, jlong codec, jobject extradata, jint sample_rate, jint nb_channels)
{
struct ATL_codec_context *ctx = _PTR(codec); struct ATL_codec_context *ctx = _PTR(codec);
AVCodecContext *codec_ctx = ctx->codec; AVCodecContext *codec_ctx = ctx->codec;
jarray array_ref; jarray array_ref;
@@ -95,7 +97,8 @@ static const struct {
{ DRM_FORMAT_NV12, 2, { DRM_FORMAT_R8, DRM_FORMAT_GR88 } }, { DRM_FORMAT_NV12, 2, { DRM_FORMAT_R8, DRM_FORMAT_GR88 } },
}; };
static uint32_t get_drm_frame_format(const AVDRMFrameDescriptor *drm_frame_desc) { static uint32_t get_drm_frame_format(const AVDRMFrameDescriptor *drm_frame_desc)
{
if (drm_frame_desc->nb_layers == 1) { if (drm_frame_desc->nb_layers == 1) {
return drm_frame_desc->layers[0].format; return drm_frame_desc->layers[0].format;
} }
@@ -114,7 +117,8 @@ static uint32_t get_drm_frame_format(const AVDRMFrameDescriptor *drm_frame_desc)
return DRM_FORMAT_INVALID; return DRM_FORMAT_INVALID;
} }
static int check_hw_device_type(enum AVHWDeviceType type) { static int check_hw_device_type(enum AVHWDeviceType type)
{
enum AVHWDeviceType t = AV_HWDEVICE_TYPE_NONE; enum AVHWDeviceType t = AV_HWDEVICE_TYPE_NONE;
while (1) { while (1) {
t = av_hwdevice_iterate_types(t); t = av_hwdevice_iterate_types(t);
@@ -129,7 +133,8 @@ static int check_hw_device_type(enum AVHWDeviceType type) {
} }
static enum AVPixelFormat get_hw_format(AVCodecContext *ctx, static enum AVPixelFormat get_hw_format(AVCodecContext *ctx,
const enum AVPixelFormat *pix_fmts) { const enum AVPixelFormat *pix_fmts)
{
for (size_t i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) { for (size_t i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) {
if (pix_fmts[i] == hw_pix_fmt) { if (pix_fmts[i] == hw_pix_fmt) {
return hw_pix_fmt; return hw_pix_fmt;
@@ -141,7 +146,8 @@ static enum AVPixelFormat get_hw_format(AVCodecContext *ctx,
} }
static void handle_global(void *data, struct wl_registry *registry, static void handle_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface, uint32_t version) { uint32_t name, const char *interface, uint32_t version)
{
struct ATL_codec_context *ctx = data; struct ATL_codec_context *ctx = data;
if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0) { if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0) {
ctx->video.zwp_linux_dmabuf_v1 = ctx->video.zwp_linux_dmabuf_v1 =
@@ -153,7 +159,8 @@ static void handle_global(void *data, struct wl_registry *registry,
} }
static void handle_global_remove(void *data, struct wl_registry *registry, static void handle_global_remove(void *data, struct wl_registry *registry,
uint32_t name) { uint32_t name)
{
// This space is intentionally left blank // This space is intentionally left blank
} }
@@ -163,7 +170,8 @@ static const struct wl_registry_listener registry_listener = {
}; };
static struct wl_buffer *import_drm_frame_desc(struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf_v1, static struct wl_buffer *import_drm_frame_desc(struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf_v1,
const AVDRMFrameDescriptor *drm_frame_desc, int width, int height) { const AVDRMFrameDescriptor *drm_frame_desc, int width, int height)
{
// VA-API drivers may use separate layers with one plane each, or a single // VA-API drivers may use separate layers with one plane each, or a single
// layer with multiple planes. We need to handle both. // layer with multiple planes. We need to handle both.
uint32_t drm_format = get_drm_frame_format(drm_frame_desc); uint32_t drm_format = get_drm_frame_format(drm_frame_desc);
@@ -197,7 +205,8 @@ static struct wl_buffer *import_drm_frame_desc(struct zwp_linux_dmabuf_v1 *zwp_l
width, height, drm_format, 0); width, height, drm_format, 0);
} }
static void handle_buffer_release(void *data, struct wl_buffer *buffer) { static void handle_buffer_release(void *data, struct wl_buffer *buffer)
{
AVFrame *frame = data; AVFrame *frame = data;
av_frame_free(&frame); av_frame_free(&frame);
@@ -208,7 +217,8 @@ static const struct wl_buffer_listener buffer_listener = {
.release = handle_buffer_release, .release = handle_buffer_release,
}; };
JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1configure_1video(JNIEnv *env, jobject this, jlong codec, jobject csd0, jobject csd1, jobject surface_obj) { JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1configure_1video(JNIEnv *env, jobject this, jlong codec, jobject csd0, jobject csd1, jobject surface_obj)
{
struct ATL_codec_context *ctx = _PTR(codec); struct ATL_codec_context *ctx = _PTR(codec);
AVCodecContext *codec_ctx = ctx->codec; AVCodecContext *codec_ctx = ctx->codec;
jarray array_ref; jarray array_ref;
@@ -280,7 +290,8 @@ JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1configure_1video(JN
ctx->video.surface_height = gtk_widget_get_height(native_window->surface_view_widget); ctx->video.surface_height = gtk_widget_get_height(native_window->surface_view_widget);
} }
JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1start(JNIEnv *env, jobject this, jlong codec) { JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1start(JNIEnv *env, jobject this, jlong codec)
{
struct ATL_codec_context *ctx = _PTR(codec); struct ATL_codec_context *ctx = _PTR(codec);
AVCodecContext *codec_ctx = ctx->codec; AVCodecContext *codec_ctx = ctx->codec;
@@ -335,7 +346,8 @@ JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1start(JNIEnv *env,
#define INFO_TRY_AGAIN_LATER -1 #define INFO_TRY_AGAIN_LATER -1
JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1queueInputBuffer(JNIEnv *env, jobject this, jlong codec, jobject buffer, jlong presentationTimeUs) { JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1queueInputBuffer(JNIEnv *env, jobject this, jlong codec, jobject buffer, jlong presentationTimeUs)
{
jarray array_ref; jarray array_ref;
jbyte *array; jbyte *array;
int ret; int ret;
@@ -355,7 +367,8 @@ JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1queueInputBuffer(JN
return ret; return ret;
} }
JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1dequeueOutputBuffer(JNIEnv *env, jobject this, jlong codec, jobject buffer, jobject buffer_info) { JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1dequeueOutputBuffer(JNIEnv *env, jobject this, jlong codec, jobject buffer, jobject buffer_info)
{
struct ATL_codec_context *ctx = _PTR(codec); struct ATL_codec_context *ctx = _PTR(codec);
AVCodecContext *codec_ctx = ctx->codec; AVCodecContext *codec_ctx = ctx->codec;
AVFrame *frame = av_frame_alloc(); AVFrame *frame = av_frame_alloc();
@@ -394,7 +407,8 @@ JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1dequeueOutputBuffer
// callback to perform wayland stuff on main thread // callback to perform wayland stuff on main thread
struct render_frame_data {AVFrame *frame; struct ATL_codec_context *ctx;}; struct render_frame_data {AVFrame *frame; struct ATL_codec_context *ctx;};
static gboolean render_frame(void *data) { static gboolean render_frame(void *data)
{
struct render_frame_data *d = (struct render_frame_data *)data; struct render_frame_data *d = (struct render_frame_data *)data;
AVFrame *frame = d->frame; AVFrame *frame = d->frame;
struct ATL_codec_context *ctx = d->ctx; struct ATL_codec_context *ctx = d->ctx;
@@ -431,7 +445,8 @@ static gboolean render_frame(void *data) {
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1releaseOutputBuffer(JNIEnv *env, jobject this, jlong codec, jobject buffer, jboolean render) { JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1releaseOutputBuffer(JNIEnv *env, jobject this, jlong codec, jobject buffer, jboolean render)
{
struct ATL_codec_context *ctx = _PTR(codec); struct ATL_codec_context *ctx = _PTR(codec);
jarray array_ref; jarray array_ref;
jbyte *array; jbyte *array;

9
src/api-impl-jni/util.c
View File

@@ -197,7 +197,8 @@ int android_log_printf(android_LogPriority prio, const char *tag, const char *fm
return ret; return ret;
} }
void *get_nio_buffer(JNIEnv *env, jobject buffer, jarray *array_ref, jbyte **array) { void *get_nio_buffer(JNIEnv *env, jobject buffer, jarray *array_ref, jbyte **array)
{
jclass class; jclass class;
void *pointer; void *pointer;
int elementSizeShift, position; int elementSizeShift, position;
@@ -222,12 +223,14 @@ void *get_nio_buffer(JNIEnv *env, jobject buffer, jarray *array_ref, jbyte **arr
return pointer; return pointer;
} }
void release_nio_buffer(JNIEnv *env, jarray array_ref, jbyte *array) { void release_nio_buffer(JNIEnv *env, jarray array_ref, jbyte *array)
{
if (array_ref) if (array_ref)
(*env)->ReleasePrimitiveArrayCritical(env, array_ref, array, 0); (*env)->ReleasePrimitiveArrayCritical(env, array_ref, array, 0);
} }
int get_nio_buffer_size(JNIEnv *env, jobject buffer) { int get_nio_buffer_size(JNIEnv *env, jobject buffer)
{
jclass class = _CLASS(buffer);; jclass class = _CLASS(buffer);;
int limit = (*env)->GetIntField(env, buffer, _FIELD_ID(class, "limit", "I")); int limit = (*env)->GetIntField(env, buffer, _FIELD_ID(class, "limit", "I"));
int position = (*env)->GetIntField(env, buffer, _FIELD_ID(class, "position", "I")); int position = (*env)->GetIntField(env, buffer, _FIELD_ID(class, "position", "I"));

2
src/api-impl/android/media/MediaCodecInfo.java
View File

@@ -7,7 +7,7 @@ public class MediaCodecInfo {
public MediaCodecInfo(String name, String mime) { public MediaCodecInfo(String name, String mime) {
this.name = name; this.name = name;
this.mime = mime; this.mime = mime;
} }
public String getName() { public String getName() {