no Forecasts!

robotastic · May 7, 2023 · eca65e5 · eca65e5
1 parent 19d31e3
commit eca65e5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/lib/op25_repeater/lib/fsk4_demod_ff_impl.cc b/lib/op25_repeater/lib/fsk4_demod_ff_impl.cc
@@ -215,14 +215,14 @@ namespace gr {
       std::fill(&d_history[0], &d_history[NTAPS], 0.0);
       std::fill(&d_history[0], &d_history[NTAPS], 0.0);
     }
-
+/*
     void
     fsk4_demod_ff_impl::forecast (int noutput_items, gr_vector_int &ninput_items_required)
     {
       const int nof_samples_reqd = static_cast<int>(ceil(d_block_rate * noutput_items));
       std::fill(ninput_items_required.begin(), ninput_items_required.end(), nof_samples_reqd);
     }
-
+*/
     int
     fsk4_demod_ff_impl::general_work (int noutput_items,
                        gr_vector_int &ninput_items,

diff --git a/lib/op25_repeater/lib/fsk4_demod_ff_impl.h b/lib/op25_repeater/lib/fsk4_demod_ff_impl.h
@@ -60,7 +60,7 @@ namespace gr {
       ~fsk4_demod_ff_impl();
 
       // Where all the action really happens
-      void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+      //void forecast (int noutput_items, gr_vector_int &ninput_items_required);
       void reset();
       int general_work(int noutput_items,
 		       gr_vector_int &ninput_items,

diff --git a/lib/op25_repeater/lib/gardner_cc_impl.cc b/lib/op25_repeater/lib/gardner_cc_impl.cc
@@ -120,15 +120,15 @@ gardner_cc_impl::set_omega (float omega)
         fprintf(stderr, "gardner_cc: warning omega %f size %d exceeds NUM_COMPLEX %d\n", omega, num_complex, NUM_COMPLEX);
     *d_dl = gr_complex(0,0); //memset(d_dl, 0, NUM_COMPLEX * sizeof(gr_complex));
 }
-
+/*
 void
 gardner_cc_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 {
     unsigned ninputs = ninput_items_required.size();
     for (unsigned i=0; i < ninputs; i++)
         ninput_items_required[i] =
     (int) ceil((noutput_items * d_omega) + d_interp->ntaps());
-}
+}*/
 
 int
 gardner_cc_impl::general_work (int noutput_items,

diff --git a/lib/op25_repeater/lib/gardner_cc_impl.h b/lib/op25_repeater/lib/gardner_cc_impl.h
@@ -77,7 +77,7 @@ class gardner_cc_impl : public gardner_cc
         ~gardner_cc_impl();
 
         // Where all the action really happens
-        void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+        //void forecast (int noutput_items, gr_vector_int &ninput_items_required);
 
         int general_work(int noutput_items,
                          gr_vector_int &ninput_items,

diff --git a/lib/op25_repeater/lib/vocoder_impl.cc b/lib/op25_repeater/lib/vocoder_impl.cc
@@ -87,9 +87,6 @@ namespace gr {
     {
     }
 
-void
-vocoder_impl::forecast(int nof_output_items, gr_vector_int &nof_input_items_reqd)
-{
    /* When encoding, this block consumes 8000 symbols/s and produces 4800
     * samples/s. That's a sampling rate of 5/3 or 1.66667.
     *
@@ -99,9 +96,14 @@ vocoder_impl::forecast(int nof_output_items, gr_vector_int &nof_input_items_reqd
     *
     * Thanks to Matt Mills for catching a bug where this value wasn't set correctly
     */
+/*
+void
+vocoder_impl::forecast(int nof_output_items, gr_vector_int &nof_input_items_reqd)
+{
+
    const int nof_samples_reqd = (opt_encode_flag) ? (1.66667 * nof_output_items) : (0.2 * nof_output_items);
    std::fill(nof_input_items_reqd.begin(), nof_input_items_reqd.end(), nof_samples_reqd);
-}
+}*/
 
 int 
 vocoder_impl::general_work_decode (int noutput_items,

diff --git a/lib/op25_repeater/lib/vocoder_impl.h b/lib/op25_repeater/lib/vocoder_impl.h
@@ -45,7 +45,7 @@ namespace gr {
       vocoder_impl(bool encode_flag, bool verbose_flag, int stretch_amt, char* udp_host, int udp_port, bool raw_vectors_flag);
       ~vocoder_impl();
 
-      void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+      //void forecast (int noutput_items, gr_vector_int &ninput_items_required);
       void set_gain_adjust(float gain_adjust);
 
       int general_work(int noutput_items,