@@ -436,10 +436,12 @@ impl EncodeArgs {
436
436
let encoded_frames = num_frames ( chunk. output ( ) . as_ref ( ) ) ;
437
437
438
438
let err_str = match encoded_frames {
439
- Ok ( encoded_frames) if !ignore_frame_mismatch && ( encoded_frames != chunk. frames ) => Some ( format ! (
440
- "FRAME MISMATCH: chunk {}: {}/{} (actual/expected frames)" ,
441
- chunk. index, encoded_frames, chunk. frames
442
- ) ) ,
439
+ Ok ( encoded_frames) if !ignore_frame_mismatch && ( encoded_frames != chunk. frames ) => {
440
+ Some ( format ! (
441
+ "FRAME MISMATCH: chunk {}: {}/{} (actual/expected frames)" ,
442
+ chunk. index, encoded_frames, chunk. frames
443
+ ) )
444
+ }
443
445
Err ( error) => Some ( format ! (
444
446
"FAILED TO COUNT FRAMES: chunk {}: {}" ,
445
447
chunk. index, error
@@ -560,9 +562,13 @@ properly into a mkv file. Specify mkvmerge as the concatenation method by settin
560
562
}
561
563
562
564
if self . vmaf_res == "inputres" {
563
- let inputres = self . input . resolution ( ) ?. clone ( ) ;
565
+ let inputres = self . input . resolution ( ) ?;
564
566
self . vmaf_res . clear ( ) ;
565
- self . vmaf_res . push_str ( & format ! ( "{}x{}" , & inputres. 0 . to_string( ) , & inputres. 1 . to_string( ) ) ) ;
567
+ self . vmaf_res . push_str ( & format ! (
568
+ "{}x{}" ,
569
+ & inputres. 0 . to_string( ) ,
570
+ & inputres. 1 . to_string( )
571
+ ) ) ;
566
572
self . vmaf_res . to_string ( ) ;
567
573
}
568
574
@@ -1323,7 +1329,12 @@ properly into a mkv file. Specify mkvmerge as the concatenation method by settin
1323
1329
let audio_size_ref = Arc :: clone ( & audio_size_bytes) ;
1324
1330
let ( tx, rx) = mpsc:: channel ( ) ;
1325
1331
let handle = s. spawn ( |_| {
1326
- broker. encoding_loop ( tx, self . set_thread_affinity , audio_size_ref, self . ignore_frame_mismatch ) ;
1332
+ broker. encoding_loop (
1333
+ tx,
1334
+ self . set_thread_affinity ,
1335
+ audio_size_ref,
1336
+ self . ignore_frame_mismatch ,
1337
+ ) ;
1327
1338
} ) ;
1328
1339
1329
1340
// Queue::encoding_loop only sends a message if there was an error (meaning a chunk crashed)
0 commit comments