gst/avi/gstavidemux.c: Invert DIB images again (see #132341).

Original commit message from CVS:
* gst/avi/gstavidemux.c: (swap_line), (gst_avi_demux_invert),
(gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data):
Invert DIB images again (see #132341).

3 files changed, 44 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 19606d1a..b0fb89d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-15  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/avi/gstavidemux.c: (swap_line), (gst_avi_demux_invert),
+	(gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data):
+	  Invert DIB images again (see #132341).
+
 2005-11-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/common b/common
-Subproject c6e5de72d79afdcad7d7b3cf4a35305f7f3ddeb
+Subproject 657b549dfb640a76f3d7ab7676e453c801a83dc
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 20645432..0ae2fc2b 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -2048,6 +2048,37 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, gboolean update)
 
 }
 
+/*
+ * Invert DIB buffers... Takes existing buffer and
+ * returns either the buffer or a new one (with old
+ * one dereferenced).
+ */
+
+static inline void
+swap_line (guint8 * d1, guint8 * d2, guint8 * tmp, gint bytes)
+{
+  memcpy (tmp, d1, bytes);
+  memcpy (d1, d2, bytes);
+  memcpy (d2, tmp, bytes);
+}
+
+static GstBuffer *
+gst_avi_demux_invert (avi_stream_context * stream, GstBuffer * buf)
+{
+  buf = gst_buffer_make_writable (buf);
+  gint y, h = stream->strf.vids->height, w = stream->strf.vids->width;
+  guint8 *tmp = g_malloc (w);
+
+  for (y = 0; y < h / 2; y++) {
+    swap_line (GST_BUFFER_DATA (buf) + w * y,
+        GST_BUFFER_DATA (buf) + w * (h - 1 - y), tmp, w);
+  }
+
+  g_free (tmp);
+
+  return buf;
+}
+
 static GstFlowReturn
 gst_avi_demux_process_next_entry (GstAviDemux * avi)
 {
@@ -2096,6 +2127,9 @@ gst_avi_demux_process_next_entry (GstAviDemux * avi)
                   avi->index_offset, entry->size, &buf)) != GST_FLOW_OK)
         return res;
       else {
+        if (stream->strh->fcc_handler == GST_MAKE_FOURCC ('D', 'I', 'B', ' ')) {
+          buf = gst_avi_demux_invert (stream, buf);
+        }
         if (!(entry->flags & GST_RIFF_IF_KEYFRAME))
           GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
         GST_BUFFER_TIMESTAMP (buf) = entry->ts;
@@ -2175,6 +2209,10 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
       } else {
         GstClockTime dur_ts;
 
+        if (stream->strh->fcc_handler == GST_MAKE_FOURCC ('D', 'I', 'B', ' ')) {
+          buf = gst_avi_demux_invert (stream, buf);
+        }
+
         GST_BUFFER_TIMESTAMP (buf) = next_ts;
         gst_pad_query (stream->pad, GST_QUERY_POSITION, &format, &dur_ts);
         GST_BUFFER_DURATION (buf) = dur_ts - next_ts;