Fix encoding with multiple encoders (master-of-zen#910)

* read passes and encoder from zone overrides
* run cargo fmt
* remove clone calls

Author: SwareJonge

av1an-core/src/context.rs

@@ -910,8 +910,12 @@ impl Av1anContext {
         || self.args.video_params.clone(),
         |ovr| ovr.video_params.clone(),
       ),
-      passes: self.args.passes,
-      encoder: self.args.encoder,
+      passes: overrides
+        .as_ref()
+        .map_or(self.args.passes, |ovr| ovr.passes),
+      encoder: overrides
+        .as_ref()
+        .map_or(self.args.encoder, |ovr| ovr.encoder),
       noise_size: self.args.photon_noise_size,
       tq_cq: None,
       ignore_frame_mismatch: self.args.ignore_frame_mismatch,
@@ -966,8 +970,14 @@ impl Av1anContext {
         || self.args.video_params.clone(),
         |ovr| ovr.video_params.clone(),
       ),
-      passes: self.args.passes,
-      encoder: self.args.encoder,
+      passes: scene
+        .zone_overrides
+        .as_ref()
+        .map_or(self.args.passes, |ovr| ovr.passes),
+      encoder: scene
+        .zone_overrides
+        .as_ref()
+        .map_or(self.args.encoder, |ovr| ovr.encoder),
       noise_size: self.args.photon_noise_size,
       tq_cq: None,
       ignore_frame_mismatch: self.args.ignore_frame_mismatch,
@@ -1168,8 +1178,12 @@ impl Av1anContext {
         || self.args.video_params.clone(),
         |ovr| ovr.video_params.clone(),
       ),
-      passes: self.args.passes,
-      encoder: self.args.encoder,
+      passes: overrides
+        .as_ref()
+        .map_or(self.args.passes, |ovr| ovr.passes),
+      encoder: overrides
+        .as_ref()
+        .map_or(self.args.encoder, |ovr| ovr.encoder),
       noise_size: self.args.photon_noise_size,
       tq_cq: None,
       ignore_frame_mismatch: self.args.ignore_frame_mismatch,