bfg-common 1.6.95 → 1.6.97

package/public/spice-console/application/WorkerProcess.js

@@ -323,6 +323,8 @@ wdi.JSQuic = {
 			wm = 10;
 		}
 
+    state.waitmask = wdi.JSQuic.bppmask[wm]; // Custome code
+
 		//>> 1 == / 2
 		state.wm_trigger = wdi.JSQuic.besttrigtab[Math.floor(wdi.JSQuic.evol >> 1)][wm];
 	},
@@ -1058,43 +1060,53 @@ function QUIC_UNCOMPRESS_RGBA(encoder, channels, bpc, type) {
 }
 
 function quic_four_uncompress_row(encoder, channel, bpc, type) {
-	var bpc_mask = wdi.JSQuic.BPC_MASK[type];
-	var pos = 0;
-	var width = encoder.width;
-	while ((wdi.JSQuic.wmimax > channel.state.wmidx) && (channel.state.wmileft <= width)) {
-		if (channel.state.wmileft) {
-			uncompress_four_row_seg(
-				encoder,
-				channel,
-				pos,
-				pos + channel.state.wmileft,
-				bpc,
-				bpc_mask,
-				type
-			);
-			pos += channel.state.wmileft;
-			width -= channel.state.wmileft;
-		}
-
-		channel.state.wmidx++;
-		wdi.JSQuic.set_wm_trigger(channel.state);
-		channel.state.wmileft = wdi.JSQuic.wminext;
-	}
-
-	if (width) {
-		uncompress_four_row_seg(
-			encoder,
-			channel,
-			pos,
-			pos + width,
-			bpc,
-			bpc_mask,
-			type
-		);
-		if (wdi.JSQuic.wmimax > channel.state.wmidx) {
-			channel.state.wmileft -= width;
-		}
-	}
+  var bpc_mask = wdi.JSQuic.BPC_MASK[type]
+  var pos = 0
+  var width = encoder.width
+  while (
+    wdi.JSQuic.wmimax > channel.state.wmidx &&
+    channel.state.wmileft <= width
+  ) {
+    var segment_len = channel.state.wmileft // Custom code
+    if (channel.state.wmileft) {
+      uncompress_four_row_seg(
+        encoder,
+        channel,
+        pos,
+        pos + segment_len, // Custom code
+        bpc,
+        bpc_mask,
+        type
+      )
+      pos += segment_len // Custom code
+      width -= segment_len // Custom code
+    }
+
+    channel.state.wmidx++
+    wdi.JSQuic.set_wm_trigger(channel.state)
+    channel.state.wmileft = wdi.JSQuic.wminext
+  }
+
+  if (width) {
+    uncompress_four_row_seg(
+      encoder,
+      channel,
+      pos,
+      pos + width,
+      bpc,
+      bpc_mask,
+      type
+    )
+    if (wdi.JSQuic.wmimax > channel.state.wmidx) {
+      channel.state.wmileft -= width
+
+      // Custom code
+      if (channel.state.wmileft < 0) {
+        channel.state.wmileft = 0
+      }
+      // Custom code end
+    }
+  }
 }
 
 function uncompress_four_row_seg(encoder, channel, i, end, bpc, bpc_mask, type) {
@@ -1221,45 +1233,54 @@ function uncompress_four_row_seg(encoder, channel, i, end, bpc, bpc_mask, type)
 
 
 function quic_four_uncompress_row0(encoder, channel, bpc, type) {
-	var bpc_mask = wdi.JSQuic.BPC_MASK[type];
-	var pos = 0;
-	var width = encoder.width;
-	while ((wdi.JSQuic.wmimax > channel.state.wmidx) && (channel.state.wmileft <= width)) {
-		if (channel.state.wmileft) {
-			uncompress_four_row0_seg(
-				encoder,
-				channel,
-				pos,
-				pos + channel.wmileft,
-				wdi.JSQuic.bppmask[channel.state.wmidx],
-				bpc,
-				bpc_mask,
-				type
-			);
-			pos += channel.state.wmileft;
-			width -= channel.state.wmileft;
-		}
-
-		channel.state.wmidx++;
-		wdi.JSQuic.set_wm_trigger(channel.state);
-		channel.state.wmileft = wdi.JSQuic.wminext;
-	}
-
-	if (width) {
-		uncompress_four_row0_seg(
-			encoder,
-			channel,
-			pos,
-			pos + width,
-			wdi.JSQuic.bppmask[channel.state.wmidx],
-			bpc,
-			bpc_mask,
-			type
-		);
-		if (wdi.JSQuic.wmimax > channel.state.wmidx) {
-			channel.state.wmileft -= width;
-		}
-	}
+  var bpc_mask = wdi.JSQuic.BPC_MASK[type]
+  var pos = 0
+  var width = encoder.width
+  while (
+    wdi.JSQuic.wmimax > channel.state.wmidx &&
+    channel.state.wmileft <= width
+  ) {
+    var segment_len = channel.state.wmileft // Custom code
+    if (channel.state.wmileft) {
+      uncompress_four_row0_seg(
+        encoder,
+        channel,
+        pos,
+        pos + segment_len, // Custom code
+        wdi.JSQuic.bppmask[channel.state.wmidx],
+        bpc,
+        bpc_mask,
+        type
+      )
+      pos += segment_len // Custom code
+      width -= segment_len // Custom code
+    }
+
+    channel.state.wmidx++
+    wdi.JSQuic.set_wm_trigger(channel.state)
+    channel.state.wmileft = wdi.JSQuic.wminext
+  }
+
+  if (width) {
+    uncompress_four_row0_seg(
+      encoder,
+      channel,
+      pos,
+      pos + width,
+      wdi.JSQuic.bppmask[channel.state.wmidx],
+      bpc,
+      bpc_mask,
+      type
+    )
+    if (wdi.JSQuic.wmimax > channel.state.wmidx) {
+      channel.state.wmileft -= width
+      // Custom code
+      if (channel.state.wmileft < 0) {
+        channel.state.wmileft = 0
+      }
+      // Custom code
+    }
+  }
 }
 
 function uncompress_four_row0_seg(encoder, channel, i, end, waitmask, bpc, bpc_mask, type) {
@@ -1439,151 +1460,166 @@ function quic_uncompress_row(encoder, channels, bpc, type, rgb_state, computedAl
 							 notGRprefixmask, notGRcwlen, nGRcodewords, notGRsuffixlen, eatbits, tabrand, decode_run, bppmask, tabrand_chaos,
 							 tabrand_seedmask, usr) {
 
-	var pos = 0;
-	var rows_completed = encoder.rows_completed;
-	var currentOffset32 = ((rows_completed) * computedWidth / 4);
-	var offset = ((rows_completed - 1) * computedWidth);
-	while ((jsquic.wmimax > rgb_state.wmidx) && (rgb_state.wmileft <= width)) {
-		if (rgb_state.wmileft) {
-			uncompress_row_seg(
-				encoder,
-				pos,
-				pos + rgb_state.wmileft,
-				bpc,
-				bpc_mask,
-				type,
-				rgb_state,
-				computedAlpha,
-				result,
-				resultData,
-				channel_r,
-				channel_g,
-				channel_b,
-				buckets_ptrs_r,
-				buckets_ptrs_g,
-				buckets_ptrs_b,
-				correlate_row_r,
-				correlate_row_g,
-				correlate_row_b,
-				computedWidth,
-				xlatL2U,
-				lzeroes,
-				lzeroes8,
-				lzeroes16,
-				lzeroes24,
-				notGRprefixmask,
-				notGRcwlen,
-				nGRcodewords,
-				notGRsuffixlen,
-				eatbits,
-				tabrand,
-				decode_run,
-				bppmask,
-				jsquic,
-				tabrand_chaos,
-				rows_completed,
-				tabrand_seedmask,
-				offset,
-				currentOffset32,
-				usr
-			);
-			pos += rgb_state.wmileft;
-			width -= rgb_state.wmileft;
-		}
-
-		rgb_state.wmidx++;
-		jsquic.set_wm_trigger(rgb_state);
-		rgb_state.wmileft = jsquic.wminext;
-	}
-
-	if (width) {
-		uncompress_row_seg(
-			encoder,
-			pos,
-			pos + width,
-			bpc,
-			bpc_mask,
-			type,
-			rgb_state,
-			computedAlpha,
-			result,
-			resultData,
-			channel_r,
-			channel_g,
-			channel_b,
-			buckets_ptrs_r,
-			buckets_ptrs_g,
-			buckets_ptrs_b,
-			correlate_row_r,
-			correlate_row_g,
-			correlate_row_b,
-			computedWidth,
-			xlatL2U,
-			lzeroes,
-			lzeroes8,
-			lzeroes16,
-			lzeroes24,
-			notGRprefixmask,
-			notGRcwlen,
-			nGRcodewords,
-			notGRsuffixlen,
-			eatbits,
-			tabrand,
-			decode_run,
-			bppmask,
-			jsquic,
-			tabrand_chaos,
-			rows_completed,
-			tabrand_seedmask,
-			offset,
-			currentOffset32,
-			usr
-		);
-		if (jsquic.wmimax > encoder.rgb_state.wmidx) {
-			rgb_state.wmileft -= width;
-		}
-	}
+  var pos = 0
+  var rows_completed = encoder.rows_completed
+  var currentOffset32 = (rows_completed * computedWidth) / 4
+  var offset = (rows_completed - 1) * computedWidth
+  while (jsquic.wmimax > rgb_state.wmidx && rgb_state.wmileft <= width) {
+    var segment_len = rgb_state.wmileft // Custom code
+
+    if (segment_len) {
+      uncompress_row_seg(
+        encoder,
+        pos,
+        pos + segment_len, // Custom code
+        bpc,
+        bpc_mask,
+        type,
+        rgb_state,
+        computedAlpha,
+        result,
+        resultData,
+        channel_r,
+        channel_g,
+        channel_b,
+        buckets_ptrs_r,
+        buckets_ptrs_g,
+        buckets_ptrs_b,
+        correlate_row_r,
+        correlate_row_g,
+        correlate_row_b,
+        computedWidth,
+        xlatL2U,
+        lzeroes,
+        lzeroes8,
+        lzeroes16,
+        lzeroes24,
+        notGRprefixmask,
+        notGRcwlen,
+        nGRcodewords,
+        notGRsuffixlen,
+        eatbits,
+        tabrand,
+        decode_run,
+        bppmask,
+        jsquic,
+        tabrand_chaos,
+        rows_completed,
+        tabrand_seedmask,
+        offset,
+        currentOffset32,
+        usr
+      )
+      pos += segment_len // Custom code
+      width -= segment_len // Custom code
+    }
+
+    rgb_state.wmidx++
+    jsquic.set_wm_trigger(rgb_state)
+    rgb_state.wmileft = jsquic.wminext
+  }
+
+  if (width) {
+    uncompress_row_seg(
+      encoder,
+      pos,
+      pos + width,
+      bpc,
+      bpc_mask,
+      type,
+      rgb_state,
+      computedAlpha,
+      result,
+      resultData,
+      channel_r,
+      channel_g,
+      channel_b,
+      buckets_ptrs_r,
+      buckets_ptrs_g,
+      buckets_ptrs_b,
+      correlate_row_r,
+      correlate_row_g,
+      correlate_row_b,
+      computedWidth,
+      xlatL2U,
+      lzeroes,
+      lzeroes8,
+      lzeroes16,
+      lzeroes24,
+      notGRprefixmask,
+      notGRcwlen,
+      nGRcodewords,
+      notGRsuffixlen,
+      eatbits,
+      tabrand,
+      decode_run,
+      bppmask,
+      jsquic,
+      tabrand_chaos,
+      rows_completed,
+      tabrand_seedmask,
+      offset,
+      currentOffset32,
+      usr
+    )
+    if (jsquic.wmimax > encoder.rgb_state.wmidx) {
+      rgb_state.wmileft -= width
+
+      // Custom code
+      if (rgb_state.wmileft < 0) {
+        rgb_state.wmileft = 0
+      }
+      // Custom code
+    }
+  }
 }
 
 
 function quic_uncompress_row_a(encoder, channels, bpc, type, rgb_state) {
-	var bpc_mask = wdi.JSQuic.BPC_MASK[type];
-	var pos = 0;
-	var width = encoder.width;
-	while ((wdi.JSQuic.wmimax > rgb_state.wmidx) && (rgb_state.wmileft <= width)) {
-		if (rgb_state.wmileft) {
-			uncompress_row_seg_a(
-				encoder,
-				pos,
-				pos + rgb_state.wmileft,
-				bpc,
-				bpc_mask,
-				type,
-				rgb_state
-			);
-			pos += rgb_state.wmileft;
-			width -= rgb_state.wmileft;
-		}
-
-		rgb_state.wmidx++;
-		wdi.JSQuic.set_wm_trigger(rgb_state);
-		rgb_state.wmileft = wdi.JSQuic.wminext;
-	}
-
-	if (width) {
-		uncompress_row_seg_a(
-			encoder,
-			pos,
-			pos + width,
-			bpc,
-			bpc_mask,
-			type,
-			rgb_state
-		);
-		if (wdi.JSQuic.wmimax > encoder.rgb_state.wmidx) {
-			rgb_state.wmileft -= width;
-		}
-	}
+  var bpc_mask = wdi.JSQuic.BPC_MASK[type]
+  var pos = 0
+  var width = encoder.width
+  while (wdi.JSQuic.wmimax > rgb_state.wmidx && rgb_state.wmileft <= width) {
+    var segment_len = rgb_state.wmileft // Custom code
+
+    if (segment_len) {
+      uncompress_row_seg_a(
+        encoder,
+        pos,
+        pos + segment_len, // Custom code
+        bpc,
+        bpc_mask,
+        type,
+        rgb_state
+      )
+      pos += segment_len // Custom code
+      width -= segment_len // Custom code
+    }
+
+    rgb_state.wmidx++
+    wdi.JSQuic.set_wm_trigger(rgb_state)
+    rgb_state.wmileft = wdi.JSQuic.wminext
+  }
+
+  if (width) {
+    uncompress_row_seg_a(
+      encoder,
+      pos,
+      pos + width,
+      bpc,
+      bpc_mask,
+      type,
+      rgb_state
+    )
+    if (wdi.JSQuic.wmimax > encoder.rgb_state.wmidx) {
+      rgb_state.wmileft -= width
+      // Custom code
+      if (rgb_state.wmileft < 0) {
+        rgb_state.wmileft = 0
+      }
+      // Custom code end
+    }
+  }
 }
 
 function SAME_PIXEL_RGB_A(i, result) {
@@ -2684,95 +2720,167 @@ function uncompress_row_seg_a(encoder, i, end, bpc, bpc_mask, type, rgb_state) {
 
 
 function quic_uncompress_row0(encoder, channels, bpc, type) {
-	var bpc_mask = wdi.JSQuic.BPC_MASK[type];
-	var pos = 0;
-	var width = encoder.width;
-	while ((wdi.JSQuic.wmimax > encoder.rgb_state.wmidx) && (encoder.rgb_state.wmileft <= width)) {
-		if (encoder.rgb_state.wmileft) {
-			uncompress_row0_seg(
-				encoder,
-				pos,
-				pos + encoder.rgb_state.wmileft,
-				wdi.JSQuic.bppmask[encoder.rgb_state.wmidx],
-				bpc,
-				bpc_mask,
-				type
-			);
-			pos += encoder.rgb_state.wmileft;
-			width -= encoder.rgb_state.wmileft;
-		}
-
-		encoder.rgb_state.wmidx++;
-		wdi.JSQuic.set_wm_trigger(encoder.rgb_state);
-		encoder.rgb_state.wmileft = wdi.JSQuic.wminext;
-	}
-
-	if (width) {
-		uncompress_row0_seg(
-			encoder,
-			pos,
-			pos + width,
-			wdi.JSQuic.bppmask[encoder.rgb_state.wmidx],
-			bpc,
-			bpc_mask,
-			type
-		);
-		if (wdi.JSQuic.wmimax > encoder.rgb_state.wmidx) {
-			encoder.rgb_state.wmileft -= width;
-		}
-	}
+  var bpc_mask = wdi.JSQuic.BPC_MASK[type]
+  var pos = 0
+  var width = encoder.width
+  while (
+    wdi.JSQuic.wmimax > encoder.rgb_state.wmidx &&
+    encoder.rgb_state.wmileft <= width
+  ) {
+    var segment_len = encoder.rgb_state.wmileft // Custom code
+    if (segment_len) {
+      uncompress_row0_seg(
+        encoder,
+        pos,
+        pos + segment_len, // Custom code
+        wdi.JSQuic.bppmask[encoder.rgb_state.wmidx],
+        bpc,
+        bpc_mask,
+        type
+      )
+      pos += segment_len // Custom code
+      width -= segment_len // Custom code
+    }
+
+    encoder.rgb_state.wmidx++
+    wdi.JSQuic.set_wm_trigger(encoder.rgb_state)
+    encoder.rgb_state.wmileft = wdi.JSQuic.wminext
+  }
+
+  if (width) {
+    uncompress_row0_seg(
+      encoder,
+      pos,
+      pos + width,
+      wdi.JSQuic.bppmask[encoder.rgb_state.wmidx],
+      bpc,
+      bpc_mask,
+      type
+    )
+    if (wdi.JSQuic.wmimax > encoder.rgb_state.wmidx) {
+      encoder.rgb_state.wmileft -= width
+      // Custom code
+      if (encoder.rgb_state.wmileft < 0) {
+        encoder.rgb_state.wmileft = 0
+      }
+      // Custom code end
+    }
+  }
 }
 
 function uncompress_row0_seg(encoder, i, end, waitmask, bpc, bpc_mask, type) {
-	var channel_r = encoder.channels[0];
-	var channel_g = encoder.channels[1];
-	var channel_b = encoder.channels[2];
-
-	var correlate_row_r = channel_r.correlate_row;
-	var correlate_row_g = channel_g.correlate_row;
-	var correlate_row_b = channel_b.correlate_row;
-
-	var stopidx = 0;
-
-	var pr, pg, pb;
-
-	if (!i) {
-		pr = UNCOMPRESS_ONE_ROW0_0(channel_r);
-		pg = UNCOMPRESS_ONE_ROW0_0(channel_g);
-		pb = UNCOMPRESS_ONE_ROW0_0(channel_b);
-
-		encoder.appendPixel(pr, pg, pb);
-
-		if (encoder.rgb_state.waitcnt) {
-			--encoder.rgb_state.waitcnt;
-		} else {
-			encoder.rgb_state.waitcnt = (wdi.JSQuic.tabrand(encoder.rgb_state) & waitmask);
-			UPDATE_MODEL(0, encoder, bpc, correlate_row_r, correlate_row_g, correlate_row_b);
-		}
-		stopidx = ++i + encoder.rgb_state.waitcnt;
-	} else {
-		stopidx = i + encoder.rgb_state.waitcnt;
-	}
-
-	while (stopidx < end) {
-		for (; i <= stopidx; i++) {
-			pr = UNCOMPRESS_ONE_ROW0(channel_r, i, bpc_mask, encoder, correlate_row_r, pr);
-			pg = UNCOMPRESS_ONE_ROW0(channel_g, i, bpc_mask, encoder, correlate_row_g, pg);
-			pb = UNCOMPRESS_ONE_ROW0(channel_b, i, bpc_mask, encoder, correlate_row_b, pb);
-
-			encoder.appendPixel(pr, pg, pb);
-		}
-		UPDATE_MODEL(stopidx, encoder, bpc, correlate_row_r, correlate_row_g, correlate_row_b);
-		stopidx = i + (wdi.JSQuic.tabrand(encoder.rgb_state) & waitmask);
-	}
-
-	for (; i < end; i++) {
-		pr = UNCOMPRESS_ONE_ROW0(channel_r, i, bpc_mask, encoder, correlate_row_r, pr);
-		pg = UNCOMPRESS_ONE_ROW0(channel_g, i, bpc_mask, encoder, correlate_row_g, pg);
-		pb = UNCOMPRESS_ONE_ROW0(channel_b, i, bpc_mask, encoder, correlate_row_b, pb);
-		encoder.appendPixel(pr, pg, pb);
-	}
-	encoder.rgb_state.waitcnt = stopidx - end;
+  var channel_r = encoder.channels[0]
+  var channel_g = encoder.channels[1]
+  var channel_b = encoder.channels[2]
+
+  var correlate_row_r = channel_r.correlate_row
+  var correlate_row_g = channel_g.correlate_row
+  var correlate_row_b = channel_b.correlate_row
+
+  var stopidx = 0
+
+  var pr, pg, pb
+
+  if (!i) {
+    pr = UNCOMPRESS_ONE_ROW0_0(channel_r)
+    pg = UNCOMPRESS_ONE_ROW0_0(channel_g)
+    pb = UNCOMPRESS_ONE_ROW0_0(channel_b)
+
+    encoder.appendPixel(pr, pg, pb)
+
+    if (encoder.rgb_state.waitcnt) {
+      --encoder.rgb_state.waitcnt
+    } else {
+      encoder.rgb_state.waitcnt =
+        wdi.JSQuic.tabrand(encoder.rgb_state) & waitmask
+      UPDATE_MODEL(
+        0,
+        encoder,
+        bpc,
+        correlate_row_r,
+        correlate_row_g,
+        correlate_row_b
+      )
+    }
+    stopidx = ++i + encoder.rgb_state.waitcnt
+  } else {
+    stopidx = i + encoder.rgb_state.waitcnt
+    // Custom code
+    // Читаем последний пиксель из result
+    pr = encoder.result[encoder.cnt - 4] // R предыдущего пикселя
+    pg = encoder.result[encoder.cnt - 3] // G
+    pb = encoder.result[encoder.cnt - 2] // B
+    // Custom code
+  }
+
+  while (stopidx < end) {
+    for (; i <= stopidx; i++) {
+      pr = UNCOMPRESS_ONE_ROW0(
+        channel_r,
+        i,
+        bpc_mask,
+        encoder,
+        correlate_row_r,
+        pr
+      )
+      pg = UNCOMPRESS_ONE_ROW0(
+        channel_g,
+        i,
+        bpc_mask,
+        encoder,
+        correlate_row_g,
+        pg
+      )
+      pb = UNCOMPRESS_ONE_ROW0(
+        channel_b,
+        i,
+        bpc_mask,
+        encoder,
+        correlate_row_b,
+        pb
+      )
+
+      encoder.appendPixel(pr, pg, pb)
+    }
+    UPDATE_MODEL(
+      stopidx,
+      encoder,
+      bpc,
+      correlate_row_r,
+      correlate_row_g,
+      correlate_row_b
+    )
+    stopidx = i + (wdi.JSQuic.tabrand(encoder.rgb_state) & waitmask)
+  }
+
+  for (; i < end; i++) {
+    pr = UNCOMPRESS_ONE_ROW0(
+      channel_r,
+      i,
+      bpc_mask,
+      encoder,
+      correlate_row_r,
+      pr
+    )
+    pg = UNCOMPRESS_ONE_ROW0(
+      channel_g,
+      i,
+      bpc_mask,
+      encoder,
+      correlate_row_g,
+      pg
+    )
+    pb = UNCOMPRESS_ONE_ROW0(
+      channel_b,
+      i,
+      bpc_mask,
+      encoder,
+      correlate_row_b,
+      pb
+    )
+    encoder.appendPixel(pr, pg, pb)
+  }
+  encoder.rgb_state.waitcnt = stopidx - end
 }
 
 function UNCOMPRESS_ONE_0(channel, encoder, bpc_mask, offset) {