From 835e7727e1d05190d550061cb8fc8cb2daa2283b Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 18 Jan 2016 19:44:59 +0100 Subject: [PATCH] Work around some false positives found by Coverity Scan. --- h264encode.cpp | 2 +- httpd.cpp | 1 + mixer.cpp | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/h264encode.cpp b/h264encode.cpp index c7fdeac..78e3447 100644 --- a/h264encode.cpp +++ b/h264encode.cpp @@ -1444,7 +1444,7 @@ void H264EncoderImpl::save_codeddata(storage_task task) string data; - const int64_t global_delay = (ip_period - 1) * (TIMEBASE / MAX_FPS); // So we never get negative dts. + const int64_t global_delay = int64_t(ip_period - 1) * (TIMEBASE / MAX_FPS); // So we never get negative dts. va_status = vaMapBuffer(va_dpy, gl_surfaces[task.display_order % SURFACE_NUM].coded_buf, (void **)(&buf_list)); CHECK_VASTATUS(va_status, "vaMapBuffer"); diff --git a/httpd.cpp b/httpd.cpp index 29923f9..3eda2a1 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -51,6 +51,7 @@ void HTTPD::open_output_file(const string &filename) { AVFormatContext *avctx = avformat_alloc_context(); avctx->oformat = av_guess_format(NULL, filename.c_str(), NULL); + assert(filename.size() < sizeof(avctx->filename) - 1); strcpy(avctx->filename, filename.c_str()); string url = "file:" + filename; diff --git a/mixer.cpp b/mixer.cpp index cfdb5b1..4b92041 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -256,7 +256,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, decode_video_format(video_format, &width, &height, &second_field_start, &extra_lines_top, &extra_lines_bottom, &frame_rate_nom, &frame_rate_den, &interlaced); // Ignore return value for now. - int64_t frame_length = TIMEBASE * frame_rate_den / frame_rate_nom; + int64_t frame_length = int64_t(TIMEBASE * frame_rate_den) / frame_rate_nom; size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0; if (num_samples > OUTPUT_FREQUENCY / 10) { @@ -510,6 +510,7 @@ void Mixer::thread_func() } // Resample the audio as needed, including from previously dropped frames. + assert(num_cards > 0); for (unsigned frame_num = 0; frame_num < card_copy[0].dropped_frames + 1; ++frame_num) { { // Signal to the audio thread to process this frame. @@ -784,6 +785,7 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) peak_resampler.process(); size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count; peak = max(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2)); + peak_resampler.out_data = nullptr; } // At this point, we are most likely close to +0 LU, but all of our -- 2.39.2