@@ -916,14 +916,12 @@ impl Av1anContext {
916
916
|| self . args . video_params . clone ( ) ,
917
917
|ovr| ovr. video_params . clone ( ) ,
918
918
) ,
919
- passes : overrides. as_ref ( ) . map_or (
920
- self . args . passes ,
921
- |ovr| ovr. passes ,
922
- ) ,
923
- encoder : overrides. as_ref ( ) . map_or (
924
- self . args . encoder . clone ( ) ,
925
- |ovr| ovr. encoder . clone ( ) ,
926
- ) ,
919
+ passes : overrides
920
+ . as_ref ( )
921
+ . map_or ( self . args . passes , |ovr| ovr. passes ) ,
922
+ encoder : overrides
923
+ . as_ref ( )
924
+ . map_or ( self . args . encoder . clone ( ) , |ovr| ovr. encoder . clone ( ) ) ,
927
925
noise_size : self . args . photon_noise_size ,
928
926
tq_cq : None ,
929
927
ignore_frame_mismatch : self . args . ignore_frame_mismatch ,
@@ -978,14 +976,14 @@ impl Av1anContext {
978
976
|| self . args . video_params . clone ( ) ,
979
977
|ovr| ovr. video_params . clone ( ) ,
980
978
) ,
981
- passes : scene. zone_overrides . as_ref ( ) . map_or (
982
- self . args . passes ,
983
- |ovr| ovr . passes ,
984
- ) ,
985
- encoder : scene. zone_overrides . as_ref ( ) . map_or (
986
- self . args . encoder . clone ( ) ,
987
- |ovr| ovr . encoder . clone ( ) ,
988
- ) ,
979
+ passes : scene
980
+ . zone_overrides
981
+ . as_ref ( )
982
+ . map_or ( self . args . passes , |ovr| ovr . passes ) ,
983
+ encoder : scene
984
+ . zone_overrides
985
+ . as_ref ( )
986
+ . map_or ( self . args . encoder . clone ( ) , |ovr| ovr . encoder . clone ( ) ) ,
989
987
noise_size : self . args . photon_noise_size ,
990
988
tq_cq : None ,
991
989
ignore_frame_mismatch : self . args . ignore_frame_mismatch ,
@@ -1187,14 +1185,12 @@ impl Av1anContext {
1187
1185
|| self . args . video_params . clone ( ) ,
1188
1186
|ovr| ovr. video_params . clone ( ) ,
1189
1187
) ,
1190
- passes : overrides. as_ref ( ) . map_or (
1191
- self . args . passes ,
1192
- |ovr| ovr. passes ,
1193
- ) ,
1194
- encoder : overrides. as_ref ( ) . map_or (
1195
- self . args . encoder . clone ( ) ,
1196
- |ovr| ovr. encoder . clone ( ) ,
1197
- ) ,
1188
+ passes : overrides
1189
+ . as_ref ( )
1190
+ . map_or ( self . args . passes , |ovr| ovr. passes ) ,
1191
+ encoder : overrides
1192
+ . as_ref ( )
1193
+ . map_or ( self . args . encoder . clone ( ) , |ovr| ovr. encoder . clone ( ) ) ,
1198
1194
noise_size : self . args . photon_noise_size ,
1199
1195
tq_cq : None ,
1200
1196
ignore_frame_mismatch : self . args . ignore_frame_mismatch ,
0 commit comments