diff options
| author | qinxialei <xialeiqin@gmail.com> | 2021-04-22 11:20:18 +0800 |
|---|---|---|
| committer | qinxialei <xialeiqin@gmail.com> | 2021-04-22 11:20:18 +0800 |
| commit | 81ce37eb93e8ce442ecb1855a4e7166628128ac7 (patch) | |
| tree | 2af6329f74f88ce090d08c61db5fb4bed8656584 /src/tile/bitstream/palette.cc | |
| parent | 4dab0c756a3cdd65b43470a4cca835422b32ca6e (diff) | |
| parent | 2381d803c76105f44717d75f089ec37f51e5cfe4 (diff) | |
| download | libgav1-81ce37eb93e8ce442ecb1855a4e7166628128ac7.tar.gz libgav1-81ce37eb93e8ce442ecb1855a4e7166628128ac7.tar.bz2 libgav1-81ce37eb93e8ce442ecb1855a4e7166628128ac7.zip | |
Update upstream source from tag 'upstream/0.16.3'
Update to upstream version '0.16.3'
with Debian dir a433e04a69210eb8fcdd6089240e161eb33f0590
Diffstat (limited to 'src/tile/bitstream/palette.cc')
| -rw-r--r-- | src/tile/bitstream/palette.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tile/bitstream/palette.cc b/src/tile/bitstream/palette.cc index 674d210..41b42d6 100644 --- a/src/tile/bitstream/palette.cc +++ b/src/tile/bitstream/palette.cc @@ -130,10 +130,10 @@ void Tile::ReadPaletteColors(const Block& block, Plane plane) { void Tile::ReadPaletteModeInfo(const Block& block) { BlockParameters& bp = *block.bp; + bp.palette_mode_info.size[kPlaneTypeY] = 0; + bp.palette_mode_info.size[kPlaneTypeUV] = 0; if (IsBlockSmallerThan8x8(block.size) || block.size > kBlock64x64 || !frame_header_.allow_screen_content_tools) { - bp.palette_mode_info.size[kPlaneTypeY] = 0; - bp.palette_mode_info.size[kPlaneTypeUV] = 0; return; } const int block_size_context = @@ -156,7 +156,7 @@ void Tile::ReadPaletteModeInfo(const Block& block) { ReadPaletteColors(block, kPlaneY); } } - if (bp.uv_mode == kPredictionModeDc && block.HasChroma()) { + if (block.HasChroma() && bp.uv_mode == kPredictionModeDc) { const int context = static_cast<int>(bp.palette_mode_info.size[kPlaneTypeY] > 0); const bool has_palette_uv = |