[xiph-commits] r10531 - in experimental/j/Elphel333: common rtp/cgi shout

[giles at svn.xiph.org]

Author: giles
Date: 2005-12-03 12:23:31 -0800 (Sat, 03 Dec 2005)
New Revision: 10531

Modified:
   experimental/j/Elphel333/common/defines.h
   experimental/j/Elphel333/rtp/cgi/defines.h
   experimental/j/Elphel333/shout/TheoraShout.c
Log:
More stdint conversion.


Modified: experimental/j/Elphel333/common/defines.h
===================================================================
--- experimental/j/Elphel333/common/defines.h	2005-12-03 20:20:40 UTC (rev 10530)
+++ experimental/j/Elphel333/common/defines.h	2005-12-03 20:23:31 UTC (rev 10531)
@@ -5,7 +5,7 @@
 #ifndef __STRAMER_H_DEF_
 #define __STREAMER_H_DEF_
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #define HAVE_NANOSLEEP   1
 

Modified: experimental/j/Elphel333/rtp/cgi/defines.h
===================================================================
--- experimental/j/Elphel333/rtp/cgi/defines.h	2005-12-03 20:20:40 UTC (rev 10530)
+++ experimental/j/Elphel333/rtp/cgi/defines.h	2005-12-03 20:23:31 UTC (rev 10531)
@@ -1,9 +1,8 @@
 #ifndef __STREAMER_H_DEF_
 #define  __STREAMER_H_DEF_
 
-#include <inttypes.h>
+#include <stdint.h>
 
-
 #define HAVE_NANOSLEEP 1
 
 #define MAX_SIZE_JPEG    1024*1024   // max size buffer for JPEG picture, may be increase for best quality

Modified: experimental/j/Elphel333/shout/TheoraShout.c
===================================================================
--- experimental/j/Elphel333/shout/TheoraShout.c	2005-12-03 20:20:40 UTC (rev 10530)
+++ experimental/j/Elphel333/shout/TheoraShout.c	2005-12-03 20:23:31 UTC (rev 10531)
@@ -20,9 +20,9 @@
 #include <sys/time.h>
 #include <sys/mman.h>           /* mmap */
 #include <ctype.h>
-#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <getopt.h>
@@ -45,7 +45,7 @@
 /////////////// OggTheora data///////////////////////
 int                 kfgshiftm=9;
 len_data_t          packets[6];
-u_int32_t           header_lengths[6];
+uint32_t           header_lengths[6];
 uint8_t             *b_headers;
 /////////////////////////////////////////////////////
 
@@ -141,8 +141,8 @@
 static void ogg_TheoraFrame(uint8_t *theora_data, uint32_t len, uint8_t type_frame) {
         int             header_length;
         ogg_header_t    header;
-        u_int64_t       granule=0;
-        u_int8_t        *dp;
+        uint64_t       granule=0;
+        uint8_t        *dp;
 
         header_length= ogg_frame_page (&header,               // [1]
                                        last_page_flags,       // [2]
@@ -244,7 +244,7 @@
 int make_OggTheoraHdrs(const char *headers_filename)
 {
      FILE      *headers_file;
-     u_int32_t  num_headers;
+     uint32_t  num_headers;
      int        i,r;
      struct stat     f_stat;
 
@@ -308,8 +308,8 @@
     int         acq_data;
     int         nframes_total, nframes_inter_full, nframes_inter_masked;
     int         time_slow;
-    u_int8_t    *ccam_dma, *dp = NULL;
-    u_int32_t   *ccam_dma_index;
+    uint8_t    *ccam_dma, *dp = NULL;
+    uint32_t   *ccam_dma_index;
     int         circindex_fd;
     int         circbuf_fd;
     int         circbuf_size;
@@ -333,8 +333,8 @@
     }
     // find total buffer length
     circindex_size=lseek(circindex_fd,0,2);
-    ccam_dma_index = (u_int32_t *) mmap(0, circindex_size, PROT_READ, MAP_SHARED, circindex_fd, 0);
-    if(ccam_dma_index ==((u_int32_t  *) -1)) {
+    ccam_dma_index = (uint32_t *) mmap(0, circindex_size, PROT_READ, MAP_SHARED, circindex_fd, 0);
+    if(ccam_dma_index ==((uint32_t  *) -1)) {
         fprintf(stderr,"Error in mmap %s\r\n","/dev/circindex");
         close(circindex_fd);
         return ;
@@ -351,8 +351,8 @@
     fprintf(stderr,"circbuf stores %d long values (%d bytes)\n",
                                                 (circbuf_size>>2),circbuf_size);
     ccam_dma = 
-        (u_int8_t *) mmap(0, circbuf_size, PROT_READ, MAP_SHARED, circbuf_fd, 0);
-    if(ccam_dma ==((u_int8_t  *) -1)) {
+        (uint8_t *) mmap(0, circbuf_size, PROT_READ, MAP_SHARED, circbuf_fd, 0);
+    if(ccam_dma ==((uint8_t  *) -1)) {
         fprintf(stderr,"Error in mmap %s\r\n","/dev/circbuf");
         close(circindex_fd);
         close(circbuf_fd);