Ticket #237: nuv_be.3.diff

libmpcodecs/ve_nuv.c

@@ -116 +116 @@
     ench->comptype  = 'R'; // compressor data for RTjpeg
     ench->packetlength = 128*sizeof(long int);
   
+    le2me_rtframeheader(ench);
     mux_v->buffer=vf->priv->buffer;
     muxer_write_chunk(mux_v,FRAMEHEADERSIZE + 128*sizeof(long int), 0x10);
     vf->priv->tbl_wrote = 1;
@@ -172 +173 @@
     
   ench->frametype = 'V'; // video frame
   ench->packetlength = len;
+  le2me_rtframeheader(ench);
   mux_v->buffer=(void*)ench;
   muxer_write_chunk(mux_v, len + FRAMEHEADERSIZE, 0x10);
   return 1;

libmpcodecs/native/RTjpegN.c

@@ -31 +31 @@
 #define MMX
 #endif
 
+#include "bswap.h"
 #include "RTjpegN.h"
 
 #ifdef MMX
@@ -2820 +2821 @@
  RTjpeg_quant_init();
 
  for(i=0; i<64; i++)
-  buf[i]=RTjpeg_liqt[i];
+  buf[i]=le2me_32(RTjpeg_liqt[i]);
  for(i=0; i<64; i++)
-  buf[64+i]=RTjpeg_ciqt[i];
+  buf[64+i]=le2me_32(RTjpeg_ciqt[i]);
 }
 
 void RTjpeg_init_decompress(__u32 *buf, int width, int height)
@@ -2840 +2841 @@
 
  for(i=0; i<64; i++)
  {
-  RTjpeg_liqt[i]=buf[i];
-  RTjpeg_ciqt[i]=buf[i+64];
+  RTjpeg_liqt[i]=le2me_32(buf[i]);
+  RTjpeg_ciqt[i]=le2me_32(buf[i+64]);
  }
 
  RTjpeg_lb8=0;

libmpcodecs/native/nuppelvideo.c

@@ -13 +13 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#include "bswap.h"
 
 #include "../../libvo/fastmemcpy.h"
 
@@ -37 +38 @@
 //      printf("frametype: %c, comtype: %c, encoded_size: %d, width: %d, height: %d\n",
 //          encodedh->frametype, encodedh->comptype, encoded_size, width, height);
 
+        le2me_rtframeheader(encodedh);
         switch(encodedh->frametype)
         {
             case 'D':   /* additional data for compressors */

libmpdemux/demux_nuv.c

@@ -69 +69 @@
                 {       
                         if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
                                 return; /* EOF */
+                        le2me_rtframeheader(&rtjpeg_frameheader);
 
                         if ( rtjpeg_frameheader.frametype == 'V' ) 
                         {
@@ -145 +146 @@
         demuxer->filepos = orig_pos = stream_tell ( demuxer->stream );
         if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
             return 0; /* EOF */
+        le2me_rtframeheader(&rtjpeg_frameheader);
 
 #if 0
         printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n",
@@ -218 +220 @@
         stream_seek(demuxer->stream, 0);
 
         stream_read ( demuxer->stream, (char*)& rtjpeg_fileheader, sizeof(rtjpeg_fileheader) );
+        le2me_rtfileheader(&rtjpeg_fileheader);
 
         /* no video */
         if (rtjpeg_fileheader.videoblocks == 0)

libmpdemux/nuppelvideo.h

@@ -90 +90 @@
     unsigned char *buffer_offset;
 } audbuffertyp;
 
+#ifdef WORDS_BIGENDIAN
+#define le2me_rtfileheader(h) {                                 \
+    (h)->width = le2me_32((h)->width);                          \
+    (h)->height = le2me_32((h)->height);                        \
+    (h)->desiredwidth = le2me_32((h)->desiredwidth);            \
+    (h)->desiredheight = le2me_32((h)->desiredheight);          \
+    (h)->videoblocks = le2me_32((h)->videoblocks);              \
+    (h)->audioblocks = le2me_32((h)->audioblocks);              \
+    (h)->textsblocks = le2me_32((h)->textsblocks);              \
+    (h)->keyframedist = le2me_32((h)->keyframedist);            \
+  }
+#define le2me_rtframeheader(h) {                                \
+    (h)->timecode = le2me_32((h)->timecode);                    \
+    (h)->packetlength = le2me_32((h)->packetlength);            \
+  }
+#else
+#define le2me_rtfileheader(h) /**/
+#define le2me_rtframeheader(h) /**/
+#endif
+