rebuilt releases

git-svn-id: https://svn-dept.inf.ethz.ch/svn/lecturers/a2/trunk@8712 8c9fc860-2736-0410-a75d-ab315db34111

Linux32/bin/AVI.SymU

@@ -1,5 +1,5 @@
 MODULE AVI;
-	IMPORT SYSTEM, Machine, Streams, KernelLog, AOC := Codecs;
+	IMPORT SYSTEM, Machine, Streams, KernelLog, Codecs;
 CONST 
 	Debug = FALSE; 
 	DefaultReaderSize = 4096; 
@@ -79,7 +79,7 @@ TYPE
 
 	IndexArrayPointer* = POINTER TO ARRAY OF AVIIndexEntry; 
 
-	AVIStream* = OBJECT (AOC.DemuxStream)
+	AVIStream* = OBJECT (Codecs.DemuxStream)
 	VAR 
 		bufAdr: LONGINT; 
 		r: Streams.Reader; 
@@ -99,7 +99,7 @@ TYPE
 		PROCEDURE ^ SetPos*(pos: Streams.Position); 
 	END AVIStream; 
 
-	AVIDemux* = OBJECT (AOC.AVDemultiplexer)
+	AVIDemux* = OBJECT (Codecs.AVDemultiplexer)
 	VAR 
 		r: Streams.Reader; 
 		filename*: ARRAY 256 OF CHAR; 
@@ -136,7 +136,7 @@ TYPE
 		PROCEDURE ^ DumpAudioIndex*; 
 		PROCEDURE ^ GetAudioStreamHeader*(): AVIStreamHeader; 
 		PROCEDURE ^ GetVideoStreamHeader*(): AVIStreamHeader; 
-		PROCEDURE ^ GetStream*(streamNr: LONGINT): AOC.DemuxStream; 
+		PROCEDURE ^ GetStream*(streamNr: LONGINT): Codecs.DemuxStream; 
 		PROCEDURE ^ GetMilliSecondsPerFrame*(): LONGINT; 
 		PROCEDURE ^ GetNofChannels*(): LONGINT; 
 		PROCEDURE ^ GetSamplesPerSecond*(): LONGINT; 
@@ -147,7 +147,7 @@ TYPE
 		PROCEDURE ^ GetAudioBytes*(): LONGINT; 
 		PROCEDURE ^ GetVideoFrames*(): LONGINT; 
 		PROCEDURE ^ GetNumberOfStreams*(): LONGINT; 
-		PROCEDURE ^ GetStreamInfo*(streamNr: LONGINT): AOC.AVStreamInfo; 
+		PROCEDURE ^ GetStreamInfo*(streamNr: LONGINT): Codecs.AVStreamInfo; 
 		PROCEDURE ^ GetStreamType*(streamNr: LONGINT): LONGINT; 
 		PROCEDURE ^ GetInfo*(VAR vl, vf, vr, mspf, al, af, ar: LONGINT); 
 		PROCEDURE ^ GetData*(streamNr: LONGINT; VAR buf: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len: LONGINT; VAR res: WORD); 
@@ -165,6 +165,6 @@ TYPE
 	PROCEDURE ^ ShowBitsByteAligned*(n: LONGINT; VAR buf: ARRAY OF CHAR; VAR index: LONGINT): LONGINT; 
 	PROCEDURE ^ GetBits*(n: LONGINT; VAR buf: ARRAY OF CHAR; VAR index: LONGINT): LONGINT; 
 	PROCEDURE ^ SkipBits*(n: LONGINT; VAR index: LONGINT); 
-	PROCEDURE ^ Factory*(): AOC.AVDemultiplexer; 
+	PROCEDURE ^ Factory*(): Codecs.AVDemultiplexer; 
 BEGIN
 END AVI.

Linux32/bin/BitSets.SymU

@@ -16,9 +16,9 @@ TYPE
 		PROCEDURE ^ GetSize*(): LONGINT; 
 		PROCEDURE ^ SetBit*(pos: SIZE; value: BOOLEAN); 
 		PROCEDURE ^ GetBit*(pos: SIZE): BOOLEAN; 
-		PROCEDURE ^ SetBits*(startPos: SIZE; bits: LONGINT; value: HUGEINT); 
-		PROCEDURE ^ SetBytes*(startPos: SIZE; bytes: LONGINT; CONST values: ARRAY OF CHAR); 
-		PROCEDURE ^ GetBits*(startPos: SIZE; bits: LONGINT): WORD; 
+		PROCEDURE ^ SetBits*(startPos, bits: SIZE; value: HUGEINT); 
+		PROCEDURE ^ SetBytes*(startPos, bytes: SIZE; CONST values: ARRAY OF CHAR); 
+		PROCEDURE ^ GetBits*(startPos, bits: SIZE): WORD; 
 		PROCEDURE ^ CopyTo*(address: ADDRESS; bits: SIZE); 
 	END BitSet; 
 

Linux32/bin/Codecs.SymU

@@ -106,6 +106,13 @@ TYPE
 		PROCEDURE ^ Render*(img: Raster.Image); 
 	END VideoDecoder; 
 
+	VideoEncoder* = OBJECT 
+
+		PROCEDURE ^ Open*(out: Streams.Writer; VAR res: WORD); 
+		PROCEDURE ^ Write*(img: Raster.Image); 
+		PROCEDURE ^ Close*(VAR res: WORD); 
+	END VideoEncoder; 
+
 	ImageDecoder* = OBJECT 
 
 		PROCEDURE ^ Open*(in: Streams.Reader; VAR res: WORD); 
@@ -178,6 +185,8 @@ TYPE
 
 	VideoDecoderFactory = PROCEDURE ():VideoDecoder; 
 
+	VideoEncoderFactory = PROCEDURE ():VideoEncoder; 
+
 	ImageDecoderFactory = PROCEDURE ():ImageDecoder; 
 
 	ImageEncoderFactory = PROCEDURE ():ImageEncoder; 
@@ -199,6 +208,7 @@ TYPE
 	PROCEDURE ^ GetImageDecoder*(CONST name: ARRAY OF CHAR): ImageDecoder; 
 	PROCEDURE ^ GetImageEncoder*(CONST name: ARRAY OF CHAR): ImageEncoder; 
 	PROCEDURE ^ GetVideoDecoder*(CONST name: ARRAY OF CHAR): VideoDecoder; 
+	PROCEDURE ^ GetVideoEncoder*(CONST name: ARRAY OF CHAR): VideoEncoder; 
 	PROCEDURE ^ GetAudioDecoder*(CONST name: ARRAY OF CHAR): AudioDecoder; 
 	PROCEDURE ^ GetAudioEncoder*(CONST name: ARRAY OF CHAR): AudioEncoder; 
 	PROCEDURE ^ GetTextDecoder*(CONST name: ARRAY OF CHAR): TextDecoder; 

Linux32/bin/CryptoSHA256.SymU

@@ -21,10 +21,42 @@ VAR
 	K256: ARRAY 64 OF LONGINT; 
 
 	PROCEDURE ^ NewHash*(): Hashes.Hash; 
-	PROCEDURE ^ Sigma0Maj(x: SET32; y, z: LONGINT): LONGINT; 
-	PROCEDURE ^ Sigma1Ch(x: SET32; y, z: LONGINT): LONGINT; 
-	PROCEDURE ^ sigma0(x: SET32): LONGINT; 
-	PROCEDURE ^ sigma1(x: SET32): LONGINT; 
+	PROCEDURE  - Sigma0Maj(px, py, pz: LONGINT): LONGINT;
+	VAR 
+		x, y, z, a, b: SET32; 
+	BEGIN
+		x := S.VAL(SET32, px); 
+		y := S.VAL(SET32, py); 
+		z := S.VAL(SET32, pz); 
+		a := ((ROT(x, 30) / ROT(x, 19)) / ROT(x, 10)); 
+		b := (((x * y) / (x * z)) / (y * z)); 
+		RETURN (S.VAL(LONGINT, a) + S.VAL(LONGINT, b))
+	END Sigma0Maj; 
+	PROCEDURE  - Sigma1Ch(px, py, pz: LONGINT): LONGINT;
+	VAR 
+		x, y, z, a, b: SET32; 
+	BEGIN
+		x := S.VAL(SET32, px); 
+		y := S.VAL(SET32, py); 
+		z := S.VAL(SET32, pz); 
+		a := ((ROT(x, 26) / ROT(x, 21)) / ROT(x, 7)); 
+		b := ((x * y) / ( -x * z)); 
+		RETURN (S.VAL(LONGINT, a) + S.VAL(LONGINT, b))
+	END Sigma1Ch; 
+	PROCEDURE  - sigma0(px: LONGINT): LONGINT;
+	VAR 
+		x: SET32; 
+	BEGIN
+		x := S.VAL(SET32, px); 
+		RETURN S.VAL(LONGINT, ((ROT(x, 25) / ROT(x, 14)) / LSH(x,  -3)))
+	END sigma0; 
+	PROCEDURE  - sigma1(px: LONGINT): LONGINT;
+	VAR 
+		x: SET32; 
+	BEGIN
+		x := S.VAL(SET32, px); 
+		RETURN S.VAL(LONGINT, ((ROT(x, 15) / ROT(x, 13)) / LSH(x,  -10)))
+	END sigma1; 
 	PROCEDURE ^ InitializeK; 
 BEGIN
 END CryptoSHA256.