mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-11-08 14:09:58 +00:00
vp9: Make some member functions internally linked
These helper functions don't directly modify any member state and can be hidden from view.
This commit is contained in:
parent
7dcf4c0018
commit
f8543249f0
2 changed files with 54 additions and 58 deletions
|
@ -197,6 +197,60 @@ constexpr std::array<s32, 254> map_lut{
|
||||||
230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 18, 242, 243, 244, 245, 246, 247,
|
230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 18, 242, 243, 244, 245, 246, 247,
|
||||||
248, 249, 250, 251, 252, 253, 19,
|
248, 249, 250, 251, 252, 253, 19,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 6.2.14 Tile size calculation
|
||||||
|
|
||||||
|
s32 CalcMinLog2TileCols(s32 frame_width) {
|
||||||
|
const s32 sb64_cols = (frame_width + 63) / 64;
|
||||||
|
s32 min_log2 = 0;
|
||||||
|
|
||||||
|
while ((64 << min_log2) < sb64_cols) {
|
||||||
|
min_log2++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return min_log2;
|
||||||
|
}
|
||||||
|
|
||||||
|
s32 CalcMaxLog2TileCols(s32 frame_width) {
|
||||||
|
const s32 sb64_cols = (frame_width + 63) / 64;
|
||||||
|
s32 max_log2 = 1;
|
||||||
|
|
||||||
|
while ((sb64_cols >> max_log2) >= 4) {
|
||||||
|
max_log2++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return max_log2 - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Recenters probability. Based on section 6.3.6 of VP9 Specification
|
||||||
|
s32 RecenterNonNeg(s32 new_prob, s32 old_prob) {
|
||||||
|
if (new_prob > old_prob * 2) {
|
||||||
|
return new_prob;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (new_prob >= old_prob) {
|
||||||
|
return (new_prob - old_prob) * 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (old_prob - new_prob) * 2 - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Adjusts old_prob depending on new_prob. Based on section 6.3.5 of VP9 Specification
|
||||||
|
s32 RemapProbability(s32 new_prob, s32 old_prob) {
|
||||||
|
new_prob--;
|
||||||
|
old_prob--;
|
||||||
|
|
||||||
|
std::size_t index{};
|
||||||
|
|
||||||
|
if (old_prob * 2 <= 0xff) {
|
||||||
|
index = static_cast<std::size_t>(std::max(0, RecenterNonNeg(new_prob, old_prob) - 1));
|
||||||
|
} else {
|
||||||
|
index = static_cast<std::size_t>(
|
||||||
|
std::max(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
return map_lut[index];
|
||||||
|
}
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
VP9::VP9(GPU& gpu) : gpu(gpu) {}
|
VP9::VP9(GPU& gpu) : gpu(gpu) {}
|
||||||
|
@ -236,32 +290,6 @@ void VP9::WriteProbabilityDelta(VpxRangeEncoder& writer, u8 new_prob, u8 old_pro
|
||||||
EncodeTermSubExp(writer, delta);
|
EncodeTermSubExp(writer, delta);
|
||||||
}
|
}
|
||||||
|
|
||||||
s32 VP9::RemapProbability(s32 new_prob, s32 old_prob) {
|
|
||||||
new_prob--;
|
|
||||||
old_prob--;
|
|
||||||
|
|
||||||
std::size_t index{};
|
|
||||||
|
|
||||||
if (old_prob * 2 <= 0xff) {
|
|
||||||
index = static_cast<std::size_t>(std::max(0, RecenterNonNeg(new_prob, old_prob) - 1));
|
|
||||||
} else {
|
|
||||||
index = static_cast<std::size_t>(
|
|
||||||
std::max(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
return map_lut[index];
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 VP9::RecenterNonNeg(s32 new_prob, s32 old_prob) {
|
|
||||||
if (new_prob > old_prob * 2) {
|
|
||||||
return new_prob;
|
|
||||||
} else if (new_prob >= old_prob) {
|
|
||||||
return (new_prob - old_prob) * 2;
|
|
||||||
} else {
|
|
||||||
return (old_prob - new_prob) * 2 - 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void VP9::EncodeTermSubExp(VpxRangeEncoder& writer, s32 value) {
|
void VP9::EncodeTermSubExp(VpxRangeEncoder& writer, s32 value) {
|
||||||
if (WriteLessThan(writer, value, 16)) {
|
if (WriteLessThan(writer, value, 16)) {
|
||||||
writer.Write(value, 4);
|
writer.Write(value, 4);
|
||||||
|
@ -361,28 +389,6 @@ void VP9::WriteMvProbabilityUpdate(VpxRangeEncoder& writer, u8 new_prob, u8 old_
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
s32 VP9::CalcMinLog2TileCols(s32 frame_width) {
|
|
||||||
const s32 sb64_cols = (frame_width + 63) / 64;
|
|
||||||
s32 min_log2 = 0;
|
|
||||||
|
|
||||||
while ((64 << min_log2) < sb64_cols) {
|
|
||||||
min_log2++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return min_log2;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 VP9::CalcMaxLog2TileCols(s32 frameWidth) {
|
|
||||||
const s32 sb64_cols = (frameWidth + 63) / 64;
|
|
||||||
s32 max_log2 = 1;
|
|
||||||
|
|
||||||
while ((sb64_cols >> max_log2) >= 4) {
|
|
||||||
max_log2++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return max_log2 - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
Vp9PictureInfo VP9::GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state) {
|
Vp9PictureInfo VP9::GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state) {
|
||||||
PictureInfo picture_info{};
|
PictureInfo picture_info{};
|
||||||
gpu.MemoryManager().ReadBlock(state.picture_info_offset, &picture_info, sizeof(PictureInfo));
|
gpu.MemoryManager().ReadBlock(state.picture_info_offset, &picture_info, sizeof(PictureInfo));
|
||||||
|
|
|
@ -121,12 +121,6 @@ private:
|
||||||
/// Generates compressed header probability deltas in the bitstream writer
|
/// Generates compressed header probability deltas in the bitstream writer
|
||||||
void WriteProbabilityDelta(VpxRangeEncoder& writer, u8 new_prob, u8 old_prob);
|
void WriteProbabilityDelta(VpxRangeEncoder& writer, u8 new_prob, u8 old_prob);
|
||||||
|
|
||||||
/// Adjusts old_prob depending on new_prob. Based on section 6.3.5 of VP9 Specification
|
|
||||||
s32 RemapProbability(s32 new_prob, s32 old_prob);
|
|
||||||
|
|
||||||
/// Recenters probability. Based on section 6.3.6 of VP9 Specification
|
|
||||||
s32 RecenterNonNeg(s32 new_prob, s32 old_prob);
|
|
||||||
|
|
||||||
/// Inverse of 6.3.4 Decode term subexp
|
/// Inverse of 6.3.4 Decode term subexp
|
||||||
void EncodeTermSubExp(VpxRangeEncoder& writer, s32 value);
|
void EncodeTermSubExp(VpxRangeEncoder& writer, s32 value);
|
||||||
|
|
||||||
|
@ -146,10 +140,6 @@ private:
|
||||||
/// Write motion vector probability updates. 6.3.17 in the spec
|
/// Write motion vector probability updates. 6.3.17 in the spec
|
||||||
void WriteMvProbabilityUpdate(VpxRangeEncoder& writer, u8 new_prob, u8 old_prob);
|
void WriteMvProbabilityUpdate(VpxRangeEncoder& writer, u8 new_prob, u8 old_prob);
|
||||||
|
|
||||||
/// 6.2.14 Tile size calculation
|
|
||||||
s32 CalcMinLog2TileCols(s32 frame_width);
|
|
||||||
s32 CalcMaxLog2TileCols(s32 frame_width);
|
|
||||||
|
|
||||||
/// Returns VP9 information from NVDEC provided offset and size
|
/// Returns VP9 information from NVDEC provided offset and size
|
||||||
Vp9PictureInfo GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state);
|
Vp9PictureInfo GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue