From 8195c26a08993aebf66ab076a0c65413fee4209b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Wed, 2 Dec 2009 02:08:46 +0000
Subject: [PATCH] ogg: extract width, height and PAR from theora header and add
 to caps

---
 ext/ogg/gstoggstream.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
index c2d73d75cd..be76f68b37 100644
--- a/ext/ogg/gstoggstream.c
+++ b/ext/ogg/gstoggstream.c
@@ -275,10 +275,19 @@ static gboolean
 setup_theora_mapper (GstOggStream * pad, ogg_packet * packet)
 {
   guint8 *data = packet->packet;
+  guint w, h, par_d, par_n;
+
+  w = GST_READ_UINT24_BE (data + 14) & 0xFFFFF0;
+  h = GST_READ_UINT24_BE (data + 17) & 0xFFFFF0;
 
   pad->granulerate_n = GST_READ_UINT32_BE (data + 22);
   pad->granulerate_d = GST_READ_UINT32_BE (data + 26);
-  GST_LOG ("fps = %d/%d", pad->granulerate_n, pad->granulerate_d);
+
+  par_n = GST_READ_UINT24_BE (data + 30);
+  par_d = GST_READ_UINT24_BE (data + 33);
+
+  GST_LOG ("fps = %d/%d, PAR = %u/%u, width = %u, height = %u",
+      pad->granulerate_n, pad->granulerate_d, par_n, par_d, w, h);
 
   /* 2 bits + 3 bits = 5 bits KFGSHIFT */
   pad->granuleshift = ((GST_READ_UINT8 (data + 40) & 0x03) << 3) +
@@ -291,9 +300,21 @@ setup_theora_mapper (GstOggStream * pad, ogg_packet * packet)
       || pad->granulerate_d == 0)
     return FALSE;
 
-  pad->caps = gst_caps_new_simple ("video/x-theora",
-      "framerate", GST_TYPE_FRACTION, pad->granulerate_n,
-      pad->granulerate_d, NULL);
+  pad->caps = gst_caps_new_simple ("video/x-theora", NULL);
+
+  if (w > 0 && h > 0) {
+    gst_caps_set_simple (pad->caps, "width", G_TYPE_INT, w, "height",
+        G_TYPE_INT, h, NULL);
+  }
+
+  /* only add framerate now so caps look prettier, with width/height first */
+  gst_caps_set_simple (pad->caps, "framerate", GST_TYPE_FRACTION,
+      pad->granulerate_n, pad->granulerate_d, NULL);
+
+  if (par_n > 0 && par_d > 0) {
+    gst_caps_set_simple (pad->caps, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+        par_n, par_d, NULL);
+  }
 
   return TRUE;
 }