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

Faster Image Capture - Try 2 #3018

Draft
wants to merge 46 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
68297b5
Fast capture prototype.
Feb 11, 2020
f539dbf
Image capture is functional but needs optimization and cleanup.
Feb 12, 2020
57602f6
Improvements to image capture speedup
Feb 18, 2020
8c3a757
Cleaned up fast img capture, but it's less faster for some reason.
Mar 4, 2020
e899c94
remove comments for PR
Mar 10, 2020
205ae5b
Added buffer pool object and used for image capture. Increases speed …
Mar 12, 2020
33e73f8
Closer to fixing build issues
Mar 18, 2020
82dbb3e
Reinstate commented out DepthNav code
Mar 19, 2020
83a6004
Removed remaining build errors.
Mar 19, 2020
b245d5c
Replaced non-portable expression _CRT_SIZE_MAX
Mar 24, 2020
4a502b0
Restored height, width, and time_stamp data in image responses.
Mar 24, 2020
de9cf5b
Removed extraneous std:move() and made a portable bit strober to fix …
Mar 25, 2020
142f860
add image_benchmarker script
madratman Mar 26, 2020
1f89018
[formatting] maintain whitespacing consistency with AirSim code
madratman Mar 26, 2020
220ad4b
Rather than assume width is rounded up to power of two, pass the buff…
ironclownfish Mar 27, 2020
03494a5
Get simGetImages working
May 6, 2020
9b74b56
A memcopy is necessary in RpcLibAdaptorsBase. A swap would send a siz…
May 11, 2020
0b94b8a
Compilation fixes
rajat2004 May 6, 2020
6d7f405
Fix camera name in benchmark script
rajat2004 May 16, 2020
d70f0e0
Merge branch 'master' of https://github.com/microsoft/AirSim into pr/…
rajat2004 May 23, 2020
6b16976
Fix compile error
rajat2004 May 23, 2020
4603bf3
Fix image width calculation
rajat2004 May 23, 2020
e85fee6
[Unreal] Use WriteOnly LockMode to avoid crash on Linux using Vulkan
rajat2004 May 23, 2020
b5f79e5
Make no. of channles depend on image, allows it to be used on both PR…
rajat2004 May 24, 2020
92c977c
Revert "[Unreal] Use WriteOnly LockMode to avoid crash on Linux using…
rajat2004 May 24, 2020
d572411
Updated benchmark script, add save_images option
rajat2004 May 25, 2020
3de9156
[Unreal] Disable camera after capturing image
rajat2004 May 28, 2020
41dcd84
[Pythonclient] Add high resolution camera benchmark script
rajat2004 May 28, 2020
6612ea4
restore BP_FlyingPawn.uasset, fixes to benchmarking script
madratman Jun 1, 2020
0391272
Add image_type option to benchmark script
rajat2004 Jun 8, 2020
0561f4c
WIP test code
rajat2004 Jun 16, 2020
6cfb8d4
Compilation fixes, cleanup, still crashing
rajat2004 Jun 17, 2020
505eef8
Crash fix, convert BufferPool to template
rajat2004 Jun 18, 2020
89c4193
More fixes
rajat2004 Jun 18, 2020
6d0d083
Merge main AirSim branch
rajat2004 Jul 29, 2020
a054193
Cleanup
rajat2004 Jul 29, 2020
f0f9034
Move Bufferpool to inside UE Plugins directory
rajat2004 Jul 29, 2020
2cfa7fd
More compilation fixes
rajat2004 Sep 4, 2020
73274b7
Comment out disableCamera, causes crash
rajat2004 Sep 9, 2020
901bd01
Use mutex, condition variable for wait
rajat2004 Sep 12, 2020
e0d4c86
Merge main AirSim branch
rajat2004 Sep 13, 2020
ecf44aa
Delete already present high_res_camera.py script
rajat2004 Sep 13, 2020
c1dfa7d
Fixed depth capture, added conversion to BGR
cthoma20-arc Sep 16, 2020
7e65e34
Fix incorrect vector size in BufferPool
rajat2004 Sep 18, 2020
1d0d087
Fix float images in image_benchmarker.py script
rajat2004 Sep 18, 2020
f3b5f83
Add back CaptureScreen() call
rajat2004 Sep 18, 2020
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
Prev Previous commit
Next Next commit
Compilation fixes
  • Loading branch information
rajat2004 committed May 16, 2020
commit 0b94b8aa5dc19f5bf6d467f5fe7b05e524171c2a
4 changes: 2 additions & 2 deletions AirLib/src/api/RpcLibServerBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ RpcLibServerBase::RpcLibServerBase(ApiProvider* api_provider, const std::string&

pimpl_->server.bind("simGetImages", [&](const std::vector<RpcLibAdapatorsBase::ImageRequest>& request_adapter, const std::string& vehicle_name) -> vector<RpcLibAdapatorsBase::ImageResponse> {
std::vector<ImageCaptureBase::ImageResponse> responses;
for (request : request_adapter)
responses.push_back(ImageCapbureBase::ImageResponse());
for (RpcLibAdapatorsBase::ImageRequest request : request_adapter)
responses.push_back(ImageCaptureBase::ImageResponse());
getVehicleSimApi(vehicle_name)->getImages(RpcLibAdapatorsBase::ImageRequest::to(request_adapter), responses);
return RpcLibAdapatorsBase::ImageResponse::from(responses);
});
Expand Down
2 changes: 1 addition & 1 deletion Unreal/Plugins/AirSim/Source/RenderRequest.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class RenderRequest : public FRenderCommand

struct RenderResult {
RenderResult() = default;
RenderResult(RenderResult&) = default;
// RenderResult(RenderResult&) = default;
RenderResult(RenderResult&&) = default;
RenderResult &operator=(RenderResult &&) = default;

Expand Down