[xiph-commits] r8428 - in branches/theora-mmx: . include/theora

[j at motherfish-iii.xiph.org]

Author: j
Date: 2004-12-15 12:44:13 -0800 (Wed, 15 Dec 2004)
New Revision: 8428

Modified:
   branches/theora-mmx/
   branches/theora-mmx/CHANGES
   branches/theora-mmx/configure.ac
   branches/theora-mmx/include/theora/theora.h
Log:
merge changes from trunk (alpha4)


Property changes on: branches/theora-mmx
___________________________________________________________________
Name: branch-point
   - 8409
   + 8427

Modified: branches/theora-mmx/CHANGES
===================================================================
--- branches/theora-mmx/CHANGES	2004-12-15 20:39:47 UTC (rev 8427)
+++ branches/theora-mmx/CHANGES	2004-12-15 20:44:13 UTC (rev 8428)
@@ -5,6 +5,10 @@
  * fix a double-update bug in the motion analysis
  * apply the loop filter before filling motion vector border 
    in the reference frame
+ * new utility functions:
+   - theora_packet_isheader(),
+   - theora_packet_iskeyframe()
+   - theora_granule_frame()
  * optional support for building without floating point
  * optional support for building without encode support 
  * various build and packaging fixes

Modified: branches/theora-mmx/configure.ac
===================================================================
--- branches/theora-mmx/configure.ac	2004-12-15 20:39:47 UTC (rev 8427)
+++ branches/theora-mmx/configure.ac	2004-12-15 20:44:13 UTC (rev 8428)
@@ -16,9 +16,9 @@
 
 dnl Library versioning
 
-V_LIB_CURRENT=0
+V_LIB_CURRENT=1
 V_LIB_REVISION=0
-V_LIB_AGE=0
+V_LIB_AGE=1
 AC_SUBST(V_LIB_CURRENT)
 AC_SUBST(V_LIB_REVISION)
 AC_SUBST(V_LIB_AGE)
@@ -206,7 +206,7 @@
   Makefile lib/Makefile
   include/Makefile include/theora/Makefile
   examples/Makefile
-  doc/Makefile doc/Doxyfile doc/python/Makefile
+  doc/Makefile doc/Doxyfile
   debian/Makefile
   libtheora.spec
   theora.pc

Modified: branches/theora-mmx/include/theora/theora.h
===================================================================
--- branches/theora-mmx/include/theora/theora.h	2004-12-15 20:39:47 UTC (rev 8427)
+++ branches/theora-mmx/include/theora/theora.h	2004-12-15 20:44:13 UTC (rev 8428)
@@ -343,46 +343,55 @@
 extern int theora_decode_YUVout(theora_state *th,yuv_buffer *yuv);
 
 /**
- * Convert a granulepos to absolute time in seconds. The granulepos is
- * interpreted in the context of a given theora_state handle.
- * \param th A previously initialized theora_state handle (encode or decode)
- * \param granulepos The granulepos to convert.
- * \returns The absolute time in seconds corresponding to \a granulepos.
- * \retval -1 The given granulepos is invalid (ie. negative)
- */
-extern double theora_granule_time(theora_state *th,ogg_int64_t granulepos);
-
-/**
  * Report whether a theora packet is a header or not
  * This function does no verification beyond checking the header
  * flag bit so it should not be used for bitstream identification;
  * use theora_decode_header() for that.
+ *
  * \param op An ogg_packet containing encoded theora data.
  * \retval 1 The packet is a header packet
  * \retval 0 The packet is not a header packet (and so contains frame data)
+ *
+ * Thus function was added in the 1.0alpha4 release.
  */
 extern int theora_packet_isheader(ogg_packet *op);
 
 /**
  * Report whether a theora packet is a keyframe or not
+ *
  * \param op An ogg_packet containing encoded theora data.
  * \retval 1 The packet contains a keyframe image
  * \retval 0 The packet is contains an interframe delta
  * \retval -1 the packet is not an image data packet at all
+ *
+ * Thus function was added in the 1.0alpha4 release.
  */
 extern int theora_packet_iskeyframe(ogg_packet *op);
 
 /**
  * Convert a granulepos to an absolute frame number. The granulepos is
  * interpreted in the context of a given theora_state handle.
+ *
  * \param th A previously initialized theora_state handle (encode or decode)
  * \param granulepos The granulepos to convert.
  * \returns The frame number corresponding to \a granulepos.
  * \retval -1 The given granulepos is invalid (ie. negative)
+ *
+ * Thus function was added in the 1.0alpha4 release.
  */
 extern ogg_int64_t theora_granule_frame(theora_state *th,ogg_int64_t granulepos);
 
 /**
+ * Convert a granulepos to absolute time in seconds. The granulepos is
+ * interpreted in the context of a given theora_state handle.
+ * \param th A previously initialized theora_state handle (encode or decode)
+ * \param granulepos The granulepos to convert.
+ * \returns The absolute time in seconds corresponding to \a granulepos.
+ * \retval -1 The given granulepos is invalid (ie. negative)
+ */
+extern double theora_granule_time(theora_state *th,ogg_int64_t granulepos);
+
+/**
  * Initialize a theora_info structure. All values within the given theora_info
  * structure are initialized, and space is allocated within libtheora for
  * internal codec setup data.