Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wire_rep_utils cleanup #3001

Merged
merged 1 commit into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/carriers/h264_carrier/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ if(NOT SKIP_h264)
PRIVATE
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_wire_rep_utils
)
list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS
YARP_os
Expand Down
3 changes: 1 addition & 2 deletions src/carriers/h264_carrier/H264Stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ using namespace yarp::sig;

H264Stream::H264Stream(h264Decoder_cfgParamters &config) :
delegate(nullptr),
blobHeader{0,0,0},
phase(0),
cursor(nullptr),
remaining(0),
Expand Down Expand Up @@ -123,7 +122,7 @@ yarp::conf::ssize_t H264Stream::read(Bytes& b)
{
phase = 4;
cursor = nullptr;
remaining = blobHeader.blobLen;
remaining = 0;
} else
{
phase = 0;
Expand Down
2 changes: 0 additions & 2 deletions src/carriers/h264_carrier/H264Stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <yarp/os/impl/DgramTwoWayStream.h>
#include <yarp/sig/Image.h>
#include <yarp/sig/ImageNetworkHeader.h>
#include <yarp/wire_rep_utils/BlobNetworkHeader.h>
#include "H264Decoder.h"
#include <yarp/os/InputStream.h>

Expand All @@ -22,7 +21,6 @@ class H264Stream :
DgramTwoWayStream *delegate;
yarp::sig::ImageOf<yarp::sig::PixelRgb> img;
yarp::sig::ImageNetworkHeader imgHeader;
yarp::wire_rep_utils::BlobNetworkHeader blobHeader;
int phase;
char *cursor;
size_t remaining;
Expand Down
2 changes: 0 additions & 2 deletions src/carriers/websocket/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ if(NOT SKIP_websocket)
PRIVATE
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_wire_rep_utils
)
list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS
YARP_os
YARP_sig
YARP_wire_rep_utils
)

yarp_install(
Expand Down
Loading