From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 2 Mar 2012 09:37:00 +0000 (+0100)
Subject: theoradec: move some code
X-Git-Tag: RELEASE-0.11.3~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=271939d118647c6fdba8a873e1ad1052ba701f37;p=platform%2Fupstream%2Fgst-plugins-base.git

theoradec: move some code

The parsing of the headers consists of negotiating the format and then setting
up the decoder so split this in two parts.
---

diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c
index 8ef9e00..c747370 100644
--- a/ext/theora/gsttheoradec.c
+++ b/ext/theora/gsttheoradec.c
@@ -915,26 +915,6 @@ theora_handle_type_packet (GstTheoraDec * dec, ogg_packet * packet)
     dec->need_cropping = FALSE;
   }
 
-  /* done */
-  dec->decoder = th_decode_alloc (&dec->info, dec->setup);
-
-  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_MV,
-          &dec->telemetry_mv, sizeof (dec->telemetry_mv)) != TH_EIMPL) {
-    GST_WARNING_OBJECT (dec, "Could not enable MV visualisation");
-  }
-  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_MBMODE,
-          &dec->telemetry_mbmode, sizeof (dec->telemetry_mbmode)) != TH_EIMPL) {
-    GST_WARNING_OBJECT (dec, "Could not enable MB mode visualisation");
-  }
-  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_QI,
-          &dec->telemetry_qi, sizeof (dec->telemetry_qi)) != TH_EIMPL) {
-    GST_WARNING_OBJECT (dec, "Could not enable QI mode visualisation");
-  }
-  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_BITS,
-          &dec->telemetry_bits, sizeof (dec->telemetry_bits)) != TH_EIMPL) {
-    GST_WARNING_OBJECT (dec, "Could not enable BITS mode visualisation");
-  }
-
   /* our info contains the dimensions for the coded picture before cropping */
   gst_video_info_set_format (&dec->vinfo, format, dec->info.frame_width,
       dec->info.frame_height);
@@ -966,6 +946,26 @@ theora_handle_type_packet (GstTheoraDec * dec, ogg_packet * packet)
 
   theora_negotiate_pool (dec);
 
+  /* done */
+  dec->decoder = th_decode_alloc (&dec->info, dec->setup);
+
+  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_MV,
+          &dec->telemetry_mv, sizeof (dec->telemetry_mv)) != TH_EIMPL) {
+    GST_WARNING_OBJECT (dec, "Could not enable MV visualisation");
+  }
+  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_MBMODE,
+          &dec->telemetry_mbmode, sizeof (dec->telemetry_mbmode)) != TH_EIMPL) {
+    GST_WARNING_OBJECT (dec, "Could not enable MB mode visualisation");
+  }
+  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_QI,
+          &dec->telemetry_qi, sizeof (dec->telemetry_qi)) != TH_EIMPL) {
+    GST_WARNING_OBJECT (dec, "Could not enable QI mode visualisation");
+  }
+  if (th_decode_ctl (dec->decoder, TH_DECCTL_SET_TELEMETRY_BITS,
+          &dec->telemetry_bits, sizeof (dec->telemetry_bits)) != TH_EIMPL) {
+    GST_WARNING_OBJECT (dec, "Could not enable BITS mode visualisation");
+  }
+
   dec->have_header = TRUE;
 
   if (dec->pendingevents) {