diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-01-07 14:58:46 +0100 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-01-07 15:37:14 +0100 |
commit | a520a70c9644e7244b186d9e6089bb25659f6c80 (patch) | |
tree | 2b82414a488727bfe9b1ebf4555c371d07811569 /host/include | |
parent | 2474ac3296142aa333c09c0215d6fb80c446f20e (diff) | |
download | uhd-a520a70c9644e7244b186d9e6089bb25659f6c80.tar.gz uhd-a520a70c9644e7244b186d9e6089bb25659f6c80.tar.bz2 uhd-a520a70c9644e7244b186d9e6089bb25659f6c80.zip |
docs: Major revisions and additions
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/stream.hpp | 66 |
1 files changed, 62 insertions, 4 deletions
diff --git a/host/include/uhd/stream.hpp b/host/include/uhd/stream.hpp index 75b097ded..ccf961aad 100644 --- a/host/include/uhd/stream.hpp +++ b/host/include/uhd/stream.hpp @@ -33,8 +33,25 @@ namespace uhd{ /*! * A struct of parameters to construct a streamer. * - * Note: - * Not all combinations of CPU and OTW format have conversion support. + * Here is an example of how a stream args object could be used in conjunction + * with uhd::device::get_rx_stream(): + * + * \code{.cpp} + * // 1. Create the stream args object and initialize the data formats to fc32 and sc16: + * uhd::stream_args_t stream_args("fc32", "sc16"); + * // 2. Set the channel list, we want 3 streamers coming from channels + * // 0, 1 and 2, in that order: + * stream_args.channels = boost::assign::list_of(0)(1)(2); + * // 3. Set optional args: + * stream_args.args["spp"] = "200"; // 200 samples per packet + * // Now use these args to create an rx streamer: + * // (We assume that usrp is a valid uhd::usrp::multi_usrp) + * uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + * // Now, any calls to rx_stream must provide a vector of 3 buffers, + * // one per channel. + * \endcode + * + * \b Note: Not all combinations of CPU and OTW format have conversion support. * You may however write and register your own conversion routines. */ struct UHD_API stream_args_t{ @@ -61,6 +78,8 @@ struct UHD_API stream_args_t{ * - f64 - double * - s16 - int16_t * - s8 - int8_t + * + * The CPU format can be chosen depending on what the application requires. */ std::string cpu_format; @@ -69,10 +88,18 @@ struct UHD_API stream_args_t{ * The following over-the-wire formats have been implemented: * - sc16 - Q16 I16 * - sc8 - Q8_1 I8_1 Q8_0 I8_0 + * - sc12 (Only some devices) * * The following are not implemented, but are listed to demonstrate naming convention: * - s16 - R16_1 R16_0 * - s8 - R8_3 R8_2 R8_1 R8_0 + * + * Setting the OTW ("over-the-wire") format is, in theory, transparent to the application, + * but changing this can have some side effects. Using less bits for example (e.g. when going + * from `otw_format` `sc16` to `sc8`) will reduce the dynamic range, and increases quantization + * noise. On the other hand, it reduces the load on the data link and thus allows more bandwidth + * (a USRP N210 can work with 25 MHz bandwidth for 16-Bit complex samples, and 50 MHz for 8-Bit + * complex samples). */ std::string otw_format; @@ -101,17 +128,48 @@ struct UHD_API stream_args_t{ * Users should specify this option to request smaller than default * packets, probably with the intention of reducing packet latency. * + * - noclear: Used by tx_dsp_core_200 and rx_dsp_core_200 + * * The following are not implemented, but are listed for conceptual purposes: * - function: magnitude or phase/magnitude * - units: numeric units like counts or dBm + * + * In addition, all the transport-related options explained on \ref page_transport can be set here. + * These options can be set either when creating the device (see also \ref config_devaddr), + * or when creating the streamer (when the options are given both times, the stream args + * take precedence): + * + * - recv_frame_size + * - send_frame_size + * - num_recv_frames + * - num_send_frames + * - ups_per_sec + * - ups_per_fifo + * - recv_buff_fullness + * + * Other options are device-specific: + * - port, addr: Alternative receiver streamer destination. */ device_addr_t args; /*! * The channels is a list of channel numbers. - * Leave this blank to default to channel 0. + * Leave this blank to default to channel 0 (single-channel application). * Set channels for a multi-channel application. - * Channel mapping depends on the front-end selection. + * Channel mapping depends on the front-end selection (see also \ref config_subdev). + * + * A very simple example is an X300 with two daughterboards and a subdev spec + * of `A:0 B:0`. This means the device has two channels available. + * + * Setting `stream_args.channels = (0, 1)` therefore configures MIMO streaming + * from both channels. By switching the channel indexes, `stream_args.channels = (1, 0)`, + * the channels are switched and the first channel of the USRP is mapped to + * the second channel in the application. + * + * If only a single channel is used for streaming, `stream_args.channels = (1,)` would + * only select a single channel (in this case, the second one). When streaming + * a single channel from the B-side radio of a USRP, this is a more versatile solution + * than setting the subdev globally to "B:0". */ std::vector<size_t> channels; }; |