diff options
| author | Balint Seeber <balint@ettus.com> | 2013-11-19 12:37:18 -0800 |
|---|---|---|
| committer | Balint Seeber <balint@ettus.com> | 2013-11-19 12:37:18 -0800 |
| commit | 2ab579a3036fcdb4739510fa2f919f54ce660586 (patch) | |
| tree | d5d5589969ae4e0f92f4b37d5242aa3791046df0 /host/lib/usrp | |
| parent | 45a780cc858dd84e4883139ad2121aeb222d2d8e (diff) | |
| parent | 39d69b3a8871e4d6f442511e57394f83a012d3b6 (diff) | |
| download | uhd-2ab579a3036fcdb4739510fa2f919f54ce660586.tar.gz uhd-2ab579a3036fcdb4739510fa2f919f54ce660586.tar.bz2 uhd-2ab579a3036fcdb4739510fa2f919f54ce660586.zip | |
Merge remote-tracking branch 'origin/usb_cpu_perf' into b200/kitchen_sink
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index d643ef855..1feeff1a3 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -231,14 +231,14 @@ rx_streamer::sptr b200_impl::get_rx_stream(const uhd::stream_args_t &args_) //calculate packet size static const size_t hdr_size = 0 + vrt::max_if_hdr_words32*sizeof(boost::uint32_t) - + sizeof(vrt::if_packet_info_t().tlr) //forced to have trailer + //+ sizeof(vrt::if_packet_info_t().tlr) //forced to have trailer - sizeof(vrt::if_packet_info_t().cid) //no class id ever used - sizeof(vrt::if_packet_info_t().tsi) //no int time ever used ; const size_t bpp = _data_transport->get_recv_frame_size() - hdr_size; const size_t bpi = convert::get_bytes_per_item(args.otw_format); size_t spp = unsigned(args.args.cast<double>("spp", bpp/bpi)); - spp = std::min<size_t>(2000, spp); //magic maximum for framing at full rate + spp = std::min<size_t>(2044, spp); //magic maximum for framing at full rate //make the new streamer given the samples per packet if (not my_streamer) my_streamer = boost::make_shared<sph::recv_packet_streamer>(spp); |