diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-20 11:38:35 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-20 11:38:35 +0100 |
| commit | 2a3734eea927c02985fd33e502f07915a09dd6b9 (patch) | |
| tree | da868581fb80853838a11a1dcec6ee51367103ae | |
| parent | 490ef938d4f41f154309c1d05675430771bf517d (diff) | |
| download | mediapointer-dvb-s2-2a3734eea927c02985fd33e502f07915a09dd6b9.tar.gz mediapointer-dvb-s2-2a3734eea927c02985fd33e502f07915a09dd6b9.tar.bz2 | |
v4l2-apps: clean up the output for g_jpegcomp a bit.
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 6e80345f5..dec9edd61 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -770,28 +770,28 @@ static std::string markers2s(unsigned markers) std::string s; if (markers & V4L2_JPEG_MARKER_DHT) - s += "\t\t\tDefine Huffman Tables\n"; + s += "\t\tDefine Huffman Tables\n"; if (markers & V4L2_JPEG_MARKER_DQT) - s += "\t\t\tDefine Quantization Tables\n"; + s += "\t\tDefine Quantization Tables\n"; if (markers & V4L2_JPEG_MARKER_DRI) - s += "\t\t\tDefine Restart Interval\n"; + s += "\t\tDefine Restart Interval\n"; if (markers & V4L2_JPEG_MARKER_COM) - s += "\t\t\tDefine Comment\n"; + s += "\t\tDefine Comment\n"; if (markers & V4L2_JPEG_MARKER_APP) - s += "\t\t\tDefine APP segment\n"; - if (s.empty()) s += "\t\t\t\n"; + s += "\t\tDefine APP segment\n"; return s; } static void printjpegcomp(const struct v4l2_jpegcompression &jc) { printf("JPEG compression:\n"); - printf("\tQuality : %d\n", jc.quality); + printf("\tQuality: %d\n", jc.quality); if (jc.COM_len) - printf("\tComment : '%s'\n", jc.COM_data); + printf("\tComment: '%s'\n", jc.COM_data); if (jc.APP_len) - printf("\tAPP%x : '%s'\n", jc.APPn, jc.APP_data); - printf("\tMarkers : %s", markers2s(jc.jpeg_markers).c_str() + 3); + printf("\tAPP%x : '%s'\n", jc.APPn, jc.APP_data); + printf("\tMarkers: 0x%08lx\n", jc.jpeg_markers); + printf("%s", markers2s(jc.jpeg_markers).c_str()); } static void printcrop(const struct v4l2_crop &crop) |