Skip to content

fix incorrect ImageFrame memory ownership handling #11

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.

Sign up for GitHub

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 6 commits into from
Mar 20, 2022
Merged

fix incorrect ImageFrame memory ownership handling #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b8d863
fix incorrect ImageFrame memory ownership handling
tobyxdd Mar 15, 2022
49a8cda
Update mediapipe_api/framework/formats/image_frame.cc
tobyxdd Mar 17, 2022
7e9e067
code fix
tobyxdd Mar 17, 2022
9f10994
Merge branch 'master' into master
sr229 Mar 20, 2022
e1ee6c6
Change function declaration to represent new type change
sr229 Mar 20, 2022
ec9bc8c
Update header file as well
Speykious Mar 20, 2022
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
8 changes: 6 additions & 2 deletions mediapipe_api/framework/formats/image_frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ MpReturnCode mp_ImageFrame__ui_i_i_ui(mediapipe::ImageFormat::Format format, int
CATCH_ALL
}

MpReturnCode mp_ImageFrame__ui_i_i_i_Pui8_PF(mediapipe::ImageFormat::Format format, int width, int height, int width_step, uint8* pixel_data, Deleter* deleter,
MpReturnCode mp_ImageFrame__ui_i_i_i_Pui8(mediapipe::ImageFormat::Format format, int width, int height, int width_step, uint8* pixel_data,
mediapipe::ImageFrame** image_frame_out) {
TRY_ALL
*image_frame_out = new mediapipe::ImageFrame{format, width, height, width_step, pixel_data, deleter};
// Copy pixel data
mediapipe::ImageFrame* output_frame = new mediapipe::ImageFrame{};
output_frame->CopyPixelData(format, width,
height, width_step, pixel_data, mediapipe::ImageFrame::kDefaultAlignmentBoundary);
*image_frame_out = output_frame;
RETURN_CODE(MpReturnCode::Success);
CATCH_ALL
}
Expand Down
4 changes: 2 additions & 2 deletions mediapipe_api/framework/formats/image_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ typedef void(Deleter)(uint8*);
MP_CAPI(MpReturnCode) mp_ImageFrame__(mediapipe::ImageFrame** image_frame_out);
MP_CAPI(MpReturnCode) mp_ImageFrame__ui_i_i_ui(mediapipe::ImageFormat::Format format, int width, int height, uint32 alignment_boundary,
mediapipe::ImageFrame** image_frame_out);
MP_CAPI(MpReturnCode) mp_ImageFrame__ui_i_i_i_Pui8_PF(mediapipe::ImageFormat::Format format, int width, int height, int width_step, uint8* pixel_data,
Deleter* deleter, mediapipe::ImageFrame** image_frame_out);
MP_CAPI(MpReturnCode) mp_ImageFrame__ui_i_i_i_Pui8(mediapipe::ImageFormat::Format format, int width, int height, int width_step, uint8* pixel_data,
mediapipe::ImageFrame** image_frame_out);
MP_CAPI(void) mp_ImageFrame__delete(mediapipe::ImageFrame* image_frame);
MP_CAPI(bool) mp_ImageFrame__IsEmpty(mediapipe::ImageFrame* image_frame);
MP_CAPI(MpReturnCode) mp_ImageFrame__SetToZero(mediapipe::ImageFrame* image_frame);
Expand Down