Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Don't overwrite sample flags during path sample muxing.

Browse source 
Signed-off-by: Philipp Jungkamp <Philipp.Jungkamp@opal-rt.com>
This commit is contained in:
Philipp Jungkamp 2023-09-13 10:27:14 +02:00 • committed by Steffen Vogel
parent b70704f2d4
commit c49e339ad1
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/path.cpp
View file

@ -531,15 +531,8 @@ void Path::start() {
last_sample->length = signals->size();
last_sample->signals = signals;
last_sample->ts.origin = time_now();
last_sample->flags = (int)SampleFlags::HAS_TS_ORIGIN;
last_sample->sequence = 0;
last_sample->flags |= (int)SampleFlags::HAS_SEQUENCE;
if (last_sample->length > 0)
last_sample->flags |= (int)SampleFlags::HAS_DATA;
for (size_t i = 0; i < last_sample->length; i++) {
auto sig = signals->getByIndex(i);

12
lib/path_source.cpp
View file

@ -96,10 +96,14 @@ int PathSource::read(int i) {
goto read_decref_muxed_smps;
}
muxed_smps[i]->flags = tomux_smps[i]->flags;
if (path->original_sequence_no) {
muxed_smps[i]->sequence = tomux_smps[i]->sequence;
muxed_smps[i]->flags |=
tomux_smps[i]->flags & (int)SampleFlags::HAS_SEQUENCE;
if (tomux_smps[i]->flags & (int)SampleFlags::HAS_SEQUENCE)
muxed_smps[i]->flags |= (int)SampleFlags::HAS_SEQUENCE;
else
muxed_smps[i]->flags &= ~(int)SampleFlags::HAS_SEQUENCE;
} else {
muxed_smps[i]->sequence = path->last_sequence++;
muxed_smps[i]->flags |= (int)SampleFlags::HAS_SEQUENCE;
@ -112,8 +116,6 @@ int PathSource::read(int i) {
muxed_smps[i]->length = 0;
muxed_smps[i]->ts = tomux_smps[i]->ts;
muxed_smps[i]->flags |= tomux_smps[i]->flags & (int)SampleFlags::HAS_TS;
ret = mappings.remap(muxed_smps[i], tomux_smps[i]);
if (ret < 0) {
enqueued = ret;
@ -123,6 +125,8 @@ int PathSource::read(int i) {
if (muxed_smps[i]->length > 0)
muxed_smps[i]->flags |= (int)SampleFlags::HAS_DATA;
else
muxed_smps[i]->flags &= ~(int)SampleFlags::HAS_DATA;
}
muxed_initialized = tomux;