[xiph-commits] r13882 - in trunk/theora: examples include/theora

[giles at svn.xiph.org]

Author: giles
Date: 2007-09-22 01:22:39 -0700 (Sat, 22 Sep 2007)
New Revision: 13882

Modified:
   trunk/theora/examples/player_example.c
   trunk/theora/include/theora/theora.h
Log:
Duplicate the TH_DECCTL switches for theora_control() in theora.h,
as was done for the encoder control switches. This allows use without
including the new api in theoradec.h.


Modified: trunk/theora/examples/player_example.c
===================================================================
--- trunk/theora/examples/player_example.c	2007-09-22 08:02:14 UTC (rev 13881)
+++ trunk/theora/examples/player_example.c	2007-09-22 08:22:39 UTC (rev 13882)
@@ -57,7 +57,6 @@
 #include <math.h>
 #include <signal.h>
 #include "theora/theora.h"
-#include "theora/theoradec.h"
 #include "vorbis/codec.h"
 #include <SDL.h>
 

Modified: trunk/theora/include/theora/theora.h
===================================================================
--- trunk/theora/include/theora/theora.h	2007-09-22 08:02:14 UTC (rev 13881)
+++ trunk/theora/include/theora/theora.h	2007-09-22 08:22:39 UTC (rev 13882)
@@ -289,9 +289,43 @@
 } theora_comment;
 
 
-/**\name theora_control() codes
- * \anchor encctlcodes
- * These are the available request codes for theora_control().
+/**\name theora_control() codes */
+
+/**\anchor decctlcodes
+ * These are the available request codes for theora_control()
+ * when called with a decoder instance.
+ * By convention, these are odd, to distinguish them from the
+ *  \ref encctlcodes "encoder control codes".
+ * Keep any experimental or vendor-specific values above \c 0x8000.*/
+
+/**Get the maximum post-processing level.
+ * The decoder supports a post-processing filter that can improve
+ * the appearance of the decoded images. This returns the highest
+ * level setting for this post-processor, corresponding to maximum
+ * improvement and computational expense.
+ */
+#define TH_DECCTL_GET_PPLEVEL_MAX (1)
+
+/**Set the post-processing level.
+ * Sets the level of post-processing to use when decoding the 
+ * compressed stream. This must be a value between zero (off)
+ * and the maximum returned by TH_DECCTL_GET_PPLEVEL_MAX.
+ */
+#define TH_DECCTL_SET_PPLEVEL (3)
+
+/**Set the granule position.
+ * Call this after a seek, to update the internal granulepos
+ * in the decoder, to insure that subsequent frames are marked
+ * properly. If you track timestamps yourself and do not use
+ * the granule postion returned by the decoder, then you do
+ * not need to use this control.
+ */
+#define TH_DECCTL_SET_GRANPOS (5)
+
+
+/**\anchor encctlcodes
+ * These are the available request codes for theora_control()
+ * when called with an encoder instance.
  * By convention, these are even, to distinguish them from the
  *  \ref decctlcodes "decoder control codes".
  * Keep any experimental or vendor-specific values above \c 0x8000.*/