[xine-cvs] HG: xine-lib-1.2: demux_ts: PAT/PMT CRCs calculated by av_crc() need to be converted to network byte order to match packet CRC

[Reinhard Nißl <rnissl@gm...>]

# HG changeset patch
# User Reinhard Nißl <rnissl@...>
# Date 1230310526 -3600
# Node ID 539b5359f43f243cfba1899183aab6600381d59d
# Parent  4ae9d1858f1e8f247031b331a132c0eec6ea995d
demux_ts: PAT/PMT CRCs calculated by av_crc() need to be converted to network byte order to match packet CRC

diff -r 539b5359f43f243cfba1899183aab6600381d59d -r 4ae9d1858f1e8f247031b331a132c0eec6ea995d src/demuxers/demux_ts.c
--- a/src/demuxers/demux_ts.c	Fri Dec 26 17:55:26 2008 +0100
+++ b/src/demuxers/demux_ts.c	Mon Dec 15 19:55:19 2008 +0000
@@ -140,6 +140,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+#include <arpa/inet.h>
 
 #ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <crc.h>
@@ -582,7 +583,7 @@ static void demux_ts_parse_pat (demux_ts
   }
 
   /* Check CRC. */
-  calc_crc32 = av_crc(this->class->av_crc, 0xffffffff, pkt+5, section_length+3-4);
+  calc_crc32 = htonl(av_crc(this->class->av_crc, 0xffffffff, pkt+5, section_length+3-4));
   if (crc32 != calc_crc32) {
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
 	     "demux_ts: demux error! PAT with invalid CRC32: packet_crc32: %.8x calc_crc32: %.8x\n",
@@ -941,7 +942,7 @@ static void demux_ts_buffer_pes(demux_ts
       m->buf->content = m->buf->mem;
       m->buf->size = m->buffered_bytes;
       m->buf->type = m->type;
-      m->buf->pts = m->pts;
+      m->buf->pts = 0; /* m->pts */
       m->buf->decoder_info[0] = 1;
       if( this->input->get_length (this->input) )
         m->buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * 
@@ -1201,8 +1202,8 @@ printf("Program Number is %i, looking fo
   crc32 |= (uint32_t) this->pmt[program_count][section_length+3-1] ;
 
   /* Check CRC. */
-  calc_crc32 = av_crc(this->class->av_crc, 0xffffffff,
-		      this->pmt[program_count], section_length+3-4);
+  calc_crc32 = htonl(av_crc(this->class->av_crc, 0xffffffff,
+			    this->pmt[program_count], section_length+3-4));
 
   if (crc32 != calc_crc32) {
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 

[xine-cvs] HG: xine-lib: Don't store immediately-discarded input read() results

[Thomas Viehmann <tv@be...>]

# HG changeset patch
# User Thomas Viehmann <tv@...>
# Date 1230314061 0
# Node ID 0c9937c3e53ecfa68c089d6292f840b6960de2a9
# Parent  f97e65a9684be31b3c215c4d2ae39de754ef100f
Don't store immediately-discarded input read() results

diff -r 0c9937c3e53ecfa68c089d6292f840b6960de2a9 -r f97e65a9684be31b3c215c4d2ae39de754ef100f src/demuxers/demux_mpeg.c
--- a/src/demuxers/demux_mpeg.c	Fri Dec 26 17:54:21 2008 +0000
+++ b/src/demuxers/demux_mpeg.c	Sat Dec 20 02:16:41 2008 +0100
@@ -330,7 +330,7 @@ static void parse_mpeg2_packet (demux_mp
     if((this->dummy_space[0] & 0xf0) == 0x80) {
 
       /* read rest of header - AC3 */
-      i = this->input->read (this->input, this->dummy_space+1, 3);
+      this->input->read (this->input, this->dummy_space+1, 3);
 
       /* contents */
       for (i = len - 4; i > 0; i -= (this->audio_fifo)
@@ -431,7 +431,7 @@ static void parse_mpeg2_packet (demux_mp
       header_len -= 5 ;
     }
 
-    i = this->input->read (this->input, this->dummy_space, header_len);
+    this->input->read (this->input, this->dummy_space, header_len);
 
     for (i = len; i > 0; i -= (this->audio_fifo) 
 	   ? this->audio_fifo->buffer_pool_buf_size : this->video_fifo->buffer_pool_buf_size) {
@@ -503,7 +503,7 @@ static void parse_mpeg2_packet (demux_mp
     } 
 
     /* read rest of header */
-    i = this->input->read (this->input, this->dummy_space, header_len);
+    this->input->read (this->input, this->dummy_space, header_len);
 
     /* contents */