diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-22 07:06:38 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-22 07:06:38 -0700 |
| commit | 96ef95cce42498b2d92348e1f3361198f856e1fd (patch) | |
| tree | 1088a5f3447ce61f0ba909a6680bd7c10f668a10 /gr-atsc | |
| parent | 5c18208b751bedf820d6445dd10ccba21cd35fed (diff) | |
| parent | fa940255f7126e773d8cc9ff7c2749a562f8e192 (diff) | |
Merge remote-tracking branch 'argilo/atscfixes2'
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/include/gnuradio/atsc/field_sync_mux.h | 11 | ||||
| -rw-r--r-- | gr-atsc/lib/atsc_field_sync_mux.cc | 18 |
2 files changed, 17 insertions, 12 deletions
diff --git a/gr-atsc/include/gnuradio/atsc/field_sync_mux.h b/gr-atsc/include/gnuradio/atsc/field_sync_mux.h index dbf08c5132..2cccb52aec 100644 --- a/gr-atsc/include/gnuradio/atsc/field_sync_mux.h +++ b/gr-atsc/include/gnuradio/atsc/field_sync_mux.h @@ -38,7 +38,7 @@ ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux(); * * input: atsc_data_segment; output: atsc_data_segment */ -class ATSC_API atsc_field_sync_mux : public gr::sync_block +class ATSC_API atsc_field_sync_mux : public gr::block { friend ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux(); @@ -46,17 +46,20 @@ class ATSC_API atsc_field_sync_mux : public gr::sync_block public: void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int work (int noutput_items, + int general_work (int noutput_items, + gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); static const int N_SAVED_SYMBOLS = 12; - void reset() { /* nop */ } + void reset() + { + d_already_output_field_sync = false; + } protected: - gr_uint64 d_current_index; bool d_already_output_field_sync; unsigned char d_saved_symbols[N_SAVED_SYMBOLS]; }; diff --git a/gr-atsc/lib/atsc_field_sync_mux.cc b/gr-atsc/lib/atsc_field_sync_mux.cc index 5520a74877..6b0586dbfc 100644 --- a/gr-atsc/lib/atsc_field_sync_mux.cc +++ b/gr-atsc/lib/atsc_field_sync_mux.cc @@ -37,7 +37,7 @@ atsc_make_field_sync_mux() } atsc_field_sync_mux::atsc_field_sync_mux() - : gr::sync_block("atsc_field_sync_mux", + : gr::block("atsc_field_sync_mux", gr::io_signature::make(1, 1, sizeof(atsc_data_segment)), gr::io_signature::make(1, 1, sizeof(atsc_data_segment))) { @@ -148,21 +148,24 @@ atsc_field_sync_mux::forecast (int noutput_items, gr_vector_int &ninput_items_re { unsigned ninputs = ninput_items_required.size(); for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = fixed_rate_noutput_to_ninput (noutput_items); + ninput_items_required[i] = noutput_items; } int -atsc_field_sync_mux::work (int noutput_items, +atsc_field_sync_mux::general_work (int noutput_items, + gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { + int in_length = ninput_items[0]; const atsc_data_segment *in = (const atsc_data_segment *) input_items[0]; atsc_data_segment *out = (atsc_data_segment *) output_items[0]; - unsigned int index = 0; - for (int outdex = 0; outdex < noutput_items; outdex++){ + int index = 0; + int outdex = 0; + for (outdex = 0; outdex < noutput_items && index < in_length; outdex++){ assert (in[index].pli.regular_seg_p ()); @@ -197,7 +200,6 @@ atsc_field_sync_mux::work (int noutput_items, } } - d_current_index += index; - - return noutput_items; + this->consume_each(index); + return outdex; } |