Changeset 128 for CoolStreaming/UDynNumber.pas

Timestamp:

Jan 16, 2011, 4:31:02 PM (14 years ago)

Author:

george

Message:

• Fixed: Bad QWord shifting.
• Fixed: Reading dynamic value from bit stream.

File:

• CoolStreaming/UDynNumber.pas (modified) (4 diffs)

CoolStreaming/UDynNumber.pas

@@ -14 +14 @@
   TDynamicNumber = class
     Stream: TBitStream;
-    procedure Write(Value: QWord);
-    function Read: QWord;
+    procedure WriteNumber(Value: QWord);
+    function ReadNumber: QWord;
     constructor Create;
     destructor Destroy; override;
+  private
+    function ReadNumber2: QWord;
   end;
 
@@ -24 +26 @@
 { TDynamicNumber }
 
-procedure TDynamicNumber.Write(Value: QWord);
+procedure TDynamicNumber.WriteNumber(Value: QWord);
 var
-  Bit: Byte;
   Length: Integer;
 begin
@@ -32 +33 @@
   if Length > 1 then begin
     Stream.WriteNumber(1, 1);
-    Write(Length - 2);
+    WriteNumber(Length - 2);
   end else Stream.WriteNumber(0, 1);
   if Length > 1 then Length := Length - 1;
@@ -38 +39 @@
 end;
 
-function TDynamicNumber.Read: QWord;
+function TDynamicNumber.ReadNumber: QWord;
 var
   Bit: Byte;
   Length: Integer;
 begin
+  Length := 0;
   Bit := Stream.ReadNumber(1);
   if Bit = 0 then Length := 1
-    else Length := Read + 2;
-  Result := Stream.ReadNumber(Length);
-  if Length > 0 then Result := Result or (1 shl Length);
+    else Length := ReadNumber2 + 2;
+  if Length > 1 then Result := Stream.ReadNumber(Length - 1)
+    else Result := Stream.ReadNumber(Length);
+  if Length > 1 then Result := Result or (QWord(1) shl (Length - 1));
+end;
+
+function TDynamicNumber.ReadNumber2: QWord;
+var
+  Bit: Byte;
+  Length: Integer;
+begin
+  Length := 0;
+  Bit := Stream.ReadNumber(1);
+  if Bit = 0 then Length := 1
+    else Length := ReadNumber + 2;
+  if Length > 1 then Result := Stream.ReadNumber(Length - 1)
+    else Result := Stream.ReadNumber(Length);
+  if Length > 1 then Result := Result or (QWord(1) shl (Length - 1));
 end;