[xiph-cvs] cvs commit: theora/lib comment.c encode.c huffman.h misc_common.c

[Timothy Terriberry]

tterribe    04/03/18 09:25:26

  Modified:    lib      comment.c encode.c huffman.h misc_common.c
  Log:
  Some minor fixes that have been sitting in my tree for a while.
  
  Nothing that should affect execution: Some comment edits, an indentation fix, and a locally defined lookup table made static and const, since that's how it was used.

Revision  Changes    Path
1.10      +2 -3      theora/lib/comment.c

Index: comment.c
===================================================================
RCS file: /usr/local/cvsroot/theora/lib/comment.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- a/comment.c	3 Dec 2003 08:59:39 -0000	1.9
+++ b/comment.c	18 Mar 2004 14:25:25 -0000	1.10
@@ -11,7 +11,7 @@
  ********************************************************************
 
   function: read/write and client interface for comment header packet
-  last mod: $Id: comment.c,v 1.9 2003/12/03 08:59:39 arc Exp $
+  last mod: $Id: comment.c,v 1.10 2004/03/18 14:25:25 tterribe Exp $
 
  ********************************************************************/
 
@@ -102,9 +102,8 @@
     for(i=0;i<tc->comments;i++)
       if(tc->user_comments[i])_ogg_free(tc->user_comments[i]);
     if(tc->user_comments)_ogg_free(tc->user_comments);
-        if(tc->comment_lengths)_ogg_free(tc->comment_lengths);
+    if(tc->comment_lengths)_ogg_free(tc->comment_lengths);
     if(tc->vendor)_ogg_free(tc->vendor);
   }
   memset(tc,0,sizeof(*tc));
 }
-

<p><p>1.19      +4 -3      theora/lib/encode.c

Index: encode.c
===================================================================
RCS file: /usr/local/cvsroot/theora/lib/encode.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- a/encode.c	28 Feb 2004 18:25:29 -0000	1.18
+++ b/encode.c	18 Mar 2004 14:25:25 -0000	1.19
@@ -11,7 +11,7 @@
  ********************************************************************
 
   function:
-  last mod: $Id: encode.c,v 1.18 2004/02/28 18:25:29 giles Exp $
+  last mod: $Id: encode.c,v 1.19 2004/03/18 14:25:25 tterribe Exp $
 
  ********************************************************************/
 
@@ -715,7 +715,8 @@
     0
   };
 
-  /* value left value up-left, value up, value up-right */
+  /* value left value up-left, value up, value up-right, missing
+      values skipped. */
   int v[4];
 
   /* fragment number left, up-left, up, up-right */
@@ -737,7 +738,7 @@
   int WhichFrame;
   int WhichCase;
 
-  ogg_int16_t Mode2Frame[] = {
+  static const ogg_int16_t Mode2Frame[] = {
     1,  /* CODE_INTER_NO_MV     0 => Encoded diff from same MB last frame  */
     0,  /* CODE_INTRA           1 => DCT Encoded Block */
     1,  /* CODE_INTER_PLUS_MV   2 => Encoded diff from included MV MB last frame */

<p><p>1.4       +2 -2      theora/lib/huffman.h

Index: huffman.h
===================================================================
RCS file: /usr/local/cvsroot/theora/lib/huffman.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- a/huffman.h	10 Jun 2003 01:31:33 -0000	1.3
+++ b/huffman.h	18 Mar 2004 14:25:25 -0000	1.4
@@ -11,7 +11,7 @@
  ********************************************************************
 
   function:
-  last mod: $Id: huffman.h,v 1.3 2003/06/10 01:31:33 tterribe Exp $
+  last mod: $Id: huffman.h,v 1.4 2004/03/18 14:25:25 tterribe Exp $
 
  ********************************************************************/
 
@@ -70,5 +70,5 @@
 #define DCT_RUN_CATEGORY1C      (DCT_RUN_CATEGORY1B + 1)
 #define DCT_RUN_CATEGORY2       (DCT_RUN_CATEGORY1C + 1)
 
-/* 35 */
+/* 32 */
 #define MAX_ENTROPY_TOKENS      (DCT_RUN_CATEGORY2 + 2)

<p><p>1.11      +2 -2      theora/lib/misc_common.c

Index: misc_common.c
===================================================================
RCS file: /usr/local/cvsroot/theora/lib/misc_common.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- a/misc_common.c	3 Dec 2003 08:59:41 -0000	1.10
+++ b/misc_common.c	18 Mar 2004 14:25:25 -0000	1.11
@@ -11,7 +11,7 @@
  ********************************************************************
 
   function:
-  last mod: $Id: misc_common.c,v 1.10 2003/12/03 08:59:41 arc Exp $
+  last mod: $Id: misc_common.c,v 1.11 2004/03/18 14:25:25 tterribe Exp $
 
  ********************************************************************/
 
@@ -279,7 +279,7 @@
     }
   }
 
-  /* If th quantiser value has changed then re-initialise it */
+  /* If the quantizer value has changed then re-initialise it */
   if ( cpi->pb.ThisFrameQualityValue != cpi->pb.LastFrameQualityValue ) {
     /* Initialise quality tables. */
     UpdateQC( cpi, cpi->pb.ThisFrameQualityValue );

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.