From 18f8c0a1b8a4e0581082add29c5063381e33b6a5 Mon Sep 17 00:00:00 2001
From: Zen <46526140+master-of-zen@users.noreply.github.com>
Date: Fri, 24 Jul 2020 00:09:09 +0300
Subject: [PATCH] bar fix for vvc + limit frames to ecnode == source

---
 Av1an/bar.py     | 3 +++
 Av1an/compose.py | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Av1an/bar.py b/Av1an/bar.py
index 3e17659..431ab43 100755
--- a/Av1an/bar.py
+++ b/Av1an/bar.py
@@ -102,6 +102,9 @@ def process_encoding_pipe(pipe, encoder, counter):
 
         if encoder in ('vvc'):
             match = match_vvc(line)
+            if match:
+                counter.update(1)
+                continue
 
         if match:
             new = int(match.group(1))
diff --git a/Av1an/compose.py b/Av1an/compose.py
index 1637ad1..91169f4 100755
--- a/Av1an/compose.py
+++ b/Av1an/compose.py
@@ -7,6 +7,7 @@ from pathlib import Path
 from .vvc import to_yuv
 from .utils import terminate
 from .logger import log
+from .ffmpeg import frame_probe
 
 
 def compose_aomsplit_first_pass_command(video_path: Path, stat_file, ffmpeg_pipe, video_params):
@@ -187,7 +188,7 @@ def vvc_encode(inputs, params, vvc_conf):
     """Experimental support for VVC encoder
     """
     commands = [
-        (f' vvc_encoder -c {vvc_conf} -i {x[0].with_suffix(".yuv").as_posix()} {params} -f 99999 --InputBitDepth=8 --OutputBitDepth=8 -b {x[1].with_suffix(".h266")}',
+        (f' vvc_encoder -c {vvc_conf} -i {x[0].with_suffix(".yuv").as_posix()} {params} -f {frame_probe(x[0])} --InputBitDepth=8 --OutputBitDepth=8 -b {x[1].with_suffix(".h266")}',
         (x[0], x[1].with_suffix(".h266")))
         for x in inputs
         ]