Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

actual crash fix this time #800

Merged
merged 2 commits into from
May 5, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/op25_repeater/lib/p25_frame_assembler_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ p25_frame_assembler_impl::general_work (int noutput_items,
//BOOST_LOG_TRIVIAL(trace) << "P25 Frame Assembler - output_queue: " << output_queue.size() << " noutput_items: " << noutput_items << " ninput_items: " << ninput_items[0];

if (amt_produce > 0) {
if (amt_produce >= 32768) {
BOOST_LOG_TRIVIAL(error) << "P25 Frame Assembler - output_queue size: " << output_queue.size() << " max size: " << output_queue.max_size() << " limiting amt_produce to 32767 ";

amt_produce = 32767; // buffer limit is 32768, see gnuradio/gnuradio-runtime/lib/../include/gnuradio/buffer.h:186
}
long src_id = p1fdma.get_curr_src_id();
long grp_id = p1fdma.get_curr_grp_id();
// If a SRC wasn't received on the voice channel since the last check, it will be -1
Expand Down Expand Up @@ -254,4 +259,4 @@ p25_frame_assembler_impl::general_work (int noutput_items,
}
}
} /* namespace op25_repeater */
} /* namespace gr */
} /* namespace gr */