-
-
Notifications
You must be signed in to change notification settings - Fork 20
Full Rebuild (Sync) September 2025: bump ros2-distro-mutex to 0.11.0 and build_number to 10 #108
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
Merged
Merged
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
ea3a630
update robostack
wep21 c433b71
update patch
wep21 d776139
update patch
wep21 689b055
update patch
wep21 20247aa
update patch
wep21 1c0b200
update patch
wep21 529c576
update patch
wep21 75bdce5
update patch
wep21 65d3ce8
update
wep21 8e182ac
update zenoh
wep21 23374d6
update
wep21 fac964c
update patch
wep21 eef7082
update patch
wep21 68cfc6c
update checkout
wep21 003d2ba
Update .github/workflows/testpr.yml
wep21 974af11
update patch
wep21 b634334
update patch
wep21 bd59535
update patch
wep21 247d67a
update patch
wep21 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,20 @@ | ||
| diff --git a/include/ffmpeg_encoder_decoder/decoder.hpp b/include/ffmpeg_encoder_decoder/decoder.hpp | ||
| index 0e2521c..94625e5 100644 | ||
| --- a/include/ffmpeg_encoder_decoder/decoder.hpp | ||
| +++ b/include/ffmpeg_encoder_decoder/decoder.hpp | ||
| @@ -81,7 +81,7 @@ private: | ||
| AVFrame * colorFrame_{NULL}; | ||
| SwsContext * swsContext_{NULL}; | ||
| enum AVPixelFormat hwPixFormat_; | ||
| - AVPacket packet_; | ||
| + // AVPacket packet_; | ||
| AVBufferRef * hwDeviceContext_{NULL}; | ||
| }; | ||
| } // namespace ffmpeg_encoder_decoder | ||
| diff --git a/src/decoder.cpp b/src/decoder.cpp | ||
| index 5458f21..a2762aa 100644 | ||
| --- a/src/decoder.cpp | ||
| +++ b/src/decoder.cpp | ||
| @@ -256,7 +256,7 @@ bool Decoder::decodePacket( | ||
| image->header.stamp = it->second; | ||
| ptsToStamp_.erase(it); | ||
| #ifdef USE_AV_FLAGS | ||
| - callback_(image, decodedFrame_->flags || AV_FRAME_FLAG_KEY); // deliver callback | ||
| + callback_(image, decodedFrame_->flags | AV_FRAME_FLAG_KEY); // deliver callback | ||
| #else | ||
| callback_(image, decodedFrame_->key_frame); // deliver callback | ||
| #endif | ||
| diff --git a/src/encoder.cpp b/src/encoder.cpp | ||
| index ed6ca85..0aa3412 100644 | ||
| index 80f1de4..fc485b4 100644 | ||
| --- a/src/encoder.cpp | ||
| +++ b/src/encoder.cpp | ||
| @@ -211,11 +211,19 @@ void Encoder::doOpenCodec(int width, int height) | ||
| setAVOption("tune", tune_); | ||
| setAVOption("delay", delay_); | ||
| setAVOption("crf", crf_); | ||
| @@ -259,9 +259,15 @@ void Encoder::doOpenCodec(int width, int height, const std::string & origEncodin | ||
| setAVOption(kv.first, kv.second); | ||
| ss << " " << kv.first << "=" << kv.second; | ||
| } | ||
| +#ifdef __APPLE__ | ||
| + RCLCPP_DEBUG( | ||
| + logger_, | ||
| + "codec: %10s, profile: %10s, preset: %10s," | ||
| + " bit_rate: %10lld qmax: %2d", | ||
| + encoder_.c_str(), profile_.c_str(), preset_.c_str(), bitRate_, qmax_); | ||
| + RCLCPP_INFO( | ||
| + logger_, "codec: %10s, bit_rate: %10lld qmax: %2d options: %s", encoder_.c_str(), bitRate_, | ||
| + qmax_, ss.str().c_str()); | ||
| +#else | ||
| RCLCPP_DEBUG( | ||
| logger_, | ||
| "codec: %10s, profile: %10s, preset: %10s," | ||
| " bit_rate: %10ld qmax: %2d", | ||
| encoder_.c_str(), profile_.c_str(), preset_.c_str(), bitRate_, qmax_); | ||
| RCLCPP_INFO( | ||
| logger_, "codec: %10s, bit_rate: %10ld qmax: %2d options: %s", encoder_.c_str(), bitRate_, | ||
| qmax_, ss.str().c_str()); | ||
| +#endif | ||
|
|
||
| err = avcodec_open2(codecContext_, codec, NULL); | ||
| utils::check_for_err("cannot open codec", err); | ||
| RCLCPP_INFO_STREAM( | ||
| logger_, "cv_bridge_target_format: " | ||
| << cvBridgeTargetFormat_ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.