Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
ftl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nicolas Pope
ftl
Commits
a105c311
Commit
a105c311
authored
4 years ago
by
Nicolas Pope
Browse files
Options
Downloads
Patches
Plain Diff
Fix for bad param set
parent
f6dc0432
No related branches found
No related tags found
No related merge requests found
Pipeline
#29086
passed
4 years ago
Stage: all
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
components/streams/src/receiver.cpp
+7
-7
7 additions, 7 deletions
components/streams/src/receiver.cpp
with
7 additions
and
7 deletions
components/streams/src/receiver.cpp
+
7
−
7
View file @
a105c311
...
@@ -70,8 +70,8 @@ ftl::streams::BaseBuilder &Receiver::builder(uint32_t id) {
...
@@ -70,8 +70,8 @@ ftl::streams::BaseBuilder &Receiver::builder(uint32_t id) {
b
->
setID
(
id
);
b
->
setID
(
id
);
b
->
setPool
(
pool_
);
b
->
setPool
(
pool_
);
fb
->
setBufferSize
(
value
(
"frameset_buffer_size"
,
0
));
fb
->
setBufferSize
(
value
(
"frameset_buffer_size"
,
0
));
fb
->
setBufferSize
(
value
(
"max_buffer_size"
,
16
));
fb
->
set
Max
BufferSize
(
value
(
"max_buffer_size"
,
16
));
fb
->
set
Buffer
Size
(
value
(
"completion_size"
,
8
));
fb
->
set
Completion
Size
(
value
(
"completion_size"
,
8
));
handles_
[
id
]
=
std
::
move
(
fb
->
onFrameSet
([
this
](
const
ftl
::
data
::
FrameSetPtr
&
fs
)
{
handles_
[
id
]
=
std
::
move
(
fb
->
onFrameSet
([
this
](
const
ftl
::
data
::
FrameSetPtr
&
fs
)
{
callback_
.
trigger
(
fs
);
callback_
.
trigger
(
fs
);
return
true
;
return
true
;
...
@@ -255,14 +255,10 @@ void Receiver::_processVideo(const StreamPacket &spkt, const Packet &pkt) {
...
@@ -255,14 +255,10 @@ void Receiver::_processVideo(const StreamPacket &spkt, const Packet &pkt) {
auto
[
tx
,
ty
]
=
ftl
::
codecs
::
chooseTileConfig
(
pkt
.
frame_count
);
auto
[
tx
,
ty
]
=
ftl
::
codecs
::
chooseTileConfig
(
pkt
.
frame_count
);
// Get the frameset
auto
&
build
=
builder
(
spkt
.
streamID
);
auto
fs
=
build
.
get
(
spkt
.
timestamp
,
spkt
.
frame_number
+
pkt
.
frame_count
-
1
);
int
width
=
ividstate
.
width
;
//calibration.width;
int
width
=
ividstate
.
width
;
//calibration.width;
int
height
=
ividstate
.
height
;
//calibration.height;
int
height
=
ividstate
.
height
;
//calibration.height;
if
(
width
==
0
||
height
==
0
)
{
if
(
width
<=
0
||
height
<=
0
||
width
>
900
0
||
height
>
900
0
)
{
// Attempt to retry the decode later
// Attempt to retry the decode later
// Make a copy of the packets into a thread job
// Make a copy of the packets into a thread job
// FIXME: Check that thread pool does not explode
// FIXME: Check that thread pool does not explode
...
@@ -314,6 +310,10 @@ void Receiver::_processVideo(const StreamPacket &spkt, const Packet &pkt) {
...
@@ -314,6 +310,10 @@ void Receiver::_processVideo(const StreamPacket &spkt, const Packet &pkt) {
}
}
}
}
// Get the frameset
auto
&
build
=
builder
(
spkt
.
streamID
);
auto
fs
=
build
.
get
(
spkt
.
timestamp
,
spkt
.
frame_number
+
pkt
.
frame_count
-
1
);
if
(
!
fs
)
{
if
(
!
fs
)
{
LOG
(
WARNING
)
<<
"Dropping a video frame"
;
LOG
(
WARNING
)
<<
"Dropping a video frame"
;
return
;
return
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment