From cda384afaafc3c598ca2b7f71e2316b2986c3e62 Mon Sep 17 00:00:00 2001 From: Ahmet Inan Date: Thu, 26 Feb 2015 16:53:55 +0100 Subject: [PATCH] reverted to old lower maximum absolute deviation for estimator noise makes sync pulse shorter, so we end up in another mode for a short time .. using a lower max avoids the jumpiness. --- app/src/main/rs/initialization.rsh | 8 ++------ app/src/main/rs/scanline_estimator.rsh | 6 +++--- app/src/main/rs/state.rsh | 3 +-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/main/rs/initialization.rsh b/app/src/main/rs/initialization.rsh index f2bbc82..60b0868 100644 --- a/app/src/main/rs/initialization.rsh +++ b/app/src/main/rs/initialization.rsh @@ -68,12 +68,8 @@ void initialize(float rate, int length, int iw, int ih, int sw, int sh, int sgw, pd240_scanline_length = round((pd240_scanline_ms * sample_rate) / 1000.0f); pd290_scanline_length = round((pd290_scanline_ms * sample_rate) / 1000.0f); - const float pairwise_minimum_of_scanline_time_distances_5ms = 0.219648f; - const float pairwise_minimum_of_scanline_time_distances_9ms = 0.022308f; - const float pairwise_minimum_of_scanline_time_distances_20ms = 0.050176f; - maximum_abs_dev_5ms = 0.5f * pairwise_minimum_of_scanline_time_distances_5ms * sample_rate; - maximum_abs_dev_9ms = 0.5f * pairwise_minimum_of_scanline_time_distances_9ms * sample_rate; - maximum_abs_dev_20ms = 0.5f * pairwise_minimum_of_scanline_time_distances_20ms * sample_rate; + const float pairwise_minimum_of_scanline_time_distances = 0.0079825f; + maximum_absolute_deviaton = 0.5f * pairwise_minimum_of_scanline_time_distances * sample_rate; maximum_variance = pown(0.0005f * sample_rate, 2); const float vis_seconds = 0.3f; diff --git a/app/src/main/rs/scanline_estimator.rsh b/app/src/main/rs/scanline_estimator.rsh index 66e81d7..3fdc92d 100644 --- a/app/src/main/rs/scanline_estimator.rsh +++ b/app/src/main/rs/scanline_estimator.rsh @@ -69,7 +69,7 @@ static int scanline_estimator(int sync_level) ) ); - if (min_adev > maximum_abs_dev_20ms) + if (min_adev > maximum_absolute_deviaton) return -1; else if (min_adev == pd50_adev) return mode_pd50; @@ -109,7 +109,7 @@ static int scanline_estimator(int sync_level) scottieDX_adev ); - if (min_adev > maximum_abs_dev_9ms) + if (min_adev > maximum_absolute_deviaton) return -1; else if (min_adev == robot36_adev) return mode_robot36; @@ -140,7 +140,7 @@ static int scanline_estimator(int sync_level) wraaseSC2_180_adev ); - if (min_adev > maximum_abs_dev_5ms) + if (min_adev > maximum_absolute_deviaton) return -1; else if (min_adev == martin1_adev) return mode_martin1; diff --git a/app/src/main/rs/state.rsh b/app/src/main/rs/state.rsh index 2fbb090..bac29ae 100644 --- a/app/src/main/rs/state.rsh +++ b/app/src/main/rs/state.rsh @@ -26,8 +26,7 @@ static int debug_mode; static int current_decoder; static int user_blur, blur_power, free_running; static int sample_rate, sync_pos, prev_sync_pos; -static int maximum_variance; -static int maximum_abs_dev_5ms, maximum_abs_dev_9ms, maximum_abs_dev_20ms; +static int maximum_variance, maximum_absolute_deviaton; static int minimum_sync_length; static int min_sync_length_5ms, min_sync_length_9ms, min_sync_length_20ms; static int scanline_length, minimum_length, maximum_length;