Skip to content

Use stack instead of heap in AbstractYuyvBufferDecoder::component_indexes #114251

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

Open
iker-sr wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −11
Open

Use stack instead of heap in AbstractYuyvBufferDecoder::component_indexes #114251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions modules/camera/buffer_decoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,37 @@ AbstractYuyvBufferDecoder::AbstractYuyvBufferDecoder(CameraFeed *p_camera_feed)
BufferDecoder(p_camera_feed) {
switch (camera_feed->get_format().pixel_format) {
case V4L2_PIX_FMT_YYUV:
component_indexes = new int[4]{ 0, 1, 2, 3 };
component_indexes[0] = 0;
component_indexes[1] = 1;
component_indexes[2] = 2;
component_indexes[3] = 3;
break;
case V4L2_PIX_FMT_YVYU:
component_indexes = new int[4]{ 0, 2, 3, 1 };
component_indexes[0] = 0;
component_indexes[1] = 2;
component_indexes[2] = 3;
component_indexes[3] = 1;
break;
case V4L2_PIX_FMT_UYVY:
component_indexes = new int[4]{ 1, 3, 0, 2 };
component_indexes[0] = 1;
component_indexes[1] = 3;
component_indexes[2] = 0;
component_indexes[3] = 2;
break;
case V4L2_PIX_FMT_VYUY:
component_indexes = new int[4]{ 1, 3, 2, 0 };
component_indexes[0] = 1;
component_indexes[1] = 3;
component_indexes[2] = 2;
component_indexes[3] = 0;
break;
default:
component_indexes = new int[4]{ 0, 2, 1, 3 };
component_indexes[0] = 0;
component_indexes[1] = 2;
component_indexes[2] = 1;
component_indexes[3] = 3;
}
}

AbstractYuyvBufferDecoder::~AbstractYuyvBufferDecoder() {
delete[] component_indexes;
}

SeparateYuyvBufferDecoder::SeparateYuyvBufferDecoder(CameraFeed *p_camera_feed) :
AbstractYuyvBufferDecoder(p_camera_feed) {
y_image_data.resize(width * height);
Expand Down
3 changes: 1 addition & 2 deletions modules/camera/buffer_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,10 @@ class BufferDecoder {

class AbstractYuyvBufferDecoder : public BufferDecoder {
protected:
int *component_indexes = nullptr;
int component_indexes[4];

public:
AbstractYuyvBufferDecoder(CameraFeed *p_camera_feed);
~AbstractYuyvBufferDecoder();
};

class SeparateYuyvBufferDecoder : public AbstractYuyvBufferDecoder {
Expand Down