vsview-nativeres 0.3.2__tar.gz → 0.3.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/PKG-INFO +1 -1
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/components.py +20 -1
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/main.py +124 -58
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/settings.py +5 -3
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/.gitignore +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/LICENSE +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/README.md +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/pyproject.toml +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/__init__.py +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/plotting.py +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/py.typed +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.4}/src/vsview_nativeres/utils.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: vsview-nativeres
|
|
3
|
-
Version: 0.3.
|
|
3
|
+
Version: 0.3.4
|
|
4
4
|
Summary: A vsview plugin for analyzing and determining the native resolution of video content
|
|
5
5
|
Project-URL: Documentation, https://github.com/Jaded-Encoding-Thaumaturgy/nativeres/blob/master/src/plugin/README.md
|
|
6
6
|
Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/nativeres/tree/master/src/plugin
|
|
@@ -1,6 +1,17 @@
|
|
|
1
|
+
from jetpytools import CustomNotImplementedError
|
|
1
2
|
from PySide6.QtCore import QSize
|
|
2
3
|
from PySide6.QtGui import Qt
|
|
3
|
-
from PySide6.QtWidgets import
|
|
4
|
+
from PySide6.QtWidgets import (
|
|
5
|
+
QLabel,
|
|
6
|
+
QLayout,
|
|
7
|
+
QListWidget,
|
|
8
|
+
QProgressBar,
|
|
9
|
+
QScrollArea,
|
|
10
|
+
QSpinBox,
|
|
11
|
+
QStackedWidget,
|
|
12
|
+
QVBoxLayout,
|
|
13
|
+
QWidget,
|
|
14
|
+
)
|
|
4
15
|
from vsview.api import run_in_loop
|
|
5
16
|
|
|
6
17
|
|
|
@@ -78,3 +89,11 @@ class ProgressBar(QProgressBar):
|
|
|
78
89
|
def reset_progress(self) -> None:
|
|
79
90
|
self.reset()
|
|
80
91
|
self.setFormat("%p%")
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
class RangeSpinStack(QStackedWidget):
|
|
95
|
+
@property
|
|
96
|
+
def current(self) -> QSpinBox:
|
|
97
|
+
if isinstance(w := self.currentWidget(), QSpinBox):
|
|
98
|
+
return w
|
|
99
|
+
raise CustomNotImplementedError
|
|
@@ -59,7 +59,7 @@ from nativeres.funcs import (
|
|
|
59
59
|
resolve_kernel,
|
|
60
60
|
)
|
|
61
61
|
|
|
62
|
-
from .components import GetNativeImportList, ProgressBar, TabContainer
|
|
62
|
+
from .components import GetNativeImportList, ProgressBar, RangeSpinStack, TabContainer
|
|
63
63
|
from .settings import GlobalSettings, LocalSettings
|
|
64
64
|
from .utils import get_edge_detect_classes, warmup_plots
|
|
65
65
|
|
|
@@ -122,14 +122,35 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
122
122
|
|
|
123
123
|
controls.addLayout(dimension_base_parity, 1)
|
|
124
124
|
|
|
125
|
-
self.
|
|
126
|
-
self.
|
|
127
|
-
self.
|
|
128
|
-
self.
|
|
129
|
-
self.
|
|
130
|
-
self.
|
|
125
|
+
self.range_min_stack = RangeSpinStack(self.controls_section)
|
|
126
|
+
self.range_max_stack = RangeSpinStack(self.controls_section)
|
|
127
|
+
self.range_min_spin_h = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
128
|
+
self.range_max_spin_h = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
129
|
+
self.range_min_spin_w = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
130
|
+
self.range_max_spin_w = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
131
|
+
self.range_min_spin_h.setToolTip("Lowest candidate dimension to test.")
|
|
132
|
+
self.range_max_spin_h.setToolTip("Highest candidate dimension to test.")
|
|
133
|
+
self.range_min_spin_w.setToolTip("Lowest candidate dimension to test.")
|
|
134
|
+
self.range_max_spin_w.setToolTip("Highest candidate dimension to test.")
|
|
135
|
+
self.range_min_spin_h.valueChanged.connect(self.on_range_min_h_changed)
|
|
136
|
+
self.range_max_spin_h.valueChanged.connect(self.on_range_max_h_changed)
|
|
137
|
+
self.range_min_spin_w.valueChanged.connect(self.on_range_min_w_changed)
|
|
138
|
+
self.range_max_spin_w.valueChanged.connect(self.on_range_max_w_changed)
|
|
139
|
+
|
|
140
|
+
self.range_min_stack.addWidget(self.range_min_spin_h)
|
|
141
|
+
self.range_min_stack.addWidget(self.range_min_spin_w)
|
|
142
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_h)
|
|
143
|
+
|
|
144
|
+
self.range_max_stack.addWidget(self.range_max_spin_h)
|
|
145
|
+
self.range_max_stack.addWidget(self.range_max_spin_w)
|
|
146
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_h)
|
|
147
|
+
|
|
131
148
|
range_layout = self.make_vgroup(
|
|
132
|
-
"Range",
|
|
149
|
+
"Range",
|
|
150
|
+
self.range_min_stack,
|
|
151
|
+
self.range_max_stack,
|
|
152
|
+
parent=self.controls_section,
|
|
153
|
+
stretch=False,
|
|
133
154
|
)
|
|
134
155
|
|
|
135
156
|
self.step_spin = QDoubleSpinBox(
|
|
@@ -163,7 +184,7 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
163
184
|
|
|
164
185
|
self.kernels_metrics_layout = QVBoxLayout()
|
|
165
186
|
self.kernels_metrics_layout.addLayout(kernels_layout)
|
|
166
|
-
self.kernels_metrics_layout.addSpacing(self.
|
|
187
|
+
self.kernels_metrics_layout.addSpacing(self.range_max_stack.height() + 4)
|
|
167
188
|
self.kernels_metrics_layout.addLayout(metrics_layout)
|
|
168
189
|
self.kernels_metrics_layout.addStretch()
|
|
169
190
|
|
|
@@ -234,17 +255,23 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
234
255
|
def _set_default_values(self) -> None:
|
|
235
256
|
self.dimension.index = 1
|
|
236
257
|
self.base_parity.index = 1
|
|
237
|
-
self.
|
|
258
|
+
self._update_dimension_stack(1)
|
|
238
259
|
self._last_base_parity = 1
|
|
239
260
|
with (
|
|
240
|
-
QSignalBlocker(self.
|
|
241
|
-
QSignalBlocker(self.
|
|
261
|
+
QSignalBlocker(self.range_min_stack),
|
|
262
|
+
QSignalBlocker(self.range_max_stack),
|
|
263
|
+
QSignalBlocker(self.range_min_spin_h),
|
|
264
|
+
QSignalBlocker(self.range_max_spin_h),
|
|
265
|
+
QSignalBlocker(self.range_min_spin_w),
|
|
266
|
+
QSignalBlocker(self.range_max_spin_w),
|
|
242
267
|
QSignalBlocker(self.step_spin),
|
|
243
268
|
QSignalBlocker(self.kernels_cb),
|
|
244
269
|
QSignalBlocker(self.metrics_cb),
|
|
245
270
|
):
|
|
246
|
-
self.
|
|
247
|
-
self.
|
|
271
|
+
self.range_min_spin_h.setValue(int(self.api.current_voutput.vs_output.clip.height * LOW_RATE))
|
|
272
|
+
self.range_max_spin_h.setValue(int(self.api.current_voutput.vs_output.clip.height * HIGH_RATE))
|
|
273
|
+
self.range_min_spin_w.setValue(int(self.api.current_voutput.vs_output.clip.width * LOW_RATE))
|
|
274
|
+
self.range_max_spin_w.setValue(int(self.api.current_voutput.vs_output.clip.width * HIGH_RATE))
|
|
248
275
|
self.step_spin.setValue(fallback(self.settings.local_.getnative.last_step, 1.0))
|
|
249
276
|
for k in self.settings.global_.kernels:
|
|
250
277
|
self.kernels_cb.addItem(k.pretty_string, k)
|
|
@@ -256,23 +283,30 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
256
283
|
def _set_saved_values(self) -> None:
|
|
257
284
|
with (
|
|
258
285
|
QSignalBlocker(self.dimension),
|
|
259
|
-
QSignalBlocker(self.
|
|
260
|
-
QSignalBlocker(self.
|
|
286
|
+
QSignalBlocker(self.range_min_spin_h),
|
|
287
|
+
QSignalBlocker(self.range_max_spin_h),
|
|
288
|
+
QSignalBlocker(self.range_min_spin_w),
|
|
289
|
+
QSignalBlocker(self.range_max_spin_w),
|
|
261
290
|
QSignalBlocker(self.step_spin),
|
|
262
291
|
QSignalBlocker(self.kernels_cb),
|
|
263
292
|
QSignalBlocker(self.metrics_cb),
|
|
264
293
|
):
|
|
265
294
|
if (d := self.settings.local_.getnative.last_dimension) is not None:
|
|
266
295
|
self.dimension.index = d
|
|
296
|
+
self._update_dimension_stack(d)
|
|
267
297
|
|
|
268
298
|
if (d := self.settings.local_.getnative.last_base_parity) is not None:
|
|
269
299
|
self.base_parity.index = d
|
|
270
300
|
|
|
271
|
-
if (range_min := self.settings.local_.getnative.
|
|
272
|
-
self.
|
|
301
|
+
if (range_min := self.settings.local_.getnative.last_min_h_range) is not None:
|
|
302
|
+
self.range_min_spin_h.setValue(range_min)
|
|
303
|
+
if (range_max := self.settings.local_.getnative.last_max_h_range) is not None:
|
|
304
|
+
self.range_max_spin_h.setValue(range_max)
|
|
273
305
|
|
|
274
|
-
if (
|
|
275
|
-
self.
|
|
306
|
+
if (range_min := self.settings.local_.getnative.last_min_w_range) is not None:
|
|
307
|
+
self.range_min_spin_w.setValue(range_min)
|
|
308
|
+
if (range_max := self.settings.local_.getnative.last_max_w_range) is not None:
|
|
309
|
+
self.range_max_spin_w.setValue(range_max)
|
|
276
310
|
|
|
277
311
|
if (step := self.settings.local_.getnative.last_step) is not None:
|
|
278
312
|
self.step_spin.setValue(step)
|
|
@@ -288,8 +322,10 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
288
322
|
def snapshot_ui_values(self) -> None:
|
|
289
323
|
self.settings.local_.getnative.last_dimension = self.dimension.index
|
|
290
324
|
self.settings.local_.getnative.last_base_parity = self.base_parity.index
|
|
291
|
-
self.settings.local_.getnative.
|
|
292
|
-
self.settings.local_.getnative.
|
|
325
|
+
self.settings.local_.getnative.last_max_h_range = self.range_max_spin_h.value()
|
|
326
|
+
self.settings.local_.getnative.last_min_h_range = self.range_min_spin_h.value()
|
|
327
|
+
self.settings.local_.getnative.last_max_w_range = self.range_max_spin_w.value()
|
|
328
|
+
self.settings.local_.getnative.last_min_w_range = self.range_min_spin_w.value()
|
|
293
329
|
self.settings.local_.getnative.last_step = self.step_spin.value()
|
|
294
330
|
self.settings.local_.getnative.last_kernel = resolve_kernel(self.kernels_cb.currentText())
|
|
295
331
|
self.settings.local_.getnative.last_metric = self.metrics_cb.currentText()
|
|
@@ -314,47 +350,60 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
314
350
|
return clip.height if self.dimension.index == 1 else clip.width
|
|
315
351
|
|
|
316
352
|
def update_limits(self) -> None:
|
|
317
|
-
|
|
353
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
354
|
+
with (
|
|
355
|
+
QSignalBlocker(self.range_min_spin_h),
|
|
356
|
+
QSignalBlocker(self.range_max_spin_h),
|
|
357
|
+
QSignalBlocker(self.range_min_spin_w),
|
|
358
|
+
QSignalBlocker(self.range_max_spin_w),
|
|
359
|
+
):
|
|
360
|
+
self.range_min_spin_h.setRange(1, clip.height - 1)
|
|
361
|
+
self.range_max_spin_h.setRange(2, clip.height)
|
|
362
|
+
self.range_min_spin_w.setRange(1, clip.width - 1)
|
|
363
|
+
self.range_max_spin_w.setRange(2, clip.width)
|
|
318
364
|
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
self.range_min_spin.setMaximum(max_dim - 1)
|
|
322
|
-
self.range_max_spin.setMaximum(max_dim)
|
|
365
|
+
self.range_max_spin_h.setMinimum(self.range_min_spin_h.value() + 1)
|
|
366
|
+
self.range_min_spin_h.setMaximum(self.range_max_spin_h.value() - 1)
|
|
323
367
|
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
cur_max = self.range_max_spin.value()
|
|
368
|
+
self.range_max_spin_w.setMinimum(self.range_min_spin_w.value() + 1)
|
|
369
|
+
self.range_min_spin_w.setMaximum(self.range_max_spin_w.value() - 1)
|
|
327
370
|
|
|
328
|
-
|
|
329
|
-
|
|
371
|
+
def on_range_min_h_changed(self, value: int) -> None:
|
|
372
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
373
|
+
w_val = get_w(value, clip, 1)
|
|
374
|
+
self.range_max_spin_h.setMinimum(value + 1)
|
|
375
|
+
with QSignalBlocker(self.range_min_spin_w), QSignalBlocker(self.range_max_spin_w):
|
|
376
|
+
self.range_min_spin_w.setValue(w_val)
|
|
377
|
+
self.range_max_spin_w.setMinimum(w_val + 1)
|
|
330
378
|
|
|
331
|
-
def
|
|
332
|
-
self.
|
|
379
|
+
def on_range_max_h_changed(self, value: int) -> None:
|
|
380
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
381
|
+
w_val = get_w(value, clip, 1)
|
|
382
|
+
self.range_min_spin_h.setMaximum(value - 1)
|
|
383
|
+
with QSignalBlocker(self.range_min_spin_w), QSignalBlocker(self.range_max_spin_w):
|
|
384
|
+
self.range_max_spin_w.setValue(w_val)
|
|
385
|
+
self.range_min_spin_w.setMaximum(w_val - 1)
|
|
333
386
|
|
|
334
|
-
def
|
|
335
|
-
|
|
387
|
+
def on_range_min_w_changed(self, value: int) -> None:
|
|
388
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
389
|
+
h_val = get_h(value, clip, 1)
|
|
390
|
+
self.range_max_spin_w.setMinimum(value + 1)
|
|
391
|
+
with QSignalBlocker(self.range_min_spin_h), QSignalBlocker(self.range_max_spin_h):
|
|
392
|
+
self.range_min_spin_h.setValue(h_val)
|
|
393
|
+
self.range_max_spin_h.setMinimum(h_val + 1)
|
|
394
|
+
|
|
395
|
+
def on_range_max_w_changed(self, value: int) -> None:
|
|
396
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
397
|
+
h_val = get_h(value, clip, 1)
|
|
398
|
+
self.range_min_spin_w.setMaximum(value - 1)
|
|
399
|
+
with QSignalBlocker(self.range_min_spin_h), QSignalBlocker(self.range_max_spin_h):
|
|
400
|
+
self.range_max_spin_h.setValue(h_val)
|
|
401
|
+
self.range_min_spin_h.setMaximum(h_val - 1)
|
|
336
402
|
|
|
337
403
|
def on_dimension_segment_changed(self, index: int) -> None:
|
|
338
404
|
if self._last_dimension == index:
|
|
339
405
|
return
|
|
340
|
-
|
|
341
|
-
clip = self.api.current_voutput.vs_output.clip
|
|
342
|
-
self._last_dimension = index
|
|
343
|
-
|
|
344
|
-
match self.dimension.index:
|
|
345
|
-
case 1:
|
|
346
|
-
func = get_h
|
|
347
|
-
case 0:
|
|
348
|
-
func = get_w
|
|
349
|
-
case _:
|
|
350
|
-
raise ValueError("Invalid dimension")
|
|
351
|
-
|
|
352
|
-
with QSignalBlocker(self.range_min_spin), QSignalBlocker(self.range_max_spin):
|
|
353
|
-
v_min = self.range_min_spin.value()
|
|
354
|
-
v_max = self.range_max_spin.value()
|
|
355
|
-
self.update_limits()
|
|
356
|
-
self.range_min_spin.setValue(func(v_min, clip, 1))
|
|
357
|
-
self.range_max_spin.setValue(func(v_max, clip, 1))
|
|
406
|
+
self._update_dimension_stack(index)
|
|
358
407
|
|
|
359
408
|
def on_base_parity_segment_changed(self, index: int) -> None:
|
|
360
409
|
self._last_base_parity = index
|
|
@@ -364,8 +413,8 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
364
413
|
|
|
365
414
|
clip = self.api.current_voutput.vs_output.clip
|
|
366
415
|
|
|
367
|
-
start = self.
|
|
368
|
-
stop = self.
|
|
416
|
+
start = self.range_min_stack.current.value()
|
|
417
|
+
stop = self.range_max_stack.current.value()
|
|
369
418
|
step_f = self.step_spin.value()
|
|
370
419
|
|
|
371
420
|
if step_f.is_integer():
|
|
@@ -432,6 +481,7 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
432
481
|
)
|
|
433
482
|
|
|
434
483
|
def on_done(_: Any) -> None:
|
|
484
|
+
self.progress_container.hide()
|
|
435
485
|
self.progress_bar.reset_progress()
|
|
436
486
|
self.calculate_btn.setEnabled(True)
|
|
437
487
|
|
|
@@ -447,13 +497,16 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
447
497
|
|
|
448
498
|
self.computedPlotAdded.emit(plot)
|
|
449
499
|
|
|
500
|
+
def on_fail(e: BaseException) -> None:
|
|
501
|
+
logger.exception("Failed to get native results", exc_info=e)
|
|
502
|
+
e.__traceback__ = None
|
|
503
|
+
|
|
450
504
|
blocker = self.api.blocker()
|
|
451
505
|
blocker.acquire()
|
|
452
506
|
(
|
|
453
507
|
get_results()
|
|
454
508
|
.add_loop_callback(on_done)
|
|
455
|
-
.
|
|
456
|
-
.catch(lambda e: logger.exception("Failed to get native results", exc_info=e))
|
|
509
|
+
.then(on_success, on_fail, on_loop=True)
|
|
457
510
|
.add_done_callback(lambda _: blocker.release())
|
|
458
511
|
)
|
|
459
512
|
|
|
@@ -541,6 +594,19 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
541
594
|
data = list(reader)
|
|
542
595
|
return dim_mode, [float(row[0]) for row in data], [float(row[1]) for row in data]
|
|
543
596
|
|
|
597
|
+
def _update_dimension_stack(self, index: int) -> None:
|
|
598
|
+
self._last_dimension = index
|
|
599
|
+
|
|
600
|
+
match index:
|
|
601
|
+
case 1:
|
|
602
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_h)
|
|
603
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_h)
|
|
604
|
+
case 0:
|
|
605
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_w)
|
|
606
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_w)
|
|
607
|
+
case _:
|
|
608
|
+
raise ValueError("Invalid dimension")
|
|
609
|
+
|
|
544
610
|
|
|
545
611
|
class GetScalerTab(TabContainer):
|
|
546
612
|
def __init__(
|
|
@@ -40,7 +40,7 @@ class KernelListEditWidget(ListEditWidget[str]):
|
|
|
40
40
|
self.adapter.validate_python(text)
|
|
41
41
|
resolve_kernel(text, ValidationError)
|
|
42
42
|
self.list_widget.addItem(text)
|
|
43
|
-
except Exception as e:
|
|
43
|
+
except Exception as e: # noqa: BLE001
|
|
44
44
|
logger.error("Invalid value: %s", e)
|
|
45
45
|
|
|
46
46
|
|
|
@@ -142,8 +142,10 @@ class GetNativeLocalSettings(BaseModel):
|
|
|
142
142
|
|
|
143
143
|
last_dimension: int | None = None
|
|
144
144
|
last_base_parity: int | None = None
|
|
145
|
-
|
|
146
|
-
|
|
145
|
+
last_min_h_range: int | None = None
|
|
146
|
+
last_max_h_range: int | None = None
|
|
147
|
+
last_min_w_range: int | None = None
|
|
148
|
+
last_max_w_range: int | None = None
|
|
147
149
|
last_step: float | None = None
|
|
148
150
|
last_kernel: PydanticKernel | None = None
|
|
149
151
|
last_metric: str | None = None
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|