From c76de2b69d2fce16e6ccb2e2ef5ee5e858f84e5b Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sat, 24 Dec 2016 11:11:42 +0100 Subject: Move fragments into interleaver instead of copying them --- src/dabOutput/edi/Interleaver.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/dabOutput/edi/Interleaver.h') diff --git a/src/dabOutput/edi/Interleaver.h b/src/dabOutput/edi/Interleaver.h index 1a2e26d..51a584f 100644 --- a/src/dabOutput/edi/Interleaver.h +++ b/src/dabOutput/edi/Interleaver.h @@ -43,23 +43,25 @@ namespace edi { class Interleaver { public: + using fragment_vec = std::vector; + /* Configure the interleaver to use latency_frames number of AF * packets for interleaving. Total delay through the interleaver * will be latency_frames * 24ms */ void SetLatency(size_t latency_frames); - /* Push the fragments for an AF Packet into the interleaver */ - void PushFragments(const std::vector< PFTFragment > &fragments); - - std::vector< PFTFragment > Interleave(void); + /* Move the fragments for an AF Packet into the interleaver and + * return interleaved fragments to be transmitted. + */ + fragment_vec Interleave(fragment_vec &fragments); private: size_t m_latency = 0; size_t m_fragment_count = 0; size_t m_interleave_offset = 0; size_t m_stride = 0; - std::deque > m_buffer; + std::deque m_buffer; }; } -- cgit v1.2.3