From 676eafc77c2799521925d54ba43b26df72c76b14 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <manauw@skynet.be>
Date: Thu, 13 Jul 2006 11:06:45 +0000
Subject: Port mpeg2enc to 0.10 (#343184).

Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet be>
* configure.ac:
* ext/Makefile.am:
* ext/mpeg2enc/Makefile.am:
* ext/mpeg2enc/gstmpeg2enc.cc:
* ext/mpeg2enc/gstmpeg2enc.hh:
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encoder.hh:
* ext/mpeg2enc/gstmpeg2encoptions.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.hh:
* ext/mpeg2enc/gstmpeg2encstreamwriter.cc:
* ext/mpeg2enc/gstmpeg2encstreamwriter.hh:
Port mpeg2enc to 0.10 (#343184).
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
* tests/check/elements/mpeg2enc.c:
Add unit test for mpeg2enc.
* tests/icles/.cvsignore:
Ignore pitch-test.
---
 ext/mpeg2enc/gstmpeg2encstreamwriter.hh | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'ext/mpeg2enc/gstmpeg2encstreamwriter.hh')

diff --git a/ext/mpeg2enc/gstmpeg2encstreamwriter.hh b/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
index 708b942e..766d7bd1 100644
--- a/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
+++ b/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
@@ -1,5 +1,6 @@
 /* GStreamer mpeg2enc (mjpegtools) wrapper
  * (c) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2006 Mark Nauwelaerts <manauw@skynet.be>
  *
  * gstmpeg2encstreamwriter.hh: GStreamer/mpeg2enc output wrapper
  *
@@ -26,10 +27,29 @@
 
 #include <elemstrmwriter.hh>
 
+#ifdef GST_MJPEGTOOLS_18x
+
+class GstMpeg2EncStreamWriter : public ElemStrmWriter {
+  public:
+  GstMpeg2EncStreamWriter (GstPad *pad, EncoderParams *params);
+  ~GstMpeg2EncStreamWriter ();
+
+  /* output functions */
+  void WriteOutBufferUpto (const guint8 * buffer,
+      const guint32 flush_upto);
+  guint64 BitCount ();
+
+  private:
+  GstPad *pad;
+  GstBuffer *buf;
+};
+
+#else
+
 class GstMpeg2EncStreamWriter : public ElemStrmWriter {
 public:
-  GstMpeg2EncStreamWriter (GstPad        *pad,
-			   EncoderParams *params);
+  GstMpeg2EncStreamWriter (GstPad *pad, EncoderParams *params);
+  ~GstMpeg2EncStreamWriter ();
 
   /* output functions */
   void PutBits (guint32 val, gint n);
@@ -41,5 +61,6 @@ private:
   GstPad *pad;
   GstBuffer *buf;
 };
+#endif /* GST_MJPEGTOOLS_18x */
 
 #endif /* __GST_MPEG2ENCSTREAMWRITER_H__ */
-- 
cgit v1.2.1