Skip to content
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

Jump to bottom

bin: Bring --photon-noise out from under unstable feature #3017

Merged
merged 1 commit into from
Sep 13, 2022
Merged

bin: Bring --photon-noise out from under unstable feature #3017

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
7 changes: 2 additions & 5 deletions src/bin/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ pub struct CliOptions {
pub still_picture: bool,
/// Uses grain synthesis to add photon noise to the resulting encode.
/// Takes a strength value 0-64.
#[cfg(feature = "unstable")]
#[clap(
long,
conflicts_with = "film-grain-table",
Expand Down Expand Up @@ -332,10 +331,9 @@ pub struct ParsedCliOptions {
pub pass1file_name: Option<PathBuf>,
pub pass2file_name: Option<PathBuf>,
pub save_config: Option<PathBuf>,
pub photon_noise: u8,
#[cfg(feature = "unstable")]
pub slots: usize,
#[cfg(feature = "unstable")]
pub generate_grain_strength: u8,
}

#[cfg(feature = "serialize")]
Expand Down Expand Up @@ -480,10 +478,9 @@ pub fn parse_cli() -> Result<ParsedCliOptions, CliError> {
pass1file_name: matches.first_pass.clone(),
pass2file_name: matches.second_pass.clone(),
save_config: save_config_path,
photon_noise: matches.photon_noise,
#[cfg(feature = "unstable")]
slots,
#[cfg(feature = "unstable")]
generate_grain_strength: matches.photon_noise,
})
}

Expand Down
5 changes: 2 additions & 3 deletions src/bin/rav1e-ch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,12 @@ fn run() -> Result<(), error::CliError> {
cli.enc.time_base = video_info.time_base;
}

#[cfg(feature = "unstable")]
if cli.generate_grain_strength > 0 && cli.enc.film_grain_params.is_none() {
if cli.photon_noise > 0 && cli.enc.film_grain_params.is_none() {
cli.enc.film_grain_params = Some(vec![generate_photon_noise_params(
0,
u64::MAX,
NoiseGenArgs {
iso_setting: cli.generate_grain_strength as u32 * 100,
iso_setting: cli.photon_noise as u32 * 100,
width: video_info.width as u32,
height: video_info.height as u32,
transfer_function: if cli.enc.is_hdr() {
Expand Down
5 changes: 2 additions & 3 deletions src/bin/rav1e.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,13 +456,12 @@ fn run() -> Result<(), error::CliError> {
cli.enc.time_base = video_info.time_base;
}

#[cfg(feature = "unstable")]
if cli.generate_grain_strength > 0 && cli.enc.film_grain_params.is_none() {
if cli.photon_noise > 0 && cli.enc.film_grain_params.is_none() {
cli.enc.film_grain_params = Some(vec![generate_photon_noise_params(
0,
u64::MAX,
NoiseGenArgs {
iso_setting: cli.generate_grain_strength as u32 * 100,
iso_setting: cli.photon_noise as u32 * 100,
width: video_info.width as u32,
height: video_info.height as u32,
transfer_function: if cli.enc.is_hdr() {
Expand Down