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.

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

[rfc/wip] use v4l2 format info instead #420

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

[rfc/wip] use v4l2 format info instead #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09e112a
vidioc: skip format name/flags filling on kernel >= 4.2
vicamo Mar 24, 2021
608f867
utils: use v4l_fill_fmtdesc to retrieve format name
vicamo Mar 24, 2021
c10b471
compliance: use kernel v4l2_fill_pixfmt()
vicamo Mar 28, 2021
18aa16b
compliance: drop v4l2l_format in favor of kernel v4l2_format_info
vicamo Mar 24, 2021
586f447
wip: formats: add more
vicamo Mar 28, 2021
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
24 changes: 0 additions & 24 deletions doc/makeformats.sh
View file
Open in desktop

This file was deleted.

291 changes: 0 additions & 291 deletions doc/missingformats.h
View file
Open in desktop

This file was deleted.

18 changes: 7 additions & 11 deletions utils/v4l2loopback-ctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@
#define MARK()
#endif

struct v4l2l_format {
char *name;
int fourcc; /* video4linux 2 */
int depth; /* bit/pixel */
int flags;
};
#define FORMAT_FLAGS_PLANAR 0x01
#define FORMAT_FLAGS_COMPRESSED 0x02
#include "../v4l2loopback_formats.h"

/********************/
Expand Down Expand Up @@ -316,11 +308,15 @@ static void help_setcaps(const char *program, int brief, int argc, char **argv)
const size_t num_formats = sizeof(formats) / sizeof(*formats);
size_t i = 0;
for (i = 0; i < num_formats; i++) {
const struct v4l2l_format *fmt = formats + i;
struct v4l2_fmtdesc f;

memset(fourcc, 0, 5);
memset(&f, 0, sizeof(f));
f.pixelformat = formats[i].format;
v4l_fill_fmtdesc(&f);
dprintf(2, "%4s\t%d\t%s\n",
fourcc2str(fmt->fourcc, fourcc), fmt->fourcc,
fmt->name);
fourcc2str(f.pixelformat, fourcc),
f.pixelformat, f.description);
}
}
}
Expand Down
Loading