mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 16:47:28 +01:00
std/vp8: parse the prediction modes
This commit, part of a series, is inspired by pull request PR #168 by Damian Kaczmarek (with AI assistance), with some modifications. Updates PR #168
This commit is contained in:
1 parent
b51fcb811a
commit
3f612e7214
4 files changed
+1011
No files matched your search
@@ -107,6 +107,142 @@ pri const RENORM_RANGE_M1 : roarray[256] base.u8[127 ..= 254] = [
|
||||
254,
|
||||
]
|
||||
|
||||
// RFC 6386 Section 11.5. Subblock Mode Probability Table.
|
||||
//
|
||||
// Note that the specification (the RFC) differs from the implementation
|
||||
// (libwebp's src/dec/tree_dec.c). The mode enumeration, ranging in 0 ..= 9,
|
||||
// has been re-ordered. This implementation follows libwebp.
|
||||
//
|
||||
// Here's the sequence of SUBBLOCK_MODE_PROBS[m][0][0] values:
|
||||
//
|
||||
// 231, 134, 88, 193, 125, 138, 104, 102, 164, 190. RFC's kf_bmode_prob.
|
||||
// 231, 134, 88, 193, 138, 104, 125, 102, 164, 190. libwebp's kBModesProba.
|
||||
// ^^^ ^^^ ^^^ Note the difference.
|
||||
//
|
||||
//
|
||||
// A libwebp commit message from 2010 says "lot of cosmetics" and "use HE and
|
||||
// VE naming for prediction mode instead of H and V" but it also does this
|
||||
// re-ordering. It has this diff:
|
||||
//
|
||||
// VP8PredFunc VP8PredLuma4[11] = {
|
||||
// - DC4, TM4, V4, H4, LD4, RD4, VR4, VL4, HD4, HU4
|
||||
// + DC4, TM4, VE4, HE4, RD4, VR4, LD4, VL4, HD4, HU4
|
||||
// };
|
||||
// ^^^ ^^^ ^^^ Note the difference.
|
||||
//
|
||||
// https://chromium.googlesource.com/webm/libwebp/+/f67b5939ad92e608b546b291b29bca1db3b54772%5E%21
|
||||
pri const SUBBLOCK_MODE_PROBS : roarray[10] roarray[10] roarray[9] base.u8[1 ..=] = [[
|
||||
[231, 120, 48, 89, 115, 113, 120, 152, 112],
|
||||
[152, 179, 64, 126, 170, 118, 46, 70, 95],
|
||||
[175, 69, 143, 80, 85, 82, 72, 155, 103],
|
||||
[56, 58, 10, 171, 218, 189, 17, 13, 152],
|
||||
[114, 26, 17, 163, 44, 195, 21, 10, 173],
|
||||
[121, 24, 80, 195, 26, 62, 44, 64, 85],
|
||||
[144, 71, 10, 38, 171, 213, 144, 34, 26],
|
||||
[170, 46, 55, 19, 136, 160, 33, 206, 71],
|
||||
[63, 20, 8, 114, 114, 208, 12, 9, 226],
|
||||
[81, 40, 11, 96, 182, 84, 29, 16, 36],
|
||||
],[
|
||||
[134, 183, 89, 137, 98, 101, 106, 165, 148],
|
||||
[72, 187, 100, 130, 157, 111, 32, 75, 80],
|
||||
[66, 102, 167, 99, 74, 62, 40, 234, 128],
|
||||
[41, 53, 9, 178, 241, 141, 26, 8, 107],
|
||||
[74, 43, 26, 146, 73, 166, 49, 23, 157],
|
||||
[65, 38, 105, 160, 51, 52, 31, 115, 128],
|
||||
[104, 79, 12, 27, 217, 255, 87, 17, 7],
|
||||
[87, 68, 71, 44, 114, 51, 15, 186, 23],
|
||||
[47, 41, 14, 110, 182, 183, 21, 17, 194],
|
||||
[66, 45, 25, 102, 197, 189, 23, 18, 22],
|
||||
],[
|
||||
[88, 88, 147, 150, 42, 46, 45, 196, 205],
|
||||
[43, 97, 183, 117, 85, 38, 35, 179, 61],
|
||||
[39, 53, 200, 87, 26, 21, 43, 232, 171],
|
||||
[56, 34, 51, 104, 114, 102, 29, 93, 77],
|
||||
[39, 28, 85, 171, 58, 165, 90, 98, 64],
|
||||
[34, 22, 116, 206, 23, 34, 43, 166, 73],
|
||||
[107, 54, 32, 26, 51, 1, 81, 43, 31],
|
||||
[68, 25, 106, 22, 64, 171, 36, 225, 114],
|
||||
[34, 19, 21, 102, 132, 188, 16, 76, 124],
|
||||
[62, 18, 78, 95, 85, 57, 50, 48, 51],
|
||||
],[
|
||||
[193, 101, 35, 159, 215, 111, 89, 46, 111],
|
||||
[60, 148, 31, 172, 219, 228, 21, 18, 111],
|
||||
[112, 113, 77, 85, 179, 255, 38, 120, 114],
|
||||
[40, 42, 1, 196, 245, 209, 10, 25, 109],
|
||||
[88, 43, 29, 140, 166, 213, 37, 43, 154],
|
||||
[61, 63, 30, 155, 67, 45, 68, 1, 209],
|
||||
[100, 80, 8, 43, 154, 1, 51, 26, 71],
|
||||
[142, 78, 78, 16, 255, 128, 34, 197, 171],
|
||||
[41, 40, 5, 102, 211, 183, 4, 1, 221],
|
||||
[51, 50, 17, 168, 209, 192, 23, 25, 82],
|
||||
],[
|
||||
[138, 31, 36, 171, 27, 166, 38, 44, 229],
|
||||
[67, 87, 58, 169, 82, 115, 26, 59, 179],
|
||||
[63, 59, 90, 180, 59, 166, 93, 73, 154],
|
||||
[40, 40, 21, 116, 143, 209, 34, 39, 175],
|
||||
[47, 15, 16, 183, 34, 223, 49, 45, 183],
|
||||
[46, 17, 33, 183, 6, 98, 15, 32, 183],
|
||||
[57, 46, 22, 24, 128, 1, 54, 17, 37],
|
||||
[65, 32, 73, 115, 28, 128, 23, 128, 205],
|
||||
[40, 3, 9, 115, 51, 192, 18, 6, 223],
|
||||
[87, 37, 9, 115, 59, 77, 64, 21, 47],
|
||||
],[
|
||||
[104, 55, 44, 218, 9, 54, 53, 130, 226],
|
||||
[64, 90, 70, 205, 40, 41, 23, 26, 57],
|
||||
[54, 57, 112, 184, 5, 41, 38, 166, 213],
|
||||
[30, 34, 26, 133, 152, 116, 10, 32, 134],
|
||||
[39, 19, 53, 221, 26, 114, 32, 73, 255],
|
||||
[31, 9, 65, 234, 2, 15, 1, 118, 73],
|
||||
[75, 32, 12, 51, 192, 255, 160, 43, 51],
|
||||
[88, 31, 35, 67, 102, 85, 55, 186, 85],
|
||||
[56, 21, 23, 111, 59, 205, 45, 37, 192],
|
||||
[55, 38, 70, 124, 73, 102, 1, 34, 98],
|
||||
],[
|
||||
[125, 98, 42, 88, 104, 85, 117, 175, 82],
|
||||
[95, 84, 53, 89, 128, 100, 113, 101, 45],
|
||||
[75, 79, 123, 47, 51, 128, 81, 171, 1],
|
||||
[57, 17, 5, 71, 102, 57, 53, 41, 49],
|
||||
[38, 33, 13, 121, 57, 73, 26, 1, 85],
|
||||
[41, 10, 67, 138, 77, 110, 90, 47, 114],
|
||||
[115, 21, 2, 10, 102, 255, 166, 23, 6],
|
||||
[101, 29, 16, 10, 85, 128, 101, 196, 26],
|
||||
[57, 18, 10, 102, 102, 213, 34, 20, 43],
|
||||
[117, 20, 15, 36, 163, 128, 68, 1, 26],
|
||||
],[
|
||||
[102, 61, 71, 37, 34, 53, 31, 243, 192],
|
||||
[69, 60, 71, 38, 73, 119, 28, 222, 37],
|
||||
[68, 45, 128, 34, 1, 47, 11, 245, 171],
|
||||
[62, 17, 19, 70, 146, 85, 55, 62, 70],
|
||||
[37, 43, 37, 154, 100, 163, 85, 160, 1],
|
||||
[63, 9, 92, 136, 28, 64, 32, 201, 85],
|
||||
[75, 15, 9, 9, 64, 255, 184, 119, 16],
|
||||
[86, 6, 28, 5, 64, 255, 25, 248, 1],
|
||||
[56, 8, 17, 132, 137, 255, 55, 116, 128],
|
||||
[58, 15, 20, 82, 135, 57, 26, 121, 40],
|
||||
],[
|
||||
[164, 50, 31, 137, 154, 133, 25, 35, 218],
|
||||
[51, 103, 44, 131, 131, 123, 31, 6, 158],
|
||||
[86, 40, 64, 135, 148, 224, 45, 183, 128],
|
||||
[22, 26, 17, 131, 240, 154, 14, 1, 209],
|
||||
[45, 16, 21, 91, 64, 222, 7, 1, 197],
|
||||
[56, 21, 39, 155, 60, 138, 23, 102, 213],
|
||||
[83, 12, 13, 54, 192, 255, 68, 47, 28],
|
||||
[85, 26, 85, 85, 128, 128, 32, 146, 171],
|
||||
[18, 11, 7, 63, 144, 171, 4, 4, 246],
|
||||
[35, 27, 10, 146, 174, 171, 12, 26, 128],
|
||||
],[
|
||||
[190, 80, 35, 99, 180, 80, 126, 54, 45],
|
||||
[85, 126, 47, 87, 176, 51, 41, 20, 32],
|
||||
[101, 75, 128, 139, 118, 146, 116, 128, 85],
|
||||
[56, 41, 15, 176, 236, 85, 37, 9, 62],
|
||||
[71, 30, 17, 119, 118, 255, 17, 18, 138],
|
||||
[101, 38, 60, 138, 55, 70, 43, 26, 142],
|
||||
[146, 36, 19, 30, 171, 255, 97, 27, 20],
|
||||
[138, 45, 61, 62, 219, 1, 81, 188, 64],
|
||||
[32, 41, 20, 117, 151, 142, 20, 21, 163],
|
||||
[112, 19, 12, 61, 195, 128, 48, 4, 24],
|
||||
]]
|
||||
|
||||
// RFC 6386 Section 13.4. Token Probability Updates.
|
||||
//
|
||||
// 1056 is (4 planes, 8 bands, 3 contexts, 11 tokens) flattened.
|
||||
|
||||
@@ -0,0 +1,252 @@
|
||||
// Copyright 2026 The Wuffs Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||
|
||||
pri func decoder.decode_macroblocks!(workbuf: slice base.u8) base.status {
|
||||
var mby : base.u32
|
||||
var mbx : base.u32
|
||||
|
||||
mbx = 0
|
||||
while mbx < this.mbw {
|
||||
assert mbx < 0x400 via "a < b: a < c; c <= b"(c: this.mbw)
|
||||
|
||||
this.mb_top_modes[mbx][0] = 0
|
||||
this.mb_top_modes[mbx][1] = 0
|
||||
this.mb_top_modes[mbx][2] = 0
|
||||
this.mb_top_modes[mbx][3] = 0
|
||||
|
||||
mbx += 1
|
||||
}
|
||||
|
||||
mby = 0
|
||||
while mby < this.mbh {
|
||||
assert mby < 0x400 via "a < b: a < c; c <= b"(c: this.mbh)
|
||||
|
||||
this.mb_left_modes[0] = 0
|
||||
this.mb_left_modes[1] = 0
|
||||
this.mb_left_modes[2] = 0
|
||||
this.mb_left_modes[3] = 0
|
||||
|
||||
mbx = 0
|
||||
while mbx < this.mbw,
|
||||
inv mby < 0x400,
|
||||
{
|
||||
assert mbx < 0x400 via "a < b: a < c; c <= b"(c: this.mbw)
|
||||
|
||||
this.decode_one_macroblock!(workbuf: args.workbuf, mbx: mbx, mby: mby)
|
||||
|
||||
mbx += 1
|
||||
}
|
||||
|
||||
mby += 1
|
||||
}
|
||||
return ok
|
||||
}
|
||||
|
||||
pri func decoder.decode_one_macroblock!(workbuf: slice base.u8, mbx: base.u32[..= 0x3FF], mby: base.u32[..= 0x3FF]) {
|
||||
var v1 : base.u32[..= 1]
|
||||
|
||||
var seg : base.u32[..= 3]
|
||||
var skip : base.bool
|
||||
var luma_mode : base.u32[..= 4]
|
||||
var chroma_mode : base.u32[..= 3]
|
||||
|
||||
seg = 0
|
||||
if this.seg_update_map {
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: this.seg_probs[0] as base.u32)
|
||||
if v1 == 0 {
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: this.seg_probs[1] as base.u32)
|
||||
seg = v1
|
||||
} else {
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: this.seg_probs[2] as base.u32)
|
||||
seg = v1 + 2
|
||||
}
|
||||
}
|
||||
|
||||
skip = false
|
||||
if (this.prob_skip & 0x100) <> 0 {
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: this.prob_skip & 0xFF)
|
||||
skip = v1 <> 0
|
||||
}
|
||||
|
||||
luma_mode = this.decode_luma_mode!(workbuf: args.workbuf)
|
||||
this.decode_subblock_modes!(workbuf: args.workbuf, mbx: args.mbx, luma_mode: luma_mode)
|
||||
|
||||
chroma_mode = this.decode_chroma_mode!(workbuf: args.workbuf)
|
||||
|
||||
if skip {
|
||||
// TODO.
|
||||
} else {
|
||||
}
|
||||
}
|
||||
|
||||
// RFC 6386 Section 11.2. Luma Modes.
|
||||
//
|
||||
// 0 = B_DC_PRED = predict DC using row above and column to the left.
|
||||
// 1 = B_TM_PRED = propagate second differences a la "True Motion".
|
||||
// 2 = B_VE_PRED = predict rows using row above.
|
||||
// 3 = B_HE_PRED = predict columns using column to the left.
|
||||
// 4 = B_PRED = each Y subblock is independently predicted.
|
||||
//
|
||||
// The RFC gives an enum in (DC_PRED, V_PRED, H_PRED, TM_PRED, B_PRED) order
|
||||
// but the libwebp implementation uses a different one, (B_DC_PRED, B_TM_PRED,
|
||||
// B_VE_PRED, B_HE_PRED, B_PRED). Modulo the B_ prefixes, it's DC,V,H,TM versus
|
||||
// DC,TM,VE,HE. At some point, the internal enum values were re-assigned after
|
||||
// the RFC was written.
|
||||
//
|
||||
// libwebp also uses B_PRED=10 instead of the RFC's B_PRED=4. We use 4.
|
||||
pri func decoder.decode_luma_mode!(workbuf: slice base.u8) base.u32[..= 4] {
|
||||
var v1 : base.u32[..= 1]
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 145)
|
||||
if v1 == 0 {
|
||||
return 4 // 4=B_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 156)
|
||||
if v1 == 0 {
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 163)
|
||||
return 2 * v1 // 0=B_DC_PRED or 2=B_VE_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 128)
|
||||
return 3 - (2 * v1) // 3=B_HE_PRED or 1=B_TM_PRED.
|
||||
}
|
||||
|
||||
// RFC 6386 Section 11.4. Chroma Modes.
|
||||
//
|
||||
// 0 = B_DC_PRED, etc, the same as the Luma Modes, except there's no B_PRED.
|
||||
pri func decoder.decode_chroma_mode!(workbuf: slice base.u8) base.u32[..= 3] {
|
||||
var v1 : base.u32[..= 1]
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 142)
|
||||
if v1 == 0 {
|
||||
return 0 // 0=B_DC_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 114)
|
||||
if v1 == 0 {
|
||||
return 2 // 2=B_VE_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: 183)
|
||||
return 3 - (2 * v1) // 3=B_HE_PRED or 1=B_TM_PRED.
|
||||
}
|
||||
|
||||
// RFC 6386 Section 11.2. Luma Modes.
|
||||
pri func decoder.decode_subblock_modes!(
|
||||
workbuf: slice base.u8,
|
||||
mbx: base.u32[..= 0x3FF],
|
||||
luma_mode: base.u32[..= 4]) {
|
||||
var i : base.u32
|
||||
var top_mode : base.u8[..= 9]
|
||||
var left_mode : base.u8[..= 9]
|
||||
var mode : base.u8[..= 9]
|
||||
|
||||
if args.luma_mode < 4 {
|
||||
this.mb_top_modes[args.mbx][0] = mode
|
||||
this.mb_top_modes[args.mbx][1] = mode
|
||||
this.mb_top_modes[args.mbx][2] = mode
|
||||
this.mb_top_modes[args.mbx][3] = mode
|
||||
this.mb_left_modes[0] = mode
|
||||
this.mb_left_modes[1] = mode
|
||||
this.mb_left_modes[2] = mode
|
||||
this.mb_left_modes[3] = mode
|
||||
return nothing
|
||||
}
|
||||
|
||||
i = 0
|
||||
while i < 16 {
|
||||
if i < 4 {
|
||||
top_mode = this.mb_top_modes[args.mbx][i]
|
||||
} else {
|
||||
top_mode = this.mb_subblock_modes[i - 4]
|
||||
}
|
||||
|
||||
if (i & 3) == 0 {
|
||||
left_mode = this.mb_left_modes[i >> 2]
|
||||
} else {
|
||||
left_mode = this.mb_subblock_modes[(i ~mod+ 15) & 15]
|
||||
}
|
||||
|
||||
mode = this.decode_one_subblock_mode!(workbuf: args.workbuf, top_mode: top_mode, left_mode: left_mode)
|
||||
this.mb_subblock_modes[i] = mode
|
||||
|
||||
i += 1
|
||||
}
|
||||
|
||||
this.mb_top_modes[args.mbx][0] = this.mb_subblock_modes[0xC]
|
||||
this.mb_top_modes[args.mbx][1] = this.mb_subblock_modes[0xD]
|
||||
this.mb_top_modes[args.mbx][2] = this.mb_subblock_modes[0xE]
|
||||
this.mb_top_modes[args.mbx][3] = this.mb_subblock_modes[0xF]
|
||||
this.mb_left_modes[0] = this.mb_subblock_modes[0x3]
|
||||
this.mb_left_modes[1] = this.mb_subblock_modes[0x7]
|
||||
this.mb_left_modes[2] = this.mb_subblock_modes[0xB]
|
||||
this.mb_left_modes[3] = this.mb_subblock_modes[0xF]
|
||||
}
|
||||
|
||||
// RFC 6386 Section 11.3. Subblock Mode Contexts.
|
||||
pri func decoder.decode_one_subblock_mode!(
|
||||
workbuf: slice base.u8,
|
||||
top_mode: base.u8[..= 9],
|
||||
left_mode: base.u8[..= 9]) base.u8[..= 9] {
|
||||
var v1 : base.u32[..= 1]
|
||||
var tm : base.u8[..= 9]
|
||||
var lm : base.u8[..= 9]
|
||||
|
||||
tm = args.top_mode
|
||||
lm = args.left_mode
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][0] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 0 // 0=B_DC_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][1] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 1 // 1=B_TM_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][2] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 2 // 2=B_VE_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][3] as base.u32)
|
||||
if v1 == 0 {
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][4] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 3 // 3=B_HE_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][5] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 4 // 4=B_RD_PRED.
|
||||
}
|
||||
|
||||
return 5 // 5=B_VR_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][6] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 6 // 6=B_LD_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][7] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 7 // 7=B_VL_PRED.
|
||||
}
|
||||
|
||||
v1 = this.read_bit!(workbuf: args.workbuf, part: 0, prob: SUBBLOCK_MODE_PROBS[tm][lm][8] as base.u32)
|
||||
if v1 == 0 {
|
||||
return 8 // 8=B_HD_PRED.
|
||||
}
|
||||
|
||||
return 9 // 9=B_HU_PRED.
|
||||
}
|
||||
@@ -92,6 +92,10 @@ pub struct decoder? implements base.image_decoder(
|
||||
// hold in the 0x100 bit) and prob_skip_false (in the low 8 bits).
|
||||
prob_skip : base.u32[..= 0x1FF],
|
||||
|
||||
mb_subblock_modes : array[16] base.u8[..= 9],
|
||||
mb_left_modes : array[4] base.u8[..= 9],
|
||||
mb_top_modes : array[0x400] array[4] base.u8[..= 9],
|
||||
|
||||
dst_x : base.u32,
|
||||
dst_y : base.u32,
|
||||
|
||||
@@ -294,6 +298,11 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade
|
||||
return status
|
||||
}
|
||||
|
||||
status = this.decode_macroblocks!(workbuf: args.workbuf)
|
||||
if not status.is_ok() {
|
||||
return status
|
||||
}
|
||||
|
||||
this.dst_x = 0
|
||||
this.dst_y = 0
|
||||
|
||||
|
||||
Reference in new issue
Block a user