diff options
author | Josh Blum | 2012-11-21 21:11:31 -0800 |
---|---|---|
committer | Josh Blum | 2012-11-21 21:11:31 -0800 |
commit | 8cf5baeac93a2c8e908126055ba0c96f2bfd2510 (patch) | |
tree | e9e55391af382b22706a8d0510474f3aad6daaed /lib/gras_impl/input_buffer_queues.hpp | |
parent | 6d4c752aa0aaf41d7e764dbd81708f343a38c650 (diff) | |
download | sandhi-8cf5baeac93a2c8e908126055ba0c96f2bfd2510.tar.gz sandhi-8cf5baeac93a2c8e908126055ba0c96f2bfd2510.tar.bz2 sandhi-8cf5baeac93a2c8e908126055ba0c96f2bfd2510.zip |
implement buffer stitching on input, output always flushes
Diffstat (limited to 'lib/gras_impl/input_buffer_queues.hpp')
-rw-r--r-- | lib/gras_impl/input_buffer_queues.hpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/gras_impl/input_buffer_queues.hpp b/lib/gras_impl/input_buffer_queues.hpp index 5ae8951..1bff51f 100644 --- a/lib/gras_impl/input_buffer_queues.hpp +++ b/lib/gras_impl/input_buffer_queues.hpp @@ -83,7 +83,20 @@ struct InputBufferQueues { ASSERT(not _queues[i].full()); if (buffer.length == 0) return; - _queues[i].push_back(buffer); + + //does this buffer starts where the last one ends? + //perform buffer stitching into back of buffer + if ( + not _queues[i].empty() and _queues[i].back() == buffer and + (_queues[i].back().length + _queues[i].back().offset) == buffer.offset + ){ + _queues[i].back().length += buffer.length; + } + else + { + _queues[i].push_back(buffer); + } + _enqueued_bytes[i] += _queues[i].back().length; __update(i); } @@ -225,6 +238,8 @@ GRAS_FORCE_INLINE void InputBufferQueues::accumulate(const size_t i, const size_ GRAS_FORCE_INLINE void InputBufferQueues::consume(const size_t i, const size_t bytes_consumed) { + if (bytes_consumed == 0) return; + ASSERT(not _queues[i].empty()); SBuffer &front = _queues[i].front(); |