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

refactor SurfaceViewWidget for frame_callback in the Wayland server

Browse Source 
SurfaceViewWidget is now always a child of a GtkGraphicsOffload and
handles the GdkTexture on its own. This way the extra GtkPicture is no
longer needed and also the frame_callback of the Wayland server can be
implemented.
This commit is contained in:
Julian Winkler
2024-11-17 16:42:47 +01:00
parent 58f29b7ba2
commit 4b36bca4c6
5 changed files with 132 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include "../util.h"
#include "../defines.h"
#include "../../libandroid/native_window.h"
#include "../widgets/android_view_SurfaceView.h"
struct ATL_codec_context {
AVCodecContext *codec;
@@ -42,7 +43,7 @@ struct ATL_codec_context {
} audio;
struct {
struct SwsContext *sws; // for software decoding
GtkPicture *gtk_picture;
SurfaceViewWidget *surface_view_widget;
#if !GTK_CHECK_VERSION(4, 14, 0)
struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf_v1;
struct wp_viewporter *wp_viewporter;
@@ -147,7 +148,7 @@ static enum AVPixelFormat get_hw_format(AVCodecContext *ctx,
struct render_frame_data {
AVFrame *frame;
GdkTexture *texture; // for software decoding
GtkPicture *gtk_picture;
SurfaceViewWidget *surface_view_widget;
#if !GTK_CHECK_VERSION(4, 14, 0)
struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf_v1;
struct ANativeWindow *native_window;
@@ -351,21 +352,9 @@ JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1configure_1video(JN
i++;
}
GtkWidget *surface_view_widget = _PTR(_GET_LONG_FIELD(surface_obj, "widget"));
#if GTK_CHECK_VERSION(4, 14, 0)
GtkWidget *graphics_offload = gtk_widget_get_first_child(surface_view_widget);
if (!GTK_IS_GRAPHICS_OFFLOAD(graphics_offload)) {
graphics_offload = gtk_graphics_offload_new(gtk_picture_new());
gtk_widget_insert_after(graphics_offload, surface_view_widget, NULL);
}
ctx->video.gtk_picture = GTK_PICTURE(gtk_graphics_offload_get_child(GTK_GRAPHICS_OFFLOAD(graphics_offload)));
#else
GtkWidget *gtk_picture = gtk_widget_get_first_child(surface_view_widget);
if (!GTK_IS_PICTURE(gtk_picture)) {
gtk_picture = gtk_picture_new();
gtk_widget_insert_after(gtk_picture, surface_view_widget, NULL);
}
ctx->video.gtk_picture = GTK_PICTURE(gtk_picture);
SurfaceViewWidget *surface_view_widget = SURFACE_VIEW_WIDGET(gtk_widget_get_first_child(_PTR(_GET_LONG_FIELD(surface_obj, "widget"))));
ctx->video.surface_view_widget = surface_view_widget;
#if !GTK_CHECK_VERSION(4, 14, 0)
struct ANativeWindow *native_window = ANativeWindow_fromSurface(env, surface_obj);
ctx->video.native_window = native_window;
ctx->video.surface_width = gtk_widget_get_width(native_window->surface_view_widget);
@@ -528,8 +517,7 @@ static gboolean render_frame(void *data)
#if GTK_CHECK_VERSION(4, 14, 0)
GdkTexture *texture = import_drm_frame_desc_as_texture(drm_frame_desc, drm_frame->width, drm_frame->height, drm_frame);
gtk_picture_set_paintable(d->gtk_picture, GDK_PAINTABLE(texture));
g_object_unref(texture);
surface_view_widget_set_texture(d->surface_view_widget, texture);
#else
struct wl_buffer *wl_buffer = import_drm_frame_desc(d->zwp_linux_dmabuf_v1,
drm_frame_desc, drm_frame->width, drm_frame->height);
@@ -553,8 +541,7 @@ static gboolean render_frame(void *data)
static gboolean render_texture(void *data) {
struct render_frame_data *d = (struct render_frame_data *)data;
gtk_picture_set_paintable(d->gtk_picture, GDK_PAINTABLE(d->texture));
g_object_unref(d->texture);
surface_view_widget_set_texture(d->surface_view_widget, d->texture);
free(d);
return G_SOURCE_REMOVE;
@@ -608,7 +595,7 @@ JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1releaseOutputBuffer
GdkTexture *texture = gdk_memory_texture_new(frame->width, frame->height, gdk_mem_fmt, bytes, stride);
struct render_frame_data *data = malloc(sizeof(struct render_frame_data));
data->texture = texture;
data->gtk_picture = ctx->video.gtk_picture;
data->surface_view_widget = ctx->video.surface_view_widget;
g_idle_add(render_texture, data);
g_bytes_unref (bytes);
av_frame_free(&frame);
@@ -618,7 +605,7 @@ JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1releaseOutputBuffer
struct render_frame_data *data = malloc(sizeof(struct render_frame_data));
data->frame = frame;
#if GTK_CHECK_VERSION(4, 14, 0)
data->gtk_picture = ctx->video.gtk_picture;
data->surface_view_widget = ctx->video.surface_view_widget;
#else
data->native_window = ctx->video.native_window;
data->zwp_linux_dmabuf_v1 = ctx->video.zwp_linux_dmabuf_v1;

76
src/api-impl-jni/widgets/android_view_SurfaceView.c
View File

@@ -7,20 +7,7 @@
#include "marshal.h"
#include "../generated_headers/android_view_SurfaceView.h"
// TODO: currently this widget class doesn't do anything special, will we ever need it to?
G_DECLARE_FINAL_TYPE (SurfaceViewWidget, surface_view_widget, SURFACE_VIEW, WIDGET, GtkWidget)
struct _SurfaceViewWidget
{
GtkWidget parent_instance;
};
struct _SurfaceViewWidgetClass
{
GtkWidgetClass parent_class;
};
#include "android_view_SurfaceView.h"
G_DEFINE_TYPE(SurfaceViewWidget, surface_view_widget, GTK_TYPE_WIDGET)
@@ -45,12 +32,36 @@ static void surface_view_widget_size_allocate(GtkWidget *widget, int width, int
}
}
static void surface_view_widget_snapshot(GtkWidget *widget, GdkSnapshot *snapshot)
{
SurfaceViewWidget *surface_view_widget = SURFACE_VIEW_WIDGET(widget);
if (surface_view_widget->texture) {
graphene_rect_t bounds = GRAPHENE_RECT_INIT(0, 0, gtk_widget_get_width(widget), gtk_widget_get_height(widget));
gtk_snapshot_append_texture(snapshot, surface_view_widget->texture, &bounds);
}
if (surface_view_widget->frame_callback) {
surface_view_widget->frame_callback(surface_view_widget);
surface_view_widget->frame_callback = NULL;
}
}
static void surface_view_widget_dispose(GObject *object) {
SurfaceViewWidget *surface_view_widget = SURFACE_VIEW_WIDGET(object);
if (surface_view_widget->texture) {
g_object_unref(surface_view_widget->texture);
surface_view_widget->texture = NULL;
}
G_OBJECT_CLASS(surface_view_widget_parent_class)->dispose(object);
}
static void surface_view_widget_class_init(SurfaceViewWidgetClass *class)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
// resize signal copied from GtkDrawingArea
widget_class->size_allocate = surface_view_widget_size_allocate;
widget_class->snapshot = surface_view_widget_snapshot;
G_OBJECT_CLASS(class)->dispose = surface_view_widget_dispose;
signals[RESIZE] =
g_signal_new("resize",
@@ -70,6 +81,14 @@ GtkWidget * surface_view_widget_new(void)
return g_object_new (surface_view_widget_get_type(), NULL);
}
void surface_view_widget_set_texture(SurfaceViewWidget *surface_view_widget, GdkTexture *texture)
{
if (surface_view_widget->texture)
g_object_unref(surface_view_widget->texture);
surface_view_widget->texture = texture;
gtk_widget_queue_draw(GTK_WIDGET(surface_view_widget));
}
// ---
struct jni_callback_data { JavaVM *jvm; jobject this; jclass this_class;};
@@ -98,16 +117,20 @@ JNIEXPORT jlong JNICALL Java_android_view_SurfaceView_native_1constructor(JNIEnv
GtkWidget *wrapper = g_object_ref(wrapper_widget_new());
GtkWidget *dummy = surface_view_widget_new();
gtk_widget_set_name(dummy, "dummy widget for SurfaceView");
wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), dummy);
#if GTK_CHECK_VERSION(4, 14, 0)
GtkWidget *graphics_offload = gtk_graphics_offload_new(dummy);
#else
// use a dummy GtkBox, so that the SurfaceViewWidget also becomes a grand child of the WrapperWidget
GtkWidget *graphics_offload = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_vexpand(dummy, TRUE);
gtk_widget_set_hexpand(dummy, TRUE);
gtk_widget_insert_before(dummy, graphics_offload, NULL);
#endif
wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), graphics_offload);
wrapper_widget_set_jobject(WRAPPER_WIDGET(wrapper), env, this);
// TODO: is this correct for all usecases? how do we know when it's not?
gtk_widget_set_hexpand(wrapper, true);
gtk_widget_set_vexpand(wrapper, true);
#if GTK_CHECK_VERSION(4, 14, 0)
gtk_widget_insert_after(gtk_graphics_offload_new(gtk_picture_new()), dummy, NULL);
#else
gtk_widget_insert_after(gtk_picture_new(), dummy, NULL);
#endif
JavaVM *jvm;
(*env)->GetJavaVM(env, &jvm);
@@ -120,7 +143,7 @@ JNIEXPORT jlong JNICALL Java_android_view_SurfaceView_native_1constructor(JNIEnv
g_signal_connect(dummy, "resize", G_CALLBACK(on_resize), callback_data);
g_signal_connect(dummy, "realize", G_CALLBACK(on_realize), callback_data);
return _INTPTR(dummy);
return _INTPTR(graphics_offload);
}
JNIEXPORT jlong JNICALL Java_android_view_SurfaceView_native_1createSnapshot(JNIEnv *env, jclass class)
@@ -133,19 +156,14 @@ extern GtkWindow *window;
JNIEXPORT void JNICALL Java_android_view_SurfaceView_native_1postSnapshot(JNIEnv *env, jclass class, jlong surface_view, jlong snapshot_ptr)
{
GtkWidget *view = GTK_WIDGET(_PTR(surface_view));
#if GTK_CHECK_VERSION(4, 14, 0)
GtkPicture *picture = GTK_PICTURE(gtk_widget_get_first_child(gtk_widget_get_first_child(view)));
#else
GtkPicture *picture = GTK_PICTURE(gtk_widget_get_first_child(view));
#endif
SurfaceViewWidget *surface_view_widget = SURFACE_VIEW_WIDGET(gtk_widget_get_first_child(view));
GtkSnapshot *snapshot = GTK_SNAPSHOT(_PTR(snapshot_ptr));
GskRenderer *renderer = gsk_renderer_new_for_surface(gtk_native_get_surface(GTK_NATIVE(window)));
GskRenderNode *node = gtk_snapshot_free_to_node(snapshot);
GdkTexture *paintable = gsk_renderer_render_texture(renderer, node, NULL);
GdkTexture *texture = gsk_renderer_render_texture(renderer, node, NULL);
gsk_render_node_unref(node);
gsk_renderer_unrealize(renderer);
g_object_unref(renderer);
gtk_picture_set_paintable(picture, GDK_PAINTABLE(paintable));
g_object_unref(paintable);
surface_view_widget_set_texture(surface_view_widget, texture);
}

18
src/api-impl-jni/widgets/android_view_SurfaceView.h Normal file
View File

@@ -0,0 +1,18 @@
#include <gtk/gtk.h>
G_DECLARE_FINAL_TYPE (SurfaceViewWidget, surface_view_widget, SURFACE_VIEW, WIDGET, GtkWidget)
struct _SurfaceViewWidget
{
GtkWidget parent_instance;
GdkTexture *texture;
void (*frame_callback)(SurfaceViewWidget *surface_view_widget);
gpointer frame_callback_data;
};
struct _SurfaceViewWidgetClass
{
GtkWidgetClass parent_class;
};
void surface_view_widget_set_texture(SurfaceViewWidget *surface_view_widget, GdkTexture *texture);