ray650128/GstreamerLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

整理排版

Browse Source
This commit is contained in:
Barney 2022-08-09 14:18:09 +08:00
parent 969c91e436
commit ca3744f8be
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gstreamer_player/jni/gst_player.c
View File

@ -253,8 +253,7 @@ static void *app_function(void *userdata) {
/* Build pipeline */ /* Build pipeline */
data->pipeline = gst_parse_launch("playbin", &error); data->pipeline = gst_parse_launch("playbin", &error);
if (error) { if (error) {
gchar *message = gchar *message = g_strdup_printf("Unable to build pipeline: %s", error->message);
g_strdup_printf("Unable to build pipeline: %s", error->message);
g_clear_error(&error); g_clear_error(&error);
set_ui_message(message, data); set_ui_message(message, data);
g_free(message); g_free(message);
@ -280,12 +279,9 @@ static void *app_function(void *userdata) {
g_signal_connect (G_OBJECT(bus), "message::error", (GCallback) error_cb, g_signal_connect (G_OBJECT(bus), "message::error", (GCallback) error_cb,
data); data);
g_signal_connect (G_OBJECT(bus), "message::eos", (GCallback) eos_cb, data); g_signal_connect (G_OBJECT(bus), "message::eos", (GCallback) eos_cb, data);
g_signal_connect (G_OBJECT(bus), "message::state-changed", g_signal_connect (G_OBJECT(bus), "message::state-changed", (GCallback) state_changed_cb, data);
(GCallback) state_changed_cb, data); g_signal_connect (G_OBJECT(bus), "message::buffering", (GCallback) buffering_cb, data);
g_signal_connect (G_OBJECT(bus), "message::buffering", g_signal_connect (G_OBJECT(bus), "message::clock-lost", (GCallback) clock_lost_cb, data);
(GCallback) buffering_cb, data);
g_signal_connect (G_OBJECT(bus), "message::clock-lost",
(GCallback) clock_lost_cb, data);
gst_object_unref(bus); gst_object_unref(bus);
/* Create a GLib Main Loop and set it to run */ /* Create a GLib Main Loop and set it to run */
@ -378,14 +374,10 @@ static void gst_native_pause(JNIEnv *env, jobject thiz) {
/* Static class initializer: retrieve method and field IDs */ /* Static class initializer: retrieve method and field IDs */
static jboolean gst_native_class_init(JNIEnv *env, jclass klass) { static jboolean gst_native_class_init(JNIEnv *env, jclass klass) {
custom_data_field_id = custom_data_field_id = (*env)->GetFieldID(env, klass, "native_custom_data", "J");
(*env)->GetFieldID(env, klass, "native_custom_data", "J"); set_message_method_id = (*env)->GetMethodID(env, klass, "setMessage", "(Ljava/lang/String;)V");
set_message_method_id = on_gstreamer_initialized_method_id = (*env)->GetMethodID(env, klass, "onGStreamerInitialized", "()V");
(*env)->GetMethodID(env, klass, "setMessage", "(Ljava/lang/String;)V"); on_media_size_changed_method_id = (*env)->GetMethodID(env, klass, "onMediaSizeChanged", "(II)V");
on_gstreamer_initialized_method_id =
(*env)->GetMethodID(env, klass, "onGStreamerInitialized", "()V");
on_media_size_changed_method_id =
(*env)->GetMethodID(env, klass, "onMediaSizeChanged", "(II)V");
if (!custom_data_field_id || !set_message_method_id if (!custom_data_field_id || !set_message_method_id
|| !on_gstreamer_initialized_method_id || !on_media_size_changed_method_id) { || !on_gstreamer_initialized_method_id || !on_media_size_changed_method_id) {
@ -414,7 +406,6 @@ static void gst_native_surface_init(JNIEnv *env, jobject thiz, jobject surface)
data->native_window); data->native_window);
if (data->pipeline) { if (data->pipeline) {
gst_video_overlay_expose(GST_VIDEO_OVERLAY (data->pipeline)); gst_video_overlay_expose(GST_VIDEO_OVERLAY (data->pipeline));
gst_video_overlay_expose(GST_VIDEO_OVERLAY (data->pipeline));
} }
return; return;
} else { } else {

3
gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.java
View File

@ -128,12 +128,13 @@ public class GstLibrary implements SurfaceHolder.Callback {
} }
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
nativeSurfaceInit (holder.getSurface());
Log.d("GStreamer", "Surface created: " + holder.getSurface()); Log.d("GStreamer", "Surface created: " + holder.getSurface());
nativeSurfaceInit (holder.getSurface());
} }
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
Log.d("GStreamer", "Surface destroyed"); Log.d("GStreamer", "Surface destroyed");
nativePause();
nativeSurfaceFinalize(); nativeSurfaceFinalize();
} }
} }