Skip to content

Commit

Permalink
LG changes for OLED CX
Browse files Browse the repository at this point in the history
  • Loading branch information
HoonHeeLee authored and pbatard committed Dec 29, 2022
1 parent d88d1b0 commit f050188
Show file tree
Hide file tree
Showing 110 changed files with 33,966 additions and 1,914 deletions.
14 changes: 14 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ AG_GST_CHECK_PLUGIN(id3demux)
AG_GST_CHECK_PLUGIN(imagefreeze)
AG_GST_CHECK_PLUGIN(interleave)
AG_GST_CHECK_PLUGIN(isomp4)
AG_GST_CHECK_PLUGIN(isomp4_1_8)
AG_GST_CHECK_PLUGIN(law)
AG_GST_CHECK_PLUGIN(level)
AG_GST_CHECK_PLUGIN(matroska)
Expand Down Expand Up @@ -560,6 +561,18 @@ AG_GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], video4linux2, [
fi
])

HAVE_LINUX_EXT=no
if test x$HAVE_GST_V4L2 = xyes; then
AC_CHECK_HEADER(linux/v4l2-ext/videodev2-ext.h, [ HAVE_LINUX_EXT=yes ],
[ HAVE_LINUX_EXT=no ])
if test x$HAVE_LINUX_EXT = xyes; then
AC_DEFINE(HAVE_LINUX_EXT, 1, [Define if linuxtv-ext-header is available])
AM_CONDITIONAL(USE_LINUX_EXT, true)
else
AM_CONDITIONAL(USE_LINUX_EXT, false)
fi
fi

# Optional gudev for device probing
AC_ARG_WITH([gudev],
AS_HELP_STRING([--with-gudev],[device detection with gudev]),
Expand Down Expand Up @@ -1238,6 +1251,7 @@ gst/icydemux/Makefile
gst/imagefreeze/Makefile
gst/interleave/Makefile
gst/isomp4/Makefile
gst/isomp4_1_8/Makefile
gst/law/Makefile
gst/level/Makefile
gst/matroska/Makefile
Expand Down
15 changes: 6 additions & 9 deletions ext/gtk/gtkgstglwidget.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@
#define GST_CAT_DEFAULT gtk_gst_gl_widget_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);

G_DEFINE_TYPE_WITH_CODE (GtkGstGLWidget, gtk_gst_gl_widget, GTK_TYPE_GL_AREA,
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gtkgstglwidget", 0,
"Gtk Gst GL Widget"););

#define GTK_GST_GL_WIDGET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
GTK_TYPE_GST_GL_WIDGET, GtkGstGLWidgetPrivate))

struct _GtkGstGLWidgetPrivate
{
gboolean initted;
Expand All @@ -82,6 +75,11 @@ static const GLfloat vertices[] = {
1.0f, -1.0f, 0.0f, 1.0f, 1.0f
};

G_DEFINE_TYPE_WITH_CODE (GtkGstGLWidget, gtk_gst_gl_widget, GTK_TYPE_GL_AREA,
G_ADD_PRIVATE (GtkGstGLWidget)
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gtkgstglwidget", 0,
"Gtk Gst GL Widget"););

static void
gtk_gst_gl_widget_bind_buffer (GtkGstGLWidget * gst_widget)
{
Expand Down Expand Up @@ -365,7 +363,6 @@ gtk_gst_gl_widget_class_init (GtkGstGLWidgetClass * klass)
GObjectClass *gobject_klass = (GObjectClass *) klass;
GtkGLAreaClass *gl_widget_klass = (GtkGLAreaClass *) klass;

g_type_class_add_private (klass, sizeof (GtkGstGLWidgetPrivate));
gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));

gobject_klass->finalize = gtk_gst_gl_widget_finalize;
Expand All @@ -381,7 +378,7 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget)

gtk_gst_base_widget_init (base_widget);

gst_widget->priv = priv = GTK_GST_GL_WIDGET_GET_PRIVATE (gst_widget);
gst_widget->priv = priv = gtk_gst_gl_widget_get_instance_private (gst_widget);

display = gdk_display_get_default ();

Expand Down
2 changes: 1 addition & 1 deletion ext/raw1394/gstdv1394src.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "config.h"
#endif
#include <unistd.h>
#include <sys/poll.h>
#include <poll.h>
#include <sys/socket.h>
#include <errno.h>
#include <fcntl.h>
Expand Down
2 changes: 1 addition & 1 deletion ext/raw1394/gsthdv1394src.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "config.h"
#endif
#include <unistd.h>
#include <sys/poll.h>
#include <poll.h>
#include <sys/socket.h>
#include <errno.h>
#include <fcntl.h>
Expand Down
Loading

0 comments on commit f050188

Please sign in to comment.