utils: fix compilation with C++98
PATCH 1/5 utils: fix compilation with C++98
--- utils/cec-compliance/cec-test.cpp | 4 ++-- utils/rds-ctl/rds-ctl.cpp | 2 +- utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
utils/cec-compliance/cec-test.cpp +2 -2
@@ -908,7 +908,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out_or_abort(&msg)); - info = {}; + memset(&info, 0, sizeof(info)); cec_ops_tuner_device_status(&msg, &info); if (!memcmp(&info, &info_vec[0], sizeof(info))) break;
@@ -935,7 +935,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out_or_abort(&msg)); - info = {}; + memset(&info, 0, sizeof(info)); cec_ops_tuner_device_status(&msg, &info); if (memcmp(&info, &(*iter), sizeof(info))) { log_tuner_service(info);
utils/rds-ctl/rds-ctl.cpp +1 -1
@@ -918,7 +918,7 @@ static void get_options(const int fd, const int capabilities, struct v4l2_freque printf("\tFrequency range : %.1f MHz - %.1f MHz\n", vt.rangelow / 16.0, vt.rangehigh / 16.0); printf("\tSignal strength/AFC : %ld%%/%d\n", - std::lround(vt.signal / 655.35), vt.afc); + lround(vt.signal / 655.25), vt.afc); printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str());
utils/v4l2-ctl/v4l2-ctl-tuner.cpp +1 -1
@@ -423,7 +423,7 @@ void tuner_get(cv4l_fd &_fd) if (vt.type != V4L2_TUNER_SDR && vt.type != V4L2_TUNER_RF) { printf("\tSignal strength/AFC : %ld%%/%d\n", - std::lround(vt.signal / 655.35), vt.afc); + lround(vt.signal / 655.35), vt.afc); printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str()); }
Signature · 1 line
2.25.3
PATCH 2/5 utils: add noreturn attribute and remove dead code
Found with -Wmissing-noreturn and -Wunreachable-code-return
--- utils/v4l2-compliance/v4l2-compliance.cpp | 10 +++++----- utils/v4l2-dbg/v4l2-dbg.cpp | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-)
utils/v4l2-compliance/v4l2-compliance.cpp +5 -5
@@ -247,7 +247,6 @@ static void usage() printf(" -w, --wrapper Use the libv4l2 wrapper library.\n"); #endif printf(" -W, --exit-on-warn Exit on the first warning.\n"); - exit(0); } const char *ok(int res)
@@ -482,6 +481,7 @@ static void restoreState() node->reopen(); } +__attribute__((noreturn)) static void signal_handler_interrupt(int signum) { restoreState();
@@ -1544,7 +1544,7 @@ int main(int argc, char **argv) switch (ch) { case OptHelp: usage(); - return 0; + exit(0); case OptSetDevice: device = make_devname(optarg, "video", media_bus_info); break;
@@ -1669,13 +1669,13 @@ int main(int argc, char **argv) fprintf(stderr, "Option `%s' requires a value\n", argv[optind]); usage(); - return 1; + exit(1); case '?': if (argv[optind]) fprintf(stderr, "Unknown argument `%s'\n", argv[optind]); usage(); - return 1; + exit(1); } } if (optind < argc) {
@@ -1684,7 +1684,7 @@ int main(int argc, char **argv) fprintf(stderr, "%s ", argv[optind++]); fprintf(stderr, "\n"); usage(); - return 1; + exit(1); } bool direct = !options[OptUseWrapper]; int fd;
utils/v4l2-dbg/v4l2-dbg.cpp +2 -3
@@ -187,7 +187,6 @@ static void usage() " Sets step between two registers\n" " --list-symbols List the symbolic register names you can use, if any\n" " --log-status Log the board status in the kernel log [VIDIOC_LOG_STATUS]\n"); - exit(0); } static std::string cap2s(unsigned cap)
@@ -429,7 +428,7 @@ int main(int argc, char **argv) if (argc == 1) { usage(); - return 0; + exit(0); } for (i = 0; long_options[i].name; i++) { if (!isalpha(long_options[i].val))
@@ -467,7 +466,7 @@ int main(int argc, char **argv) switch (ch) { case OptHelp: usage(); - return 0; + exit(0); case OptSetDevice: device = optarg;
Signature · 1 line
2.25.3
PATCH 3/5 utils: fix implicit float conversions
In reply to Rosen PenevFound with -Wfloat-conversion
--- utils/cec-ctl/cec-ctl.cpp | 4 ++-- utils/cec-ctl/cec-pin.cpp | 2 +- utils/v4l2-compliance/v4l2-test-buffers.cpp | 2 +- utils/v4l2-ctl/v4l2-ctl-misc.cpp | 4 ++-- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 2 +- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
utils/cec-ctl/cec-ctl.cpp +2 -2
@@ -1507,8 +1507,8 @@ static void stress_test_power_cycle(struct node &node, unsigned cnt, srandom(seed); for (;;) { - unsigned usecs1 = mod_usleep ? random() % mod_usleep : sleep_before_on * 1000000; - unsigned usecs2 = mod_usleep ? random() % mod_usleep : sleep_before_off * 1000000; + unsigned usecs1 = mod_usleep ? random() % mod_usleep : static_cast<unsigned>(sleep_before_on * 1000000); + unsigned usecs2 = mod_usleep ? random() % mod_usleep : static_cast<unsigned>(sleep_before_off * 1000000); usecs1 += min_usleep; usecs2 += min_usleep;
utils/cec-ctl/cec-pin.cpp +1 -1
@@ -261,7 +261,7 @@ static void cec_pin_rx_data_bit_was_low(__u64 ev_ts, __u64 usecs, __u64 usecs_mi * If the low drive starts at the end of a 0 bit, then the actual * maximum time that the bus can be low is the two summed. */ - const unsigned max_low_drive = CEC_TIM_LOW_DRIVE_ERROR_MAX + + const unsigned max_low_drive = static_cast<unsigned>(CEC_TIM_LOW_DRIVE_ERROR_MAX) + CEC_TIM_DATA_BIT_0_LOW_MAX + CEC_TIM_MARGIN; low_usecs = usecs;
utils/v4l2-compliance/v4l2-test-buffers.cpp +1 -1
@@ -2597,7 +2597,7 @@ static void streamFmt(struct node *node, __u32 pixelformat, __u32 w, __u32 h, char hz[32] = ""; if (!frame_count) - frame_count = f ? 1.0 / fract2f(f) : 10; + frame_count = f ? static_cast<unsigned>(1.0f / fract2f(f)) : 10; node->g_fmt(fmt); fmt.s_pixelformat(pixelformat); fmt.s_width(w);
utils/v4l2-ctl/v4l2-ctl-misc.cpp +2 -2
@@ -320,7 +320,7 @@ void misc_set(cv4l_fd &_fd) parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; parm.parm.capture.timeperframe.numerator = 1000; parm.parm.capture.timeperframe.denominator = - fps * parm.parm.capture.timeperframe.numerator; + static_cast<uint32_t>(fps * parm.parm.capture.timeperframe.numerator); if (doioctl(fd, VIDIOC_S_PARM, &parm) == 0) { struct v4l2_fract *tf = &parm.parm.capture.timeperframe;
@@ -338,7 +338,7 @@ void misc_set(cv4l_fd &_fd) parm.type = V4L2_BUF_TYPE_VIDEO_OUTPUT; parm.parm.output.timeperframe.numerator = 1000; parm.parm.output.timeperframe.denominator = - output_fps * parm.parm.output.timeperframe.numerator; + static_cast<uint32_t>(output_fps * parm.parm.output.timeperframe.numerator); if (doioctl(fd, VIDIOC_S_PARM, &parm) == 0) { struct v4l2_fract *tf = &parm.parm.output.timeperframe;
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +1 -1
@@ -569,7 +569,7 @@ static void print_concise_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, if (!skip_ts && (buf.g_flags() & V4L2_BUF_FLAG_TIMESTAMP_MASK) != V4L2_BUF_FLAG_TIMESTAMP_COPY) { double ts = buf.g_timestamp().tv_sec + buf.g_timestamp().tv_usec / 1000000.0; fprintf(f, " ts: %.06f", ts); - if (last_ts) + if (last_ts <= 0.0) fprintf(f, " delta: %.03f ms", (ts - last_ts) * 1000.0); last_ts = ts;
utils/v4l2-ctl/v4l2-ctl-subdev.cpp +1 -1
@@ -487,7 +487,7 @@ void subdev_set(cv4l_fd &_fd) exit(1); } fival.interval.numerator = 1000; - fival.interval.denominator = set_fps * fival.interval.numerator; + fival.interval.denominator = static_cast<uint32_t>(set_fps * fival.interval.numerator); printf("Note: --set-subdev-fps is only for testing.\n" "Normally media-ctl is used to configure the video pipeline.\n"); printf("ioctl: VIDIOC_SUBDEV_S_FRAME_INTERVAL (pad=%u)\n", fival.pad);
Signature · 1 line
2.25.3
PATCH 4/5 utils: fix fallthrough warnings
In reply to Rosen PenevComments are not enough for clang. Changed to use the C++ attribute.
Found with -Wimplicit-fallthrough
--- include/compiler.h | 9 +++++++++ utils/cec-compliance/cec-compliance.cpp | 2 ++ utils/cec-ctl/cec-ctl.cpp | 3 ++- utils/cec-follower/cec-follower.cpp | 2 ++ utils/cec-follower/cec-processing.cpp | 4 +++- utils/cec-follower/cec-tuner.cpp | 7 ++++--- utils/libcecutil/cec-log.cpp | 3 ++- utils/v4l2-compliance/v4l2-test-colors.cpp | 12 +++++++----- utils/v4l2-compliance/v4l2-test-controls.cpp | 12 +++++++----- utils/v4l2-compliance/v4l2-test-formats.cpp | 6 ++++-- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 5 +++-- utils/v4l2-ctl/v4l2-ctl-vbi.cpp | 5 +++-- 12 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 include/compiler.h
include/compiler.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifdef __cplusplus + +#ifdef __clang__ +#define fallthrough [[clang::fallthrough]] +#else +#define fallthrough [[gnu::fallthrough]] +#endif + +#endif
utils/cec-compliance/cec-compliance.cpp +2 -0
@@ -20,6 +20,7 @@ #include <sstream> #include "cec-compliance.h" +#include "compiler.h" #ifndef ANDROID #include "version.h" #endif
@@ -486,6 +487,7 @@ void sad_decode(struct short_audio_desc *sad, __u32 descriptor) case SAD_EXT_TYPE_MPEG_H_3D_AUDIO: case SAD_EXT_TYPE_AC_4: sad->format_dependent = b3 & 0x07; + fallthrough; case SAD_EXT_TYPE_LPCM_3D_AUDIO: sad->bit_depth_mask = b3 & 0x07; break;
utils/cec-ctl/cec-ctl.cpp +2 -1
@@ -36,6 +36,7 @@ #endif #include "cec-ctl.h" +#include "compiler.h" static struct timespec start_monotonic; static struct timeval start_timeofday;
@@ -1967,7 +1968,7 @@ int main(int argc, char **argv) break; case OptPhysAddrFromEDIDPoll: edid_path = optarg; - /* fall-through */ + fallthrough; case OptPhysAddrFromEDID: phys_addr = parse_phys_addr_from_edid(optarg); break;
utils/cec-follower/cec-follower.cpp +2 -0
@@ -19,6 +19,7 @@ #include <sstream> #include "cec-follower.h" +#include "compiler.h" #ifndef ANDROID #include "version.h" #endif
@@ -142,6 +143,7 @@ void sad_encode(const struct short_audio_desc *sad, __u32 *descriptor) case SAD_EXT_TYPE_MPEG_H_3D_AUDIO: case SAD_EXT_TYPE_AC_4: b3 |= sad->format_dependent & 0x07; + fallthrough; case SAD_EXT_TYPE_LPCM_3D_AUDIO: b3 |= sad->bit_depth_mask & 0x07; break;
utils/cec-follower/cec-processing.cpp +3 -1
@@ -18,6 +18,7 @@ #include <config.h> #include "cec-follower.h" +#include "compiler.h" #define VOLUME_MAX 0x64 #define VOLUME_MIN 0
@@ -352,7 +353,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) if (cec_has_tv(1 << la) && la_info[la].phys_addr == 0) warn("TV (0) at 0.0.0.0 sent Routing Information."); } - + fallthrough; /* System Information */
@@ -708,6 +709,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) cec_msg_system_audio_mode_status(&msg, node->state.sac_active ? CEC_OP_SYS_AUD_STATUS_ON : CEC_OP_SYS_AUD_STATUS_OFF); transmit(node, &msg); + fallthrough; case CEC_MSG_GIVE_AUDIO_STATUS: if (!cec_has_audiosystem(1 << me)) break;
utils/cec-follower/cec-tuner.cpp +4 -3
@@ -7,6 +7,7 @@ #include <stdlib.h> #include "cec-follower.h" +#include "compiler.h" #define NUM_ANALOG_FREQS 3 #define NUM_DIGITAL_CHANS 3
@@ -303,21 +304,21 @@ static int digital_get_service_idx(struct cec_op_digital_service_id *digital) switch (digital->dig_bcast_system) { case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ARIB_T: is_terrestrial = true; - /* fall through */ + fallthrough; case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ARIB_BS: info = &digital_arib_data[is_terrestrial][0]; offset = is_terrestrial * NUM_DIGITAL_CHANS; break; case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_T: is_terrestrial = true; - /* fall through */ + fallthrough; case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_SAT: info = &digital_atsc_data[is_terrestrial][0]; offset = (2 + is_terrestrial) * NUM_DIGITAL_CHANS; break; case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_DVB_T: is_terrestrial = true; - /* fall through */ + fallthrough; case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_DVB_S2: info = &digital_dvb_data[is_terrestrial][0]; offset = (4 + is_terrestrial) * NUM_DIGITAL_CHANS;
utils/libcecutil/cec-log.cpp +2 -1
@@ -14,6 +14,7 @@ #include "cec-htng-funcs.h" #include "cec-info.h" #include "cec-log.h" +#include "compiler.h" static const struct cec_arg arg_u8 = { CEC_ARG_TYPE_U8,
@@ -44,7 +45,7 @@ static void log_arg(const struct cec_arg *arg, const char *arg_name, __u32 val) return; } } - /* fall through */ + fallthrough; case CEC_ARG_TYPE_U8: if (!strcmp(arg_name, "video-latency") || !strcmp(arg_name, "audio-out-delay")) {
utils/v4l2-compliance/v4l2-test-colors.cpp +7 -5
@@ -28,6 +28,8 @@ #include <sys/ioctl.h> #include <sys/time.h> #include <math.h> + +#include "compiler.h" #include "v4l2-compliance.h" static void setupPlanes(const cv4l_fmt &fmt, __u8 *planes[3])
@@ -328,7 +330,7 @@ static void getColor(const cv4l_fmt &fmt, __u8 * const planes[3], case V4L2_PIX_FMT_RGBA444: case V4L2_PIX_FMT_BGRA444: c.a = (v16 >> 12) / 15.0; - /* fall through */ + fallthrough; case V4L2_PIX_FMT_RGB444: case V4L2_PIX_FMT_XRGB444: case V4L2_PIX_FMT_XBGR444:
@@ -345,7 +347,7 @@ static void getColor(const cv4l_fmt &fmt, __u8 * const planes[3], case V4L2_PIX_FMT_ABGR555: case V4L2_PIX_FMT_BGRA555: c.a = v16 >> 15; - /* fall through */ + fallthrough; case V4L2_PIX_FMT_YUV555: case V4L2_PIX_FMT_RGB555: case V4L2_PIX_FMT_XRGB555:
@@ -376,7 +378,7 @@ static void getColor(const cv4l_fmt &fmt, __u8 * const planes[3], case V4L2_PIX_FMT_RGBA32: case V4L2_PIX_FMT_BGRA32: c.a = ((v32 >> 24) & 0xff) / 255.0; - /* fall through */ + fallthrough; default: c.r = ((v32 >> 16) & 0xff) / 255.0; c.g = ((v32 >> 8) & 0xff) / 255.0;
@@ -444,7 +446,7 @@ static void getColor(const cv4l_fmt &fmt, __u8 * const planes[3], Y = (Y - 16.0 / 255.0) * 255.0 / 219.0; cb *= 255.0 / 224.0; cr *= 255.0 / 224.0; - /* fall through */ + fallthrough; case V4L2_YCBCR_ENC_601: default: ycbcr2rgb(bt601, Y, cb, cr, c);
@@ -453,7 +455,7 @@ static void getColor(const cv4l_fmt &fmt, __u8 * const planes[3], Y = (Y - 16.0 / 255.0) * 255.0 / 219.0; cb *= 255.0 / 224.0; cr *= 255.0 / 224.0; - /* fall through */ + fallthrough; case V4L2_YCBCR_ENC_709: ycbcr2rgb(rec709, Y, cb, cr, c); break;
utils/v4l2-compliance/v4l2-test-controls.cpp +7 -5
@@ -30,6 +30,8 @@ #include <errno.h> #include <sys/ioctl.h> #include <vector> + +#include "compiler.h" #include "v4l2-compliance.h" #define V4L2_CTRL_CLASS_VIVID 0x00f00000
@@ -61,20 +63,20 @@ static int checkQCtrl(struct node *node, struct test_query_ext_ctrl &qctrl) case V4L2_CTRL_TYPE_BOOLEAN: if (qctrl.maximum > 1) return fail("invalid boolean max value\n"); - /* fall through */ + fallthrough; case V4L2_CTRL_TYPE_MENU: case V4L2_CTRL_TYPE_INTEGER_MENU: if (qctrl.step != 1) return fail("invalid step value %lld\n", qctrl.step); if (qctrl.minimum < 0) return fail("min < 0\n"); - /* fall through */ + fallthrough; case V4L2_CTRL_TYPE_INTEGER: case V4L2_CTRL_TYPE_INTEGER64: if (qctrl.default_value < qctrl.minimum || qctrl.default_value > qctrl.maximum) return fail("def < min || def > max\n"); - /* fall through */ + fallthrough; case V4L2_CTRL_TYPE_STRING: if (qctrl.minimum > qctrl.maximum) return fail("min > max\n");
@@ -116,7 +118,7 @@ static int checkQCtrl(struct node *node, struct test_query_ext_ctrl &qctrl) case V4L2_CTRL_TYPE_BUTTON: if ((fl & rw_mask) != V4L2_CTRL_FLAG_WRITE_ONLY) return fail("button control not write only\n"); - /* fall through */ + fallthrough; case V4L2_CTRL_TYPE_BOOLEAN: case V4L2_CTRL_TYPE_MENU: case V4L2_CTRL_TYPE_INTEGER_MENU:
@@ -124,7 +126,7 @@ static int checkQCtrl(struct node *node, struct test_query_ext_ctrl &qctrl) case V4L2_CTRL_TYPE_BITMASK: if (fl & V4L2_CTRL_FLAG_SLIDER) return fail("slider makes only sense for integer controls\n"); - /* fall through */ + fallthrough; case V4L2_CTRL_TYPE_INTEGER64: case V4L2_CTRL_TYPE_INTEGER: if ((fl & rw_mask) == rw_mask)
utils/v4l2-compliance/v4l2-test-formats.cpp +4 -2
@@ -30,6 +30,8 @@ #include <errno.h> #include <sys/ioctl.h> #include <assert.h> + +#include "compiler.h" #include "v4l2-compliance.h" static const __u32 buftype2cap[] = {
@@ -97,7 +99,7 @@ static int testEnumFrameIntervals(struct node *node, __u32 pixfmt, case V4L2_FRMIVAL_TYPE_CONTINUOUS: if (sw->step.numerator != 1 || sw->step.denominator != 1) return fail("invalid step for continuous frameinterval\n"); - /* fallthrough */ + fallthrough; case V4L2_FRMIVAL_TYPE_STEPWISE: if (frmival.index) return fail("index must be 0 for stepwise/continuous frameintervals\n");
@@ -183,7 +185,7 @@ static int testEnumFrameSizes(struct node *node, __u32 pixfmt) case V4L2_FRMSIZE_TYPE_CONTINUOUS: if (frmsize.stepwise.step_width != 1 || frmsize.stepwise.step_height != 1) return fail("invalid step_width/height for continuous framesize\n"); - /* fallthrough */ + fallthrough; case V4L2_FRMSIZE_TYPE_STEPWISE: if (frmsize.index) return fail("index must be 0 for stepwise/continuous framesizes\n");
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +3 -2
@@ -19,6 +19,7 @@ #include <math.h> #include <linux/media.h> +#include "compiler.h" #include "v4l2-ctl.h" #include "v4l-stream.h" #include <media-info.h>
@@ -763,7 +764,7 @@ void streaming_cmd(int ch, char *optarg) break; case OptStreamUser: memory = V4L2_MEMORY_USERPTR; - /* fall through */ + fallthrough; case OptStreamMmap: if (optarg) { reqbufs_count_cap = strtoul(optarg, 0L, 0);
@@ -776,7 +777,7 @@ void streaming_cmd(int ch, char *optarg) break; case OptStreamOutUser: out_memory = V4L2_MEMORY_USERPTR; - /* fall through */ + fallthrough; case OptStreamOutMmap: if (optarg) { reqbufs_count_out = strtoul(optarg, 0L, 0);
utils/v4l2-ctl/v4l2-ctl-vbi.cpp +3 -2
@@ -14,6 +14,7 @@ #include <dirent.h> #include <math.h> +#include "compiler.h" #include "v4l2-ctl.h" static struct v4l2_format sliced_fmt; /* set_format/get_format for sliced VBI */
@@ -87,7 +88,7 @@ void vbi_cmd(int ch, char *optarg) case OptSetSlicedVbiOutFormat: case OptTrySlicedVbiOutFormat: sliced = &sliced_fmt_out; - /* fall through */ + fallthrough; case OptSetSlicedVbiFormat: case OptTrySlicedVbiFormat: sliced->fmt.sliced.service_set = 0;
@@ -130,7 +131,7 @@ void vbi_cmd(int ch, char *optarg) case OptSetVbiOutFormat: case OptTryVbiOutFormat: raw = &raw_fmt_out; - /* fall through */ + fallthrough; case OptSetVbiFormat: case OptTryVbiFormat: subs = optarg;
Signature · 1 line
2.25.3
PATCH 5/5 utils: fix double promotions
In reply to Rosen PenevFound with -Wdouble-promotion
--- utils/rds-ctl/rds-ctl.cpp | 4 ++-- utils/v4l2-compliance/v4l2-test-buffers.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
utils/rds-ctl/rds-ctl.cpp +2 -2
@@ -521,7 +521,7 @@ static void print_rds_statistics(const struct v4l2_rds_statistics *statistics) printf("received blocks / received groups: %u / %u\n", statistics->block_cnt, statistics->group_cnt); - float block_error_percentage = 0; + double block_error_percentage = 0; if (statistics->block_cnt) block_error_percentage =
@@ -530,7 +530,7 @@ static void print_rds_statistics(const struct v4l2_rds_statistics *statistics) statistics->block_error_cnt, block_error_percentage, statistics->group_error_cnt); - float block_corrected_percentage = 0; + double block_corrected_percentage = 0; if (statistics->block_cnt) block_corrected_percentage = (
utils/v4l2-compliance/v4l2-test-buffers.cpp +1 -1
@@ -2597,7 +2597,7 @@ static void streamFmt(struct node *node, __u32 pixelformat, __u32 w, __u32 h, char hz[32] = ""; if (!frame_count) - frame_count = f ? static_cast<unsigned>(1.0f / fract2f(f)) : 10; + frame_count = f ? static_cast<unsigned>(1.0 / fract2f(f)) : 10; node->g_fmt(fmt); fmt.s_pixelformat(pixelformat); fmt.s_width(w);
Signature · 1 line
2.25.3
HI Rosen,
Quoted 8 lines · Rosen Penev
Signed-off-by Rosen Penev <[email protected]>--- utils/cec-compliance/cec-test.cpp | 4 ++-- utils/rds-ctl/rds-ctl.cpp | 2 +- utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
First of all, thanks for the patch!
One question: In what case this file would end up being compiled in the C++98 mode?
Also, please see a comment inline.
Quoted 27 lines
utils/cec-compliance/cec-test.cpp +2
-2@@ -908,7 +908,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out_or_abort(&msg)); - info = {}; + memset(&info, 0, sizeof(info)); cec_ops_tuner_device_status(&msg, &info); if (!memcmp(&info, &info_vec[0], sizeof(info))) break;@@ -935,7 +935,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out_or_abort(&msg)); - info = {}; + memset(&info, 0, sizeof(info)); cec_ops_tuner_device_status(&msg, &info); if (memcmp(&info, &(*iter), sizeof(info))) { log_tuner_service(info);utils/rds-ctl/rds-ctl.cpp +0
-0
utils/rds-ctl/rds-ctl.cpp static void get_options(const int fd, const int capabilities, struct v4l2_freque · line 921
Quoted 5 lines
utils/rds-ctl/rds-ctl.cpp +1
-1@@ -918,7 +918,7 @@ static void get_options(const int fd, const int capabilities, struct v4l2_freque printf("\tFrequency range : %.1f MHz - %.1f MHz\n", vt.rangelow / 16.0, vt.rangehigh / 16.0); printf("\tSignal strength/AFC : %ld%%/%d\n", - std::lround(vt.signal / 655.35), vt.afc); + lround(vt.signal / 655.25), vt.afc);
Why the change from .35 to .25?
Best regards,
Tomasz
Quoted 19 lines
utils/rds-ctl/rds-ctl.cpp +0
-0printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str());utils/v4l2-ctl/v4l2-ctl-tuner.cpp +1
-2@@ -423,7 +423,7 @@ void tuner_get(cv4l_fd &_fd) if (vt.type != V4L2_TUNER_SDR && vt.type != V4L2_TUNER_RF) { printf("\tSignal strength/AFC : %ld%%/%d\n", - std::lround(vt.signal / 655.35), vt.afc); + lround(vt.signal / 655.35), vt.afc); printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str()); } --2.25.3
Quoted 16 lines · Tomasz Figa
HI Rosen,
Quoted 9 lines · Rosen Penev
Signed-off-by Rosen Penev <[email protected]>---
utils/cec-compliance/cec-test.cpp | 4 ++-- utils/rds-ctl/rds-ctl.cpp | 2 +- utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
Quoted 4 lines
First of all, thanks for the patch!
One question: In what case this file would end up being compiled in the C++98 mode?
-std=c++98 , using uClibc++.
Quoted 29 lines
Also, please see a comment inline.
Quoted 26 lines
utils/cec-compliance/cec-test.cpp +2
-2@@ -908,7 +908,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out_or_abort(&msg)); - info = {}; + memset(&info, 0, sizeof(info)); cec_ops_tuner_device_status(&msg, &info); if (!memcmp(&info, &info_vec[0], sizeof(info))) break;@@ -935,7 +935,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte cec_msg_give_tuner_device_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out_or_abort(&msg)); - info = {}; + memset(&info, 0, sizeof(info)); cec_ops_tuner_device_status(&msg, &info); if (memcmp(&info, &(*iter), sizeof(info))) { log_tuner_service(info);utils/rds-ctl/rds-ctl.cpp +0
-0
Quoted 8 lines
utils/rds-ctl/rds-ctl.cpp static void get_options(const int fd, const int capabilities, struct v4l2_freque · line 921
Quoted 6 lines
utils/rds-ctl/rds-ctl.cpp +1
-1@@ -918,7 +918,7 @@ static void get_options(const int fd, const int capabilities, struct v4l2_freque printf("\tFrequency range : %.1f MHz - %.1f MHz\n", vt.rangelow / 16.0, vt.rangehigh / 16.0); printf("\tSignal strength/AFC : %ld%%/%d\n", - std::lround(vt.signal / 655.35), vt.afc); + lround(vt.signal / 655.25), vt.afc);Why the change from .35 to .25?
This looks like a mistake.
Quoted 23 lines
Best regards,
TomaszQuoted 19 lines
utils/rds-ctl/rds-ctl.cpp +0
-0printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str());utils/v4l2-ctl/v4l2-ctl-tuner.cpp +1
-2@@ -423,7 +423,7 @@ void tuner_get(cv4l_fd &_fd) if (vt.type != V4L2_TUNER_SDR && vt.type != V4L2_TUNER_RF) { printf("\tSignal strength/AFC : %ld%%/%d\n", - std::lround(vt.signal / 655.35), vt.afc); + lround(vt.signal / 655.35), vt.afc); printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str()); } --2.25.3