Skip to content

Fix an LRF crash when encoding tiny frames #1797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rzumer merged 1 commit into from
Oct 25, 2019
Merged

Fix an LRF crash when encoding tiny frames #1797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/encoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@ impl Sequence {
tier[i] = 0;
}

// Restoration filters are not useful for very small frame sizes,
// so disable them in that case.
let enable_restoration_filters = config.width >= 32 && config.height >= 32;

Sequence {
profile,
num_bits_width: width_bits,
Expand Down Expand Up @@ -220,8 +224,10 @@ impl Sequence {
enable_warped_motion: false,
enable_superres: false,
enable_cdef: config.speed_settings.cdef
&& config.chroma_sampling != ChromaSampling::Cs422,
enable_restoration: config.chroma_sampling != ChromaSampling::Cs422,
&& config.chroma_sampling != ChromaSampling::Cs422
&& enable_restoration_filters,
enable_restoration: config.chroma_sampling != ChromaSampling::Cs422
&& enable_restoration_filters,
enable_large_lru: true,
operating_points_cnt_minus_1: 0,
operating_point_idc,
Expand Down
5 changes: 5 additions & 0 deletions src/lrf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,11 @@ impl RestorationState {
let (lrf_y_shift, lrf_uv_shift) = if fi.sequence.enable_large_lru
&& fi.sequence.enable_restoration
{
assert!(
fi.width > 1 && fi.height > 1,
"Width and height must be higher than 1 for LRF setup"
);

// Specific content does affect optimal LRU size choice, but the
// quantizer in use is a surprisingly strong selector.
let lrf_base_shift = if fi.base_q_idx > 200 {
Expand Down