Revert "audio & video player: migrate to common playbin implementation" (#482)

Accidentally merged before it was ready.

* Revert "gstplayer: don't use sd_event_source_disable_unref"

This reverts commit 5c296de.

* Revert "gstplayer: only define appsink event handler for gstreamer >= 1.20.0"

This reverts commit 0e85a9e.

* Revert "gstplayer: don't use gst_video_info_new_from_caps"

This reverts commit d1ae60a.

* Revert "Revert "video player: disable hw decoding for gstreamer < 1.22.8""

This reverts commit 6027cca.

* Revert "cmake: remove deleted `audioplayers/player.c` file"

This reverts commit 18bdd03.

* Revert "modesetting: remove logs if a separate cursor plane couldn't be found"

This reverts commit 8f02bf1.

* Revert "gstplayer: move gstplayer into separate file"

This reverts commit adbb903.

* Revert "audioplayers: migrate to gstplayer"

This reverts commit 63efdca.

* Revert "gstplayer: feature parity with audioplayers player"

This reverts commit 5c617ce.

* Revert "gitignore: ignore .cache"

This reverts commit 91dfa31.

* Revert "platform channels: helpers for decoding method calls"

This reverts commit f14dcd5.

* Revert "util: add khash hashmap implementation"

This reverts commit 8870ffb.

* Revert "video player: make seek flags construction a bit more easier to follow"

This reverts commit 7a88da9.

* Revert "video player: disable hw decoding for gstreamer < 1.22.8"

This reverts commit 8d0fe72.

* Revert "video player: fix parameter in g_object_set"

This reverts commit f4fb9b7.

* Revert "video player: fix code for gstreamer < 1.24.0"

This reverts commit edb54a3.

* Revert "video player: don't handle dma_drm video info"

This reverts commit 3efc24a.

* Revert "video player: use playbin3 instead of uridecodebin"

This reverts commit 1fd62ad.

* Revert "video player: use square BO"

This reverts commit 9a8689a.

Author: ardera

.gitignore

@@ -99,6 +99,3 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
-
-# Used by zed to store clangd cache
-.cache

CMakeLists.txt

@@ -305,65 +305,73 @@ endif()
 if (BUILD_TEST_PLUGIN)
   target_sources(flutterpi_module PRIVATE src/plugins/testplugin.c)
 endif()
-
-set(HAVE_GSTREAMER_VIDEO_PLAYER OFF)
-if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN OR BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN)#
-  pkg_check_modules(LIBGSTREAMER IMPORTED_TARGET
-    gstreamer-1.0
-    gstreamer-plugins-base-1.0
-    gstreamer-app-1.0
-    gstreamer-allocators-1.0
-    gstreamer-video-1.0
-    gstreamer-audio-1.0
-  )
-
-  if (LIBGSTREAMER_FOUND)
-    string(REPLACE "." ";" LIBGSTREAMER_VERSION_AS_LIST ${LIBGSTREAMER_gstreamer-1.0_VERSION})
-    list(GET LIBGSTREAMER_VERSION_AS_LIST 0 LIBGSTREAMER_VERSION_MAJOR)
-    list(GET LIBGSTREAMER_VERSION_AS_LIST 1 LIBGSTREAMER_VERSION_MINOR)
-    list(GET LIBGSTREAMER_VERSION_AS_LIST 2 LIBGSTREAMER_VERSION_PATCH)
-
-    target_sources(flutterpi_module PRIVATE src/plugins/gstplayer.c)
-    target_link_libraries(flutterpi_module PUBLIC PkgConfig::LIBGSTREAMER)
-  endif()
-
-  if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN AND NOT LIBGSTREAMER_FOUND)
+if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN)
+  if (NOT HAVE_EGL_GLES2)
+    message(NOTICE "EGL and OpenGL ES2 are required for gstreamer video player. Gstreamer video player plugin won't be build.")
+  else()
     if (TRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN)
-      message(NOTICE "Some required gstreamer dependencies were not found. Gstreamer video player plugin won't be built.")
+      pkg_check_modules(LIBGSTREAMER IMPORTED_TARGET gstreamer-1.0)
+      pkg_check_modules(LIBGSTREAMER_PLUGINS_BASE IMPORTED_TARGET gstreamer-plugins-base-1.0)
+      pkg_check_modules(LIBGSTREAMER_APP IMPORTED_TARGET gstreamer-app-1.0)
+      pkg_check_modules(LIBGSTREAMER_ALLOCATORS IMPORTED_TARGET gstreamer-allocators-1.0)
+      pkg_check_modules(LIBGSTREAMER_VIDEO IMPORTED_TARGET gstreamer-video-1.0)
     else()
-      message(ERROR "Some required gstreamer dependencies were not found. Can't build gstreamer video player plugin.")
+      pkg_check_modules(LIBGSTREAMER REQUIRED IMPORTED_TARGET gstreamer-1.0)
+      pkg_check_modules(LIBGSTREAMER_PLUGINS_BASE REQUIRED IMPORTED_TARGET gstreamer-plugins-base-1.0)
+      pkg_check_modules(LIBGSTREAMER_APP REQUIRED IMPORTED_TARGET gstreamer-app-1.0)
+      pkg_check_modules(LIBGSTREAMER_ALLOCATORS REQUIRED IMPORTED_TARGET gstreamer-allocators-1.0)
+      pkg_check_modules(LIBGSTREAMER_VIDEO REQUIRED IMPORTED_TARGET gstreamer-video-1.0)
     endif()
-  endif()
 
-  if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN AND NOT HAVE_EGL_GLES2)
-    if (TRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN)
-      message(NOTICE "EGL and OpenGL ES2 are required for gstreamer video player. Gstreamer video player plugin won't be built.")
+    if (LIBGSTREAMER_FOUND AND LIBGSTREAMER_PLUGINS_BASE_FOUND AND LIBGSTREAMER_APP_FOUND AND LIBGSTREAMER_ALLOCATORS_FOUND AND LIBGSTREAMER_VIDEO_FOUND)
+      # There's no other way to query the libinput version (in code) somehow.
+      # So we need to roll our own libinput version macro
+      string(REPLACE "." ";" LIBGSTREAMER_VERSION_AS_LIST ${LIBGSTREAMER_VERSION})
+      list(GET LIBGSTREAMER_VERSION_AS_LIST 0 LIBGSTREAMER_VERSION_MAJOR)
+      list(GET LIBGSTREAMER_VERSION_AS_LIST 1 LIBGSTREAMER_VERSION_MINOR)
+      list(GET LIBGSTREAMER_VERSION_AS_LIST 2 LIBGSTREAMER_VERSION_PATCH)
+
+      target_sources(flutterpi_module PRIVATE
+        src/plugins/gstreamer_video_player/plugin.c
+        src/plugins/gstreamer_video_player/player.c
+        src/plugins/gstreamer_video_player/frame.c
+      )
+      target_link_libraries(flutterpi_module PUBLIC
+        PkgConfig::LIBGSTREAMER
+        PkgConfig::LIBGSTREAMER_PLUGINS_BASE
+        PkgConfig::LIBGSTREAMER_APP
+        PkgConfig::LIBGSTREAMER_ALLOCATORS
+        PkgConfig::LIBGSTREAMER_VIDEO
+      )
     else()
-      message(ERROR "EGL and OpenGL ES2 are required for gstreamer video player. Can't build gstreamer video player plugin.")
+      message(NOTICE "Couldn't find gstreamer libraries. Gstreamer video player plugin won't be build.")
     endif()
   endif()
+endif()
 
-  if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN AND LIBGSTREAMER_FOUND AND HAVE_EGL_GLES2)
-    set(HAVE_GSTREAMER_VIDEO_PLAYER ON)
-    target_sources(flutterpi_module PRIVATE
-      src/plugins/gstreamer_video_player/frame.c
-      src/plugins/gstreamer_video_player/flutter_texture_sink.c
-      src/plugins/gstreamer_video_player/plugin.c
-    )
-  endif()
-
-  if (BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN AND NOT LIBGSTREAMER_FOUND)
-    if (TRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN)
-      message(NOTICE "Some required gstreamer dependencies were not found. Gstreamer audio player plugin won't be built.")
-    else()
-      message(ERROR "Some required gstreamer dependencies were not found. Can't build gstreamer audio player plugin.")
-    endif()
+if (BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN)
+  if (TRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN)
+    pkg_check_modules(LIBGSTREAMER IMPORTED_TARGET gstreamer-1.0)
+    pkg_check_modules(LIBGSTREAMER_APP IMPORTED_TARGET gstreamer-app-1.0)
+    pkg_check_modules(LIBGSTREAMER_AUDIO IMPORTED_TARGET gstreamer-audio-1.0)
+  else()
+    pkg_check_modules(LIBGSTREAMER REQUIRED IMPORTED_TARGET gstreamer-1.0)
+    pkg_check_modules(LIBGSTREAMER_APP REQUIRED IMPORTED_TARGET gstreamer-app-1.0)
+    pkg_check_modules(LIBGSTREAMER_AUDIO REQUIRED IMPORTED_TARGET gstreamer-audio-1.0)
   endif()
 
-  if (BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN AND LIBGSTREAMER_FOUND)
+  if (LIBGSTREAMER_FOUND AND LIBGSTREAMER_APP_FOUND AND LIBGSTREAMER_AUDIO_FOUND)
     target_sources(flutterpi_module PRIVATE
       src/plugins/audioplayers/plugin.c
+      src/plugins/audioplayers/player.c
     )
+    target_link_libraries(flutterpi_module PUBLIC
+      PkgConfig::LIBGSTREAMER
+      PkgConfig::LIBGSTREAMER_APP
+      PkgConfig::LIBGSTREAMER_AUDIO
+    )
+  else()
+    message(NOTICE "Couldn't find gstreamer libraries. Gstreamer audio player plugin won't be build.")
   endif()
 endif()
 
@@ -382,10 +390,10 @@ if (BUILD_SENTRY_PLUGIN)
 
   if (SENTRY_BACKEND STREQUAL "crashpad" AND SENTRY_PLUGIN_BUNDLE_CRASHPAD_HANDLER)
     set(HAVE_BUNDLED_CRASHPAD_HANDLER ON)
-
+  
     target_sources(flutter-pi PRIVATE src/crashpad_handler_trampoline.cc)
     # link against the same libraries the crashpad_handler uses
-
+    
     get_target_property(handler_deps crashpad_handler INTERFACE_LINK_LIBRARIES)
     target_link_libraries(flutter-pi PUBLIC ${handler_deps})
   endif()

config.h.in

@@ -26,6 +26,5 @@
 #cmakedefine ENABLE_MTRACE
 #cmakedefine ENABLE_ASAN
 #cmakedefine HAVE_BUNDLED_CRASHPAD_HANDLER
-#cmakedefine HAVE_GSTREAMER_VIDEO_PLAYER
 
 #endif

src/modesetting.c

@@ -2448,6 +2448,9 @@ int kms_req_builder_push_fb_layer(
             /* id_range */ false, 0
             // clang-format on
         );
+        if (plane == NULL) {
+            LOG_DEBUG("Couldn't find a fitting cursor plane.\n");
+        }
     }
 
     /// TODO: Not sure we can use crtc_x, crtc_y, etc with primary planes

src/platformchannel.c

@@ -1320,10 +1320,6 @@ int platch_respond_native_error_std(const FlutterPlatformMessageResponseHandle *
     return platch_respond_error_std(handle, "nativeerror", strerror(_errno), &STDINT32(_errno));
 }
 
-int platch_respond_malformed_message_std(const FlutterPlatformMessage *message) {
-    return platch_respond_error_std(message->response_handle, "malformed-message", "The platform message received was malformed.", &STDNULL);
-}
-
 /************************
  * JSON METHOD CHANNELS *
  ************************/
@@ -2487,13 +2483,3 @@ MALLOCLIKE MUST_CHECK char *raw_std_method_call_get_method_dup(const struct raw_
 ATTR_PURE const struct raw_std_value *raw_std_method_call_get_arg(const struct raw_std_value *value) {
     return raw_std_value_after(value);
 }
-
-ATTR_PURE const struct raw_std_value *raw_std_method_call_from_buffer(const void *buffer, size_t buffer_size) {
-    const struct raw_std_value *envelope = (const struct raw_std_value *) buffer;
-
-    if (!raw_std_method_call_check(envelope, buffer_size)) {
-        return NULL;
-    } else {
-        return envelope;
-    }
-}

src/platformchannel.h

@@ -3,7 +3,7 @@
  * Platform Channels
  *
  * Encoding/Decoding of flutter platform messages, with different
- *
+ * 
  * Supported codecs:
  *  - standard message & method codec,
  *  - json message & method codec
@@ -1491,8 +1491,6 @@ int platch_respond_illegal_arg_ext_std(const FlutterPlatformMessageResponseHandl
 
 int platch_respond_native_error_std(const FlutterPlatformMessageResponseHandle *handle, int _errno);
 
-int platch_respond_malformed_message_std(const FlutterPlatformMessage *message);
-
 int platch_respond_success_json(const FlutterPlatformMessageResponseHandle *handle, struct json_value *return_value);
 
 int platch_respond_error_json(
@@ -1616,7 +1614,6 @@ ATTR_PURE bool raw_std_method_call_check(const struct raw_std_value *value, size
 ATTR_PURE bool raw_std_method_call_response_check(const struct raw_std_value *value, size_t buffer_size);
 ATTR_PURE bool raw_std_event_check(const struct raw_std_value *value, size_t buffer_size);
 
-ATTR_PURE const struct raw_std_value *raw_std_method_call_from_buffer(const void *buffer, size_t buffer_size);
 ATTR_PURE const struct raw_std_value *raw_std_method_call_get_method(const struct raw_std_value *value);
 ATTR_PURE bool raw_std_method_call_is_method(const struct raw_std_value *value, const char *method_name);
 MALLOCLIKE MUST_CHECK char *raw_std_method_call_get_method_dup(const struct raw_std_value *value);