diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-21 16:29:28 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-21 16:29:28 -0700 |
| commit | 996224242aca2362e25eb812d261875aa9f30b68 (patch) | |
| tree | 3f223b584aa04c77afa23e2d6d40774560309baf /host/lib/usrp | |
| parent | 743aca4c3e68257253960d37422082aab4fe5d91 (diff) | |
| parent | e238c178b21e629b41773f3b156af5b3ce28c471 (diff) | |
| download | uhd-996224242aca2362e25eb812d261875aa9f30b68.tar.gz uhd-996224242aca2362e25eb812d261875aa9f30b68.tar.bz2 uhd-996224242aca2362e25eb812d261875aa9f30b68.zip | |
Merge branch 'origin/uhd/issue_448_itemsize' into maint
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 4883b2410..166b0cb37 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -1196,7 +1196,7 @@ private: // Assumption is that all mboards use the same link bool _check_link_rate(const stream_args_t &args, bool is_tx) { bool link_rate_is_ok = true; - size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format); + size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format.empty() ? "sc16" : args.otw_format); double max_link_rate = 0; double sum_rate = 0; BOOST_FOREACH(const size_t chan, args.channels) { |