[NUT-devel] [NUT] (ods15): r103 - in /trunk/libnut: demuxer.c muxer.c

[syncmail at mplayerhq.hu]

Author: ods15
Date: Sun Mar 12 18:32:33 2006
New Revision: 103

Log:
sync to spec again, back to 64kb for syncpoints and 2* for frame size

Modified:
    trunk/libnut/demuxer.c
    trunk/libnut/muxer.c

Modified: trunk/libnut/demuxer.c
==============================================================================
--- trunk/libnut/demuxer.c (original)
+++ trunk/libnut/demuxer.c Sun Mar 12 18:32:33 2006
@@ -236,7 +236,7 @@
 	ERROR(i != NUT_VERSION, -ERR_BAD_VERSION);
 	GET_V(tmp, nut->stream_count);
 	GET_V(tmp, nut->max_distance);
-	if (nut->max_distance > 131072) nut->max_distance = 131072;
+	if (nut->max_distance > 65536) nut->max_distance = 65536;
 
 	for(i = 0; i < 256; ) {
 		int scrap;
@@ -553,7 +553,7 @@
 
 	// error checking - max distance
 	ERROR(!after_sync && bctello(nut->i) + pd->len - nut->last_syncpoint > nut->max_distance, -ERR_MAX_SYNCPOINT_DISTANCE);
-	ERROR(!checksum && pd->len > nut->max_distance, -ERR_MAX_DISTANCE);
+	ERROR(!checksum && pd->len > 2*nut->max_distance, -ERR_MAX_DISTANCE);
 	// error checking - max pts distance
 	ERROR(!checksum && ABS((int64_t)pd->pts - (int64_t)nut->sc[pd->stream].last_pts) > nut->sc[pd->stream].max_pts_distance, -ERR_MAX_PTS_DISTANCE);
 	// error checking - out of order dts

Modified: trunk/libnut/muxer.c
==============================================================================
--- trunk/libnut/muxer.c (original)
+++ trunk/libnut/muxer.c Sun Mar 12 18:32:33 2006
@@ -390,7 +390,7 @@
 	if (ABS(pts_delta) < (msb_pts/2) - 1) coded_pts = fd->pts & (msb_pts - 1);
 	else coded_pts = fd->pts + msb_pts;
 
-	if (fd->len > nut->max_distance) checksum = 1;
+	if (fd->len > 2*nut->max_distance) checksum = 1;
 	if (ABS(pts_delta) > sc->max_pts_distance) {
 		fprintf(stderr, "%d > %d || %d - %d > %d   \n", fd->len, nut->max_distance, (int)fd->pts, (int)sc->last_pts, sc->max_pts_distance);
 		checksum = 1;
@@ -488,7 +488,7 @@
 	nut->max_distance = mopts->max_distance;
 	nut->mopts = *mopts;
 
-	if (nut->max_distance > 131072) nut->max_distance = 131072;
+	if (nut->max_distance > 65536) nut->max_distance = 65536;
 
 	{
 	int j, n;