x264enc: Avoid format decision per frame

[platform/upstream/gst-plugins-ugly.git] / ext / x264 / gstx264enc.h

diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h
index 98b85a6..c7de48c 100644 (file)
--- a/ext/x264/gstx264enc.h
+++ b/ext/x264/gstx264enc.h
@@ -1,6 +1,7 @@
 /* GStreamer H264 encoder plugin
  * Copyright (C) 2005 Michal Benes <michal.benes@itonis.tv>
  * Copyright (C) 2005 Josef Zlomek <josef.zlomek@itonis.tv>
+ * Copyright (C) 2016 Sebastian Dröge <sebastian@centricular.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -14,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __GST_X264_ENC_H__
@@ -23,7 +24,19 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include "_stdint.h"
+#include <gst/video/gstvideoencoder.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+/* The x264.h header says this isn't needed with MinGW, but sometimes the
+ * compiler is unable to correctly do the pointer indirection for us, which
+ * leads to a segfault when you try to dereference any const values provided
+ * by x264.dll. See: https://bugzilla.gnome.org/show_bug.cgi?id=779249 */
+#if defined(_WIN32) && !defined(X264_API_IMPORTS)
+# define X264_API_IMPORTS
+#endif
 #include <x264.h>
 
 G_BEGIN_DECLS
@@ -41,19 +54,22 @@ G_BEGIN_DECLS
 
 typedef struct _GstX264Enc GstX264Enc;
 typedef struct _GstX264EncClass GstX264EncClass;
+typedef struct _GstX264EncVTable GstX264EncVTable;
 
 struct _GstX264Enc
 {
-  GstElement element;
+  GstVideoEncoder element;
 
   /*< private >*/
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
+  GstX264EncVTable *vtable;
   x264_t *x264enc;
   x264_param_t x264param;
   gint current_byte_stream;
 
+  /* List of frame/buffer mapping structs for
+   * pending frames */
+  GList *pending_frames;
+
   /* properties */
   guint threads;
   gboolean sliced_threads;
@@ -92,21 +108,13 @@ struct _GstX264Enc
   gint psy_tune;
   guint tune;
   GString *tunings;
-  gint profile;
   GString *option_string_prop; /* option-string property */
   GString *option_string; /* used by set prop */
+  gint frame_packing;
+  gboolean insert_vui;
 
   /* input description */
-  GstVideoInfo info;
-
-  /* for b-frame delay handling */
-  GQueue *delay;
-
-  guint8 *buffer;
-  gulong buffer_size;
-
-  gint i_type;
-  GstEvent *forcekeyunit_event;
+  GstVideoCodecState *input_state;
 
   /* configuration changed  while playing */
   gboolean reconfig;
@@ -114,12 +122,15 @@ struct _GstX264Enc
   /* from the downstream caps */
   const gchar *peer_profile;
   gboolean peer_intra_profile;
-  const x264_level_t *peer_level;
+  gint peer_level_idc;
+
+  /* cached values to set x264_picture_t */
+  gint x264_nplanes;
 };
 
 struct _GstX264EncClass
 {
-  GstElementClass parent_class;
+  GstVideoEncoderClass parent_class;
 };
 
 GType gst_x264_enc_get_type (void);