Merge with upstream (fix build errors with libavcodec version 3) #1
Conversation
This directly passes the ros compressed frame data to the http socket without reencoding it
Adds support for streaming ROS compressed image topics without the need to reencode them
Programm behavior is not changed since the exception is rethrown.
More information when server creation is failed
Fixed topic list to display all image topics, fixing Issue RobotWebTools#18.
This fix is required when compiling the package with `clang`. Otherwise a SIGILL (Illegal instruction) is triggered.
web_video_server: fix bool function not returning
* Correct use of deprecated parameters codec_context_->rc_buffer_aggressivity marked as "currently useless", so removed codec_context_->frame_skip_threshold access through new priv_data api * New names for pixel formats * AVPicture is deprecated, use AVFrame * Switch to non-deprecated free functions * Use new encoding api for newer versions encode_video2 is deprecated * codec_context is deprecated, use packet flags
so that cleanup works correctly even if system time changes
…ls#45)" (RobotWebTools#51) This reverts commit ae74f19.
|
I tested it locally with Pickit indigo-devel and everything seems to work as usual. Actually I don't understand why we do not use the released version and instead use our own fork which is rarely updated. @viktorku do you know more? The commits that I saw on our own fork are not relevant anymore or have been fixed upstream as well. I tested the upstream version and it also works fine. Will create a PR for 1.9 where we can discuss if we want to use it. For now I wouldn't merge this PR. If we create a new 1.8 release, we would also include these changes here which I don't feel comfortable with at the moment. I guess we would need to create a |
…tWebTools#63) * use SteadyTimer for cleaning up inactive streams so that cleanup works correctly even if system time changes SteadyTimer is available since roscpp 1.13.1 * possibility to use SteadyTimer on older ROS versions when SteadyTimer has been backported to those...
* use package format 2 * add missing dependency on sensor_msgs
i.e. on current kinetic
…ls#83) * Add a workaround for MultipartStream constant busy state * Remove C++11 features
This allows users to specify default stream type in their .launch files. Using a "ros_compressed" stream type sometimes results in a much lower resource consumption, and having it set as a default is much nicer for end users.
|
@viktorku Can be closed now that #3 has been merged? I merged the latest upstream Our develop-minimum-rate-stream branch has some additional patches (develop...develop-minimum-rate-stream) which are not in custom (develop...custom) anymore. |
|
Can be closed. The relevant feature for minimum rate streaming is now (ready for merge) upstream. |
I needed RobotWebTools#43 to compile with a newer version of libav/ffmpeg installed on my system, which will be the default starting from Ubuntu zesty. Instead of picking only this PR I merged the latest development branch from upstream and resolved the merge conflicts.
A new streamer type
RosCompressedStreamerhas been added in RobotWebTools#16, which passes through compressed image data from ROS. I adapted the minimum rate publishing from theImageStreamer::restreamFrame(double max_age)implementation.Other patches also seem to be reasonable or even critical, e.g. RobotWebTools#53.
This branch is completely untested. Carefully review if needed, or simply ignore.