]> git.sesse.net Git - nageru/commitdiff
Work around some false positives found by Coverity Scan.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 18 Jan 2016 18:44:59 +0000 (19:44 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 18 Jan 2016 18:44:59 +0000 (19:44 +0100)
h264encode.cpp
httpd.cpp
mixer.cpp

index c7fdeac58d30f4d78c986e78e355ed10086cfce1..78e34474b80e07a397c41dbaf3a0cf70d1807a3d 100644 (file)
@@ -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");
index 29923f9430413ee5dec3175e0aaae42a7f257cf1..3eda2a1e34b5d9fc7e62479d6a53ffe9612e3679 100644 (file)
--- 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;
index cfdb5b190b1b25f828227d6b59fdc8fe9eeda455..4b92041396bb896f67fa806c171d5edc7340c88b 100644 (file)
--- 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<float>(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