From e4e67249d12e3343f576c3a0c71ec7c2f1bdd931 Mon Sep 17 00:00:00 2001 From: philippegorley <philippe.gorley@savoirfairelinux.com> Date: Thu, 2 Mar 2017 14:09:07 -0500 Subject: [PATCH] video: fix coverity scans issues in video accel Change-Id: Ibc239cfca4eb96e115080f57184768625b3e800f Tuleap: #1524 --- src/media/video/accel.h | 2 +- src/media/video/v4l2/vaapi.cpp | 2 +- src/media/video/v4l2/vaapi.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/media/video/accel.h b/src/media/video/accel.h index 486b605022..9cbd94c42b 100644 --- a/src/media/video/accel.h +++ b/src/media/video/accel.h @@ -56,7 +56,7 @@ class HardwareAccel { virtual void extractData(VideoFrame& input, VideoFrame& output) = 0; protected: - AVCodecContext* codecCtx_; + AVCodecContext* codecCtx_ = nullptr; std::string name_; AVPixelFormat format_; unsigned failCount_ = 0; // how many failures in a row, reset on success diff --git a/src/media/video/v4l2/vaapi.cpp b/src/media/video/v4l2/vaapi.cpp index 023cc1c4d2..cfbb4e320e 100644 --- a/src/media/video/v4l2/vaapi.cpp +++ b/src/media/video/v4l2/vaapi.cpp @@ -142,7 +142,7 @@ VaapiAccel::init() return false; } - VAProfile codecProfile; + VAProfile codecProfile = VAProfileNone; auto itOuter = profileMap.find(codecCtx_->codec_id); if (itOuter != profileMap.end()) { auto innerMap = itOuter->second; diff --git a/src/media/video/v4l2/vaapi.h b/src/media/video/v4l2/vaapi.h index 150a7a46c8..c783d31e47 100644 --- a/src/media/video/v4l2/vaapi.h +++ b/src/media/video/v4l2/vaapi.h @@ -71,12 +71,12 @@ class VaapiAccel : public HardwareAccel { AVBufferRefPtr deviceBufferRef_; AVBufferRefPtr framesBufferRef_; - VAProfile vaProfile_; - VAEntrypoint vaEntryPoint_; - VAConfigID vaConfig_; - VAContextID vaContext_; + VAProfile vaProfile_ = VAProfileNone; + VAEntrypoint vaEntryPoint_ = VAEntrypointVLD; + VAConfigID vaConfig_ = -1; + VAContextID vaContext_ = -1; - struct vaapi_context ffmpegAccelCtx_; + struct vaapi_context ffmpegAccelCtx_ = {}; std::string deviceName_; }; -- GitLab