diff --git a/cpp_rework/driver.h b/cpp_rework/driver.h
index c11af08..0447dd5 100644
--- a/cpp_rework/driver.h
+++ b/cpp_rework/driver.h
@@ -50,9 +50,10 @@ void driver_difference(const string& workspace,
auto frame_2 = make_shared(frame_2_path);
auto frame_2_compressed = make_shared(frame_2_path, quality_setting, workspace);
- FadeFrame fade = FadeFrame(evaluation_library,*frame_1, *frame_2, *frame_2_compressed, block_size);
- fade.run();
- fade.write(fade_file);
+ // FadeFrame fade = FadeFrame(evaluation_library,*frame_1, *frame_2, *frame_2_compressed, block_size);
+ // fade.run();
+ //fade.write(fade_file);
+ FadeFrame::write_empty_file(fade_file);
search_library->set_images(frame_1, frame_2);
PredictiveFrame predict = PredictiveFrame(evaluation_library, search_library,
diff --git a/cpp_rework/main.cpp b/cpp_rework/main.cpp
index cdb6969..577bdcc 100644
--- a/cpp_rework/main.cpp
+++ b/cpp_rework/main.cpp
@@ -68,6 +68,9 @@ int main(int argc, char **argv) {
evaluator_arg = argv[5];
quality_setting = atoi(argv[6]);
}
+ // Reset log file now that args have been properly parsed.
+ c.parseFromText("*GLOBAL:\n Filename = " + workspace + dandere2x_utilities::separator() + "dandere2x_cpp.log");
+ el::Loggers::reconfigureAllLoggers(c);
LOG(INFO) << "Dandere2xCPP 2021 v0.1";
LOG(INFO) << "evaluator_arg: " << evaluator_arg << endl;
@@ -75,10 +78,7 @@ int main(int argc, char **argv) {
LOG(INFO) << "workspace: " << workspace << endl;
LOG(INFO) << "frame_count: " << frame_count << endl;
LOG(INFO) << "block_size: " << block_size << endl;
-
- // Reset log file now that args have been properly parsed.
- c.parseFromText("*GLOBAL:\n Filename = " + workspace + dandere2x_utilities::separator() + "dandere2x_cpp.log");
- el::Loggers::reconfigureAllLoggers(c);
+ LOG(INFO) << "quality setting: " << quality_setting << endl;
// Start the main driver after having loaded the arguments
AbstractBlockMatch *matcher = get_block_matcher(block_matching_arg);
diff --git a/cpp_rework/plugins/frade_frame/FadeFrame.h b/cpp_rework/plugins/frade_frame/FadeFrame.h
index c359926..5eb8fbf 100644
--- a/cpp_rework/plugins/frade_frame/FadeFrame.h
+++ b/cpp_rework/plugins/frade_frame/FadeFrame.h
@@ -16,7 +16,7 @@
using namespace std;
-class FadeFrame : AbstractPlugin {
+class FadeFrame : public AbstractPlugin {
public:
FadeFrame(AbstractEvaluator *eval,
Frame ¤t_frame,
diff --git a/cpp_rework/plugins/predictive_frame/PredictiveFrame.cpp b/cpp_rework/plugins/predictive_frame/PredictiveFrame.cpp
index 3e670dc..ebc5b12 100644
--- a/cpp_rework/plugins/predictive_frame/PredictiveFrame.cpp
+++ b/cpp_rework/plugins/predictive_frame/PredictiveFrame.cpp
@@ -50,25 +50,25 @@ void PredictiveFrame::parallel_function_call(int x, int y) {
return;
}
- // Find (x,y) in frame_2 in frame_1. Note we have to go in the reverse. We can't go frame_1 -> frame_2 since
- // the matched blocks may not be on perfect intervals of block_size.
- // Since we're going frame_2 -> frame_1, the matched block is "being matched in reverse", so flip the block
- // so we can go frame_1 -> frame_2.
- Block matched_block = this->block_matcher->match_block(x, y, block_size);
- matched_block.reverse_block();
-
- // Check to see if the current matched block produces a valid match
- if (eval->evaluate(this->current_frame,
- this->next_frame, this->next_frame_compressed,
- matched_block,
- block_size)) {
-
- matched_moving_blocks += 1;
- this->matched_blocks[x][y] = make_shared(matched_block.x_start, matched_block.y_start,
- matched_block.x_end, matched_block.y_end,
- 1);
- return;
- }
+// // Find (x,y) in frame_2 in frame_1. Note we have to go in the reverse. We can't go frame_1 -> frame_2 since
+// // the matched blocks may not be on perfect intervals of block_size.
+// // Since we're going frame_2 -> frame_1, the matched block is "being matched in reverse", so flip the block
+// // so we can go frame_1 -> frame_2.
+// Block matched_block = this->block_matcher->match_block(x, y, block_size);
+// matched_block.reverse_block();
+//
+// // Check to see if the current matched block produces a valid match
+// if (eval->evaluate(this->current_frame,
+// this->next_frame, this->next_frame_compressed,
+// matched_block,
+// block_size)) {
+//
+// matched_moving_blocks += 1;
+// this->matched_blocks[x][y] = make_shared(matched_block.x_start, matched_block.y_start,
+// matched_block.x_end, matched_block.y_end,
+// 1);
+// return;
+// }
// -1 denotes an invalid block.
this->matched_blocks[x][y] = make_shared(x, y,
diff --git a/src/gui/Dandere2xGUI.py b/src/gui/Dandere2xGUI.py
index 7b4624f..f2192e7 100644
--- a/src/gui/Dandere2xGUI.py
+++ b/src/gui/Dandere2xGUI.py
@@ -713,6 +713,7 @@ class Ui_Dandere2xGUI(object):
self.image_quality_box.addItem("")
self.image_quality_box.addItem("")
self.image_quality_box.addItem("")
+ self.image_quality_box.addItem("")
self.video_label_5 = QtWidgets.QLabel(self.centralwidget)
self.video_label_5.setGeometry(QtCore.QRect(490, 140, 131, 21))
palette = QtGui.QPalette()
@@ -1366,6 +1367,7 @@ class Ui_Dandere2xGUI(object):
self.image_quality_box.setItemText(2, _translate("Dandere2xGUI", "97"))
self.image_quality_box.setItemText(3, _translate("Dandere2xGUI", "98"))
self.image_quality_box.setItemText(4, _translate("Dandere2xGUI", "99"))
+ self.image_quality_box.setItemText(5, _translate("Dandere2xGUI", "100"))
self.video_label_5.setText(_translate("Dandere2xGUI", "Image Quality"))
self.video_label_6.setToolTip(_translate("Dandere2xGUI", "Block size Dandere2x will use to compute blocks. You NEED to select a video first before\n"
" selecting this.,\n"
diff --git a/src/gui/Dandere2xGui.ui b/src/gui/Dandere2xGui.ui
index 0eb4f25..6a51515 100644
--- a/src/gui/Dandere2xGui.ui
+++ b/src/gui/Dandere2xGui.ui
@@ -2135,6 +2135,11 @@
99
+ -
+
+ 100
+
+