Ticket #237: nuv_be.diff

libmpdemux/demux_nuv.c

@@ -69 +69 @@
                 {       
                         if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
                                 return; /* EOF */
+                        le2me_frameheader(&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_frameheader(&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_fileheader(&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
+