Skip to content

(feat) UVCCamera:Support Size add frame rate information #62

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
QixianWu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

(feat) UVCCamera:Support Size add frame rate information #62

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
36 changes: 23 additions & 13 deletions lib/src/main/java/com/serenegiant/usb/UVCCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public static List<Size> getSupportedSize(final int type, final String supported
final int format_nums = formats.length();
for (int i = 0; i < format_nums; i++) {
final JSONObject format = formats.getJSONObject(i);
if(format.has("type") && format.has("size")) {
if(format.has("type") && format.has("frameDescriptors")) {
final int format_type = format.getInt("type");
if ((format_type == type) || (type == -1)) {
addSize(format, format_type, 0, result);
Expand All @@ -360,18 +360,28 @@ public static List<Size> getSupportedSize(final int type, final String supported
return result;
}

private static final void addSize(final JSONObject format, final int formatType, final int frameType, final List<Size> size_list) throws JSONException {
final JSONArray size = format.getJSONArray("size");
final int size_nums = size.length();
for (int j = 0; j < size_nums; j++) {
final String[] sz = size.getString(j).split("x");
try {
size_list.add(new Size(formatType, frameType, j, Integer.parseInt(sz[0]), Integer.parseInt(sz[1])));
} catch (final Exception e) {
break;
}
}
}
private static final void addSize(final JSONObject format, final int formatType, final int frameType, final List<Size> size_list) throws JSONException {
final JSONArray frameDescriptors = format.getJSONArray("frameDescriptors");
final int size_nums = frameDescriptors.length();
for (int j = 0; j < size_nums; j++) {
try {
final JSONObject descriptor = frameDescriptors.getJSONObject(j);
final int width = descriptor.getInt("width");
final int height = descriptor.getInt("height");

final JSONArray intervalArray = descriptor.getJSONArray("intervals");
final int intervalCount = intervalArray.length();
final int[] intervals = new int[intervalCount];
for (int k = 0; k < intervalCount; k++) {
final JSONObject interval = intervalArray.getJSONObject(k);
intervals[k] = interval.getInt("value");
}
size_list.add(new Size(formatType, frameType, j, width, height, intervals));
} catch (final Exception e) {
break;
}
}
}

/**
* set preview surface with SurfaceHolder</br>
Expand Down
84 changes: 70 additions & 14 deletions lib/src/main/jni/UVCCamera/Parameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,12 @@ static const char *_uvc_name_for_format_subtype(uint8_t subtype) {
#define FRAME_CAPABILITIES "capabilities"
#define FRAME_WIDTH WIDTH
#define FRAME_HEIGHT HEIGHT
#define FRAME_DESC_SUBTYPE SUBTYPE
#define FRAME_BITRATE_MIN "minBitRate"
#define FRAME_BITRATE_MAX "maxBitRate"
#define FRAME_FRAMEBUFFERSIZE_MAX "maxFrameBufferSize"
#define FRAME_INTERVAL_DEFAULT "defaultFrameInterval"
#define FRAME_INTERVAL_TYPE "frameIntervalType"
#define FRAME_FPS_DEFAULT "defaultFps"
#define FRAME_INTERVALS "intervals"
#define FRAME_INTERVAL_INDEX INDEX
Expand Down Expand Up @@ -364,20 +366,74 @@ char *UVCDiags::getSupportedSize(const uvc_device_handle_t *deviceHandle) {
{
switch (fmt_desc->bDescriptorSubtype) {
case UVC_VS_FORMAT_UNCOMPRESSED:
case UVC_VS_FORMAT_MJPEG:
write(writer, "index", fmt_desc->bFormatIndex);
write(writer, "type", fmt_desc->bDescriptorSubtype);
write(writer, "default", fmt_desc->bDefaultFrameIndex);
writer.String("size");
writer.StartArray();
DL_FOREACH(fmt_desc->frame_descs, frame_desc)
{
snprintf(buf, sizeof(buf), "%dx%d", frame_desc->wWidth, frame_desc->wHeight);
buf[sizeof(buf)-1] = '\0';
writer.String(buf);
}
writer.EndArray();
break;
case UVC_VS_FORMAT_MJPEG:
write(writer, "index", fmt_desc->bFormatIndex);
write(writer, "type", fmt_desc->bDescriptorSubtype);
write(writer, "default", fmt_desc->bDefaultFrameIndex);
writer.String(FORMAT_FRAMEDESCRIPTORS);
writer.StartArray();
DL_FOREACH(fmt_desc->frame_descs, frame_desc) {
uint32_t *interval_ptr;

writer.StartObject();
write(writer, FRAME_WIDTH, frame_desc->wWidth);
write(writer, FRAME_HEIGHT, frame_desc->wHeight);
write(writer, FRAME_DESC_SUBTYPE, frame_desc->bDescriptorSubtype);
write(writer, FRAME_INTERVAL_DEFAULT, frame_desc->dwDefaultFrameInterval);
write(writer, FRAME_INTERVAL_TYPE, frame_desc->bFrameIntervalType);
write(writer, FRAME_FPS_DEFAULT, 10000000 / frame_desc->dwDefaultFrameInterval);

if (!frame_desc->bFrameIntervalType) {
// 最小fps
writer.String(FRAME_INTERVAL_MIN);
writer.StartObject();
{
write(writer, FRAME_INTERVAL_INDEX, frame_desc->dwMinFrameInterval);
write(writer, FRAME_INTERVAL_VALUE, frame_desc->dwMinFrameInterval);
write(writer, FRAME_INTERVAL_FPS,
10000000 / frame_desc->dwMinFrameInterval);
}
writer.EndObject();
// 最大fps
writer.String(FRAME_INTERVAL_MAX);
writer.StartObject();
{
write(writer, FRAME_INTERVAL_INDEX, frame_desc->dwMaxFrameInterval);
write(writer, FRAME_INTERVAL_VALUE, frame_desc->dwMaxFrameInterval);
write(writer, FRAME_INTERVAL_FPS,
10000000 / frame_desc->dwMaxFrameInterval);
}
writer.EndObject();
if (frame_desc->dwFrameIntervalStep) {
// fpsステップ
writer.String(FRAME_INTERVAL_STEP);
writer.StartObject();
{
write(writer, FRAME_INTERVAL_INDEX, frame_desc->dwFrameIntervalStep);
write(writer, FRAME_INTERVAL_VALUE, frame_desc->dwFrameIntervalStep);
write(writer, FRAME_INTERVAL_FPS,
10000000 / frame_desc->dwFrameIntervalStep);
}
writer.EndObject();
}
} else {
writer.String(FRAME_INTERVALS);
writer.StartArray();
for (interval_ptr = frame_desc->intervals; *interval_ptr; ++interval_ptr) {
writer.StartObject();
write(writer, FRAME_INTERVAL_INDEX,
(int) (interval_ptr - frame_desc->intervals));
write(writer, FRAME_INTERVAL_VALUE, *interval_ptr);
write(writer, FRAME_INTERVAL_FPS, 10000000 / *interval_ptr);
writer.EndObject();
}
writer.EndArray();
}

writer.EndObject();
}
writer.EndArray();
break;
default:
break;
}
Expand Down