Will a 2.x block consume an input stream if it returns 0 output items?
All the other atsc blocks are at least passing data and reporting
various states, but fsd = atsc.field_sync_demux() seems to be hung up.
An upstream block connected to fsd, when also connected to a file sink
only produces 28672 (7 * 4096) in the file. fsd, as copied from
gr 0.9 does not produce output untill a field sync is detected.
It is searching thru data, but it looks like it's just going
thru the input_tags[ii] array off to infinity, i.e,
cerr << "atsc_field_sync_demux: searching for sync at "
<< inputs0_index + ii << endl;
just counts up.
File attached.
Also I'm now using the 0.9 atsc_tx to create test data (20Msps shorts
centered at 5.75MHz), instead of "off the air".
--Chuck
/* -*- c++ -*- */
/*
* Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <cmath>
#include <atsc_field_sync_demux.h>
#include <gr_io_signature.h>
#include <atsc_types.h>
#include <atsc_consts.h>
#include <atsci_syminfo.h>
#include <stdio.h>
#include <assert.h>
#include <iostream.h>
using std::abs;
static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation factor
atsc_field_sync_demux_sptr
atsc_make_field_sync_demux()
{
return atsc_field_sync_demux_sptr(new atsc_field_sync_demux());
}
atsc_field_sync_demux::atsc_field_sync_demux()
: gr_sync_decimator("atsc_field_sync_demux",
gr_make_io_signature(2, 2, sizeof(float)),
gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment)),DEC),
d_locked(false), d_in_field2(true), d_segment_number(0),
d_next_input(0), d_lost_index(0)
{
reset();
}
inline static bool
tag_is_seg_sync_or_field_sync (atsc::syminfo tag)
{
return tag.symbol_num == 0 && tag.valid;
}
void
atsc_field_sync_demux::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] = noutput_items * DEC + 2 * DEC - 1;
inputs0_index = d_next_input;
inputs0_size = noutput_items * DEC + 2 * DEC - 1;
}
int
atsc_field_sync_demux::work (int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
float *in = (float *) input_items[0];
atsc::syminfo *input_tags = (atsc::syminfo *) input_items[1];
atsc_soft_data_segment *out = (atsc_soft_data_segment *) output_items[0];
assert(sizeof(float) == sizeof(atsc::syminfo));
int ii = 0; // input index
// Are we in sync?
if (!tag_is_seg_sync_or_field_sync (input_tags[0])){ // No ...
if (d_locked){
d_locked = false;
d_lost_index = inputs0_index + ii;
cerr << "atsc_field_sync_demux: lost sync at "
<< d_lost_index << endl;
}
// ... search for beginning of a field sync
// cerr << "atsc_field_sync_demux: searching for sync at "
// << inputs0_index + ii << endl;
for (ii = 1; ii < inputs0_size; ii++){
if (atsc::tag_is_start_field_sync (input_tags[ii])){
// found one
d_locked = true;
const char *str;
if (atsc::tag_is_start_field_sync_1 (input_tags[ii]))
str = "FIELD-1";
else if (atsc::tag_is_start_field_sync_2 (input_tags[ii]))
str = "FIELD-2";
else
str = "SEGMENT";
cerr << "atsc_field_sync_demux: synced (" << str << ") at "
<< inputs0_index + ii
<< " [delta = " << inputs0_index + ii - d_lost_index
<< "]\n";
d_next_input += ii; // update for forecast
return 0; // no work completed so far
}
}
// no non-NORMAL tag found
d_next_input += ii; // update for forecast
return 0; // no work completed so far
}
// We are in sync. Produce output...
int k = 0; // output index
while (k < noutput_items){
if (inputs0_size - ii < ATSC_DATA_SEGMENT_LENGTH){
// We're out of input data.
cerr << "atsc_field_sync_demux: ran out of input data\n";
d_next_input += ii; // update for forecast
return k; // return amount of work completed so far
}
if (!tag_is_seg_sync_or_field_sync (input_tags[ii])){
// lost sync...
cerr << "atsc_field_sync_demux: lost sync at "
<< inputs0_index + ii << endl;
d_next_input += ii; // update for forecast
return k; // return amount of work completed so far
}
if (atsc::tag_is_start_field_sync_1 (input_tags[ii])){
d_in_field2 = false;
d_segment_number = 0;
ii += ATSC_DATA_SEGMENT_LENGTH; // skip over field sync
continue;
}
if (atsc::tag_is_start_field_sync_2 (input_tags[ii])){
d_in_field2 = true;
d_segment_number = 0;
ii += ATSC_DATA_SEGMENT_LENGTH; // skip over field sync
continue;
}
if (d_segment_number >= ATSC_DSEGS_PER_FIELD){
// something's wrong...
cerr << "atsc_field_sync_demux: segment number overflow\n";
d_segment_number = 0;
}
out[k].pli.set_regular_seg (d_in_field2, d_segment_number++);
for (int jj = 0; jj < ATSC_DATA_SEGMENT_LENGTH; jj++)
out[k].data[jj] = in[ii + jj];
ii += ATSC_DATA_SEGMENT_LENGTH;
k++;
}
d_next_input += ii; // update for forecast
return k; // return amount of work completed
}
/* -*- c++ -*- */
/*
* Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
#define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
#include <gr_sync_decimator.h>
#include <atsc_types.h>
class atsc_field_sync_demux;
typedef boost::shared_ptr<atsc_field_sync_demux> atsc_field_sync_demux_sptr;
atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
/*!
* \brief ATSC Field Sync Demux
*
* This class accepts 1 stream of floats (data), and 1 stream of tags (syminfo). * It outputs one stream of atsc_soft_data_segment packets
* \ingroup atsc
*
* input: atsc_data_segment; output: atsc_data_segment
*/
class atsc_field_sync_demux : public gr_sync_decimator
{
friend atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
atsc_field_sync_demux();
public:
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
int work (int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
void reset() { /* nop */ }
protected:
bool d_locked;
bool d_in_field2;
int d_segment_number;
gr_uint64 d_next_input;
gr_uint64 d_lost_index; // diagnostic fluff
unsigned long long inputs0_index; // for inputs[0].index
unsigned long inputs0_size; // for inputs[0].size
};
#endif /* INCLUDED_ATSC_FIELD_SYNC_DEMUX_H */
_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/discuss-gnuradio
