[xiph-cvs] cvs commit: w3d tarkin.c tarkin.h tarkin_enc.c

[Holger Waechtler]

holger      01/07/16 09:10:51

  Modified:    .        tarkin.c tarkin.h tarkin_enc.c
  Log:
   - use a_moments and s_moments from command line

Revision  Changes    Path
1.9       +6 -2      w3d/tarkin.c

Index: tarkin.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/tarkin.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tarkin.c	2001/07/09 07:27:12	1.8
+++ tarkin.c	2001/07/16 16:10:51	1.9
@@ -135,7 +135,9 @@
                               s->current_frame - s->current_frame_in_buf, j,
                               layer->waveletbuf[j]);
 
-         wavelet_3d_buf_fwd_xform (layer->waveletbuf[j], 2, 2);
+         wavelet_3d_buf_fwd_xform (layer->waveletbuf[j],
+                                   layer->desc.a_moments,
+                                   layer->desc.s_moments);
 
          wavelet_3d_buf_dump ("coeff-%d-%03d.pgm",
                               s->current_frame - s->current_frame_in_buf, j,
@@ -280,7 +282,9 @@
             wavelet_3d_buf_dump ("rcoeff-%d-%03d.pgm",
                                  s->current_frame, j, layer->waveletbuf[j]);
 
-            wavelet_3d_buf_inv_xform (layer->waveletbuf[j], 2, 2);
+            wavelet_3d_buf_inv_xform (layer->waveletbuf[j], 
+                                      layer->desc.a_moments,
+                                      layer->desc.s_moments);
 
             wavelet_3d_buf_dump ("rcolor-%d-%03d.pgm",
                                  s->current_frame - s->current_frame_in_buf, j,

1.6       +2 -0      w3d/tarkin.h

Index: tarkin.h
===================================================================
RCS file: /usr/local/cvsroot/w3d/tarkin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tarkin.h	2001/07/09 07:27:12	1.5
+++ tarkin.h	2001/07/16 16:10:51	1.6
@@ -32,6 +32,8 @@
 typedef struct {
    uint32_t width;
    uint32_t height;
+   uint32_t a_moments;
+   uint32_t s_moments;
    uint32_t frames_per_buf;
    uint32_t bitstream_len;              /*  for all color components, bytes */
    TarkinColorFormat format;

1.8       +4 -5      w3d/tarkin_enc.c

Index: tarkin_enc.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/tarkin_enc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tarkin_enc.c	2001/07/09 07:27:50	1.7
+++ tarkin_enc.c	2001/07/16 16:10:51	1.8
@@ -31,7 +31,6 @@
    char fname[256];
    uint32_t frame = 0;
    uint8_t *rgb;
-   int a_moments, s_moments;
    int fd;
    TarkinStream *tarkin_stream;
    TarkinVideoLayerDesc layer [] = { { 0, 0, 1, 5000, TARKIN_RGB24 } };
@@ -39,13 +38,13 @@
 
    if (argc == 1) {
       layer[0].bitstream_len = 1000;
-      a_moments = 2;
-      s_moments = 2;
+      layer[0].a_moments = 2;
+      layer[0].s_moments = 2;
    } else if (argc == 5) {
       fmt = argv[1];
       layer[0].bitstream_len = strtol (argv[2], 0, 0);
-      a_moments = strtol (argv[3], 0, 0);
-      s_moments = strtol (argv[4], 0, 0);
+      layer[0].a_moments = strtol (argv[3], 0, 0);
+      layer[0].s_moments = strtol (argv[4], 0, 0);
    } else {
       usage (argv[0]);
    }

--- >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.