-

Author: ireader

libmpeg/source/mpeg-system-header.c

@@ -27,12 +27,12 @@ int system_header_read(struct ps_system_header_t* h, struct mpeg_bits_t* reader)
     h->CSPS_flag = (v8 >> 0) & 0x01;
 
     v8 = mpeg_bits_read8(reader);
-    assert((0x20 & v8) == 0x20); // 'xx1xxxxx'
+    //assert((0x20 & v8) == 0x20); // 'xx1xxxxx'
     h->system_audio_lock_flag = (v8 >> 7) & 0x01;
     h->system_video_lock_flag = (v8 >> 6) & 0x01;
     h->video_bound = v8 & 0x1F;
 
-    //	assert((0x7F & data[11]) == 0x00); // 'x0000000'
+    //assert((0x7F & data[11]) == 0x00); // 'x0000000'
     h->packet_rate_restriction_flag = (mpeg_bits_read8(reader) >> 7) & 0x01;
 
     for (i = 0; 0 == mpeg_bits_error(reader) && mpeg_bits_tell(reader) + 1 < end && i < sizeof(h->streams) / sizeof(h->streams[0]); i++)
@@ -50,7 +50,7 @@ int system_header_read(struct ps_system_header_t* h, struct mpeg_bits_t* reader)
         }
 
         v16 = mpeg_bits_read16(reader);
-        assert((v16 & 0xC000) == 0xC000); // '11xxxxxx'
+        //assert((v16 & 0xC000) == 0xC000); // '11xxxxxx'
         h->streams[i].buffer_bound_scale = (v16 >> 13) & 0x01;
         h->streams[i].buffer_size_bound = v16 & 0x1FFF;
     }
@@ -69,28 +69,28 @@ size_t system_header_read(struct ps_system_header_t *h, const uint8_t* data, siz
 
     if (bytes < 12) return 0;
 
-    assert(0x00 == data[0] && 0x00 == data[1] && 0x01 == data[2] && PES_SID_SYS == data[3]);
+    //assert(0x00 == data[0] && 0x00 == data[1] && 0x01 == data[2] && PES_SID_SYS == data[3]);
     len = (data[4] << 8) | data[5];
     if(len + 6 > bytes)
     {
         assert(0);
         return 0;
     }
 
-    assert((0x80 & data[6]) == 0x80); // '1xxxxxxx'
-    assert((0x01 & data[8]) == 0x01); // 'xxxxxxx1'
+    //assert((0x80 & data[6]) == 0x80); // '1xxxxxxx'
+    //assert((0x01 & data[8]) == 0x01); // 'xxxxxxx1'
     h->rate_bound = ((data[6] & 0x7F) << 15) | (data[7] << 7) | ((data[8] >> 1) & 0x7F);
 
     h->audio_bound = (data[9] >> 2) & 0x3F;
     h->fixed_flag = (data[9] >> 1) & 0x01;
     h->CSPS_flag = (data[9] >> 0) & 0x01;
 
-    assert((0x20 & data[10]) == 0x20); // 'xx1xxxxx'
+    //assert((0x20 & data[10]) == 0x20); // 'xx1xxxxx'
     h->system_audio_lock_flag = (data[10] >> 7) & 0x01;
     h->system_video_lock_flag = (data[10] >> 6) & 0x01;
     h->video_bound = data[10] & 0x1F;
 
-    //	assert((0x7F & data[11]) == 0x00); // 'x0000000'
+    //assert((0x7F & data[11]) == 0x00); // 'x0000000'
     h->packet_rate_restriction_flag = (data[11] >> 7) & 0x01;
 
     i = 12;
@@ -106,7 +106,7 @@ size_t system_header_read(struct ps_system_header_t *h, const uint8_t* data, siz
             i += 3;
         }
 
-        assert((data[i] & 0xC0) == 0xC0); // '11xxxxxx'
+        //assert((data[i] & 0xC0) == 0xC0); // '11xxxxxx'
         h->streams[j].buffer_bound_scale = (data[i] >> 5) & 0x01;
         h->streams[j].buffer_size_bound = (data[i] & 0x1F) | data[i + 1];
         i += 2;

librtp/source/rtcp-app.c

@@ -44,8 +44,12 @@ int rtcp_app_pack(struct rtp_context *ctx, uint8_t* ptr, int bytes, const char n
 		nbo_w32(ptr+4, ctx->self->ssrc);
 		memcpy(ptr+8, name, 4);
 
-		if(len > 0)
-			memcpy(ptr+12, app, len);
+		if (len > 0)
+		{
+			memcpy(ptr + 12, app, len);
+			if(0 != len % 4)
+				memset(ptr + 12 + len, 0, 4 - (len % 4));
+		}	
 	}
 
 	return 12 + (len+3)/4*4;

librtp/source/rtcp-rtpfb.c

@@ -671,7 +671,7 @@ static int rtcp_rtpfb_tcc01_unpack(struct rtp_context* ctx, const rtcp_header_t*
 				r = -1;
 				break;
 			}
-			ccfb[i].ato = ((int16_t)nbo_r16(ptr)) >> 2; // 250us -> 1/1024(s)
+			ccfb[i].ato = ((int16_t)nbo_r16(ptr)) >> 2; // 250us -> 1/1024(ms)
 			bytes -= 2;
 			ptr += 2;
 		}
@@ -708,14 +708,14 @@ static int rtcp_rtpfb_tcc01_pack(uint16_t begin, const rtcp_ccfb_t* ccfb, int co
 
 	for (i = 0; i < count && bytes >= 2; i += k)
 	{
-		ato = ccfb[i].ato << 2; // 1/1024(s) -> 250us
+		ato = ccfb[i].ato << 2; // 1/1024(ms) -> 250us
 		two = (ccfb[i].received && (uint16_t)ato > 0xFF) ? 2 : 1;
 		received = ccfb[i].received;
 
 		// try Run Length Chunk
 		for (k = 1; i + k < count && ccfb[i + k].received == ccfb[i].received; k++)
 		{
-			ato = ccfb[i + k].ato << 2; // 1/1024(s) -> 250us
+			ato = ccfb[i + k].ato << 2; // 1/1024(ms) -> 250us
 			two = (ccfb[i + k].received && (uint16_t)ato > 0xFF) ? 2 : two;
 			received |= ccfb[i + k].received;
 		}
@@ -766,7 +766,7 @@ static int rtcp_rtpfb_tcc01_pack(uint16_t begin, const rtcp_ccfb_t* ccfb, int co
 				if (seq + k != ccfb[i].seq)
 					continue;
 
-				ato = ccfb[i].ato << 2; // 1/1024(s) -> 250us
+				ato = ccfb[i].ato << 2; // 1/1024(ms) -> 250us
 				if (chunk & 0x4000)
 				{
 					if (bytes < 2)
@@ -800,7 +800,7 @@ static int rtcp_rtpfb_tcc01_pack(uint16_t begin, const rtcp_ccfb_t* ccfb, int co
 					if (!ccfb[i].received)
 						continue;
 
-					ato = ccfb[i].ato << 2; // 1/1024(s) -> 250us
+					ato = ccfb[i].ato << 2; // 1/1024(ms) -> 250us
 					two = (chunk >> (2 * (6 - k))) & 0x03;
 					if (two == 1)
 					{
@@ -826,7 +826,7 @@ static int rtcp_rtpfb_tcc01_pack(uint16_t begin, const rtcp_ccfb_t* ccfb, int co
 					if (!ccfb[i].received)
 						continue;
 
-					ato = ccfb[i].ato << 2; // 1/1024(s) -> 250us
+					ato = ccfb[i].ato << 2; // 1/1024(ms) -> 250us
 					ptr[0] = (uint8_t)ato;
 					bytes -= 1;
 					ptr += 1;