Commit 079711fb authored by stevenjb's avatar stevenjb Committed by Commit bot

Clang fixes for chromeos

This fixes clang builds with the simple chrome workflow:
cros chrome-sdk --board=link --clang

Unfortunately there are not currently any builders with this
configuration.

BUG=462767

Review URL: https://codereview.chromium.org/967693002

Cr-Commit-Position: refs/heads/master@{#318977}
parent 3a0ea5d0
...@@ -35,7 +35,7 @@ class GenericV4L2Device : public V4L2Device { ...@@ -35,7 +35,7 @@ class GenericV4L2Device : public V4L2Device {
gfx::Size frame_buffer_size, gfx::Size frame_buffer_size,
unsigned int buffer_index, unsigned int buffer_index,
uint32_t v4l2_pixfmt, uint32_t v4l2_pixfmt,
size_t num_v4l2_planes); size_t num_v4l2_planes) override;
EGLBoolean DestroyEGLImage(EGLDisplay egl_display, EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
EGLImageKHR egl_image) override; EGLImageKHR egl_image) override;
GLenum GetTextureTarget() override; GLenum GetTextureTarget() override;
......
...@@ -1269,6 +1269,10 @@ H264Decoder::DecodeResult H264Decoder::Decode() { ...@@ -1269,6 +1269,10 @@ H264Decoder::DecodeResult H264Decoder::Decode() {
} }
} }
gfx::Size H264Decoder::GetPicSize() const {
return pic_size_;
}
size_t H264Decoder::GetRequiredNumOfPictures() const { size_t H264Decoder::GetRequiredNumOfPictures() const {
return dpb_.max_num_pics() + kPicsInPipeline; return dpb_.max_num_pics() + kPicsInPipeline;
} }
......
...@@ -105,7 +105,7 @@ class CONTENT_EXPORT H264Decoder : public AcceleratedVideoDecoder { ...@@ -105,7 +105,7 @@ class CONTENT_EXPORT H264Decoder : public AcceleratedVideoDecoder {
void Reset() override; void Reset() override;
void SetStream(const uint8_t* ptr, size_t size) override; void SetStream(const uint8_t* ptr, size_t size) override;
DecodeResult Decode() override WARN_UNUSED_RESULT; DecodeResult Decode() override WARN_UNUSED_RESULT;
gfx::Size GetPicSize() const override { return pic_size_; } gfx::Size GetPicSize() const override;
size_t GetRequiredNumOfPictures() const override; size_t GetRequiredNumOfPictures() const override;
private: private:
......
...@@ -240,7 +240,7 @@ class V4L2SliceVideoDecodeAccelerator::V4L2H264Accelerator ...@@ -240,7 +240,7 @@ class V4L2SliceVideoDecodeAccelerator::V4L2H264Accelerator
: public H264Decoder::H264Accelerator { : public H264Decoder::H264Accelerator {
public: public:
V4L2H264Accelerator(V4L2SliceVideoDecodeAccelerator* v4l2_dec); V4L2H264Accelerator(V4L2SliceVideoDecodeAccelerator* v4l2_dec);
virtual ~V4L2H264Accelerator() override; ~V4L2H264Accelerator() override;
// H264Decoder::H264Accelerator implementation. // H264Decoder::H264Accelerator implementation.
scoped_refptr<H264Picture> CreateH264Picture() override; scoped_refptr<H264Picture> CreateH264Picture() override;
...@@ -322,7 +322,6 @@ class V4L2H264Picture : public H264Picture { ...@@ -322,7 +322,6 @@ class V4L2H264Picture : public H264Picture {
public: public:
V4L2H264Picture(const scoped_refptr< V4L2H264Picture(const scoped_refptr<
V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>& dec_surface); V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>& dec_surface);
virtual ~V4L2H264Picture() override;
V4L2H264Picture* AsV4L2H264Picture() override { return this; } V4L2H264Picture* AsV4L2H264Picture() override { return this; }
scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface> scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>
...@@ -331,6 +330,8 @@ class V4L2H264Picture : public H264Picture { ...@@ -331,6 +330,8 @@ class V4L2H264Picture : public H264Picture {
} }
private: private:
~V4L2H264Picture() override;
scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface> scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>
dec_surface_; dec_surface_;
...@@ -349,7 +350,6 @@ class V4L2VP8Picture : public VP8Picture { ...@@ -349,7 +350,6 @@ class V4L2VP8Picture : public VP8Picture {
public: public:
V4L2VP8Picture(const scoped_refptr< V4L2VP8Picture(const scoped_refptr<
V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>& dec_surface); V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>& dec_surface);
virtual ~V4L2VP8Picture() override;
V4L2VP8Picture* AsV4L2VP8Picture() override { return this; } V4L2VP8Picture* AsV4L2VP8Picture() override { return this; }
scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface> scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>
...@@ -358,6 +358,8 @@ class V4L2VP8Picture : public VP8Picture { ...@@ -358,6 +358,8 @@ class V4L2VP8Picture : public VP8Picture {
} }
private: private:
~V4L2VP8Picture() override;
scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface> scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>
dec_surface_; dec_surface_;
......
...@@ -184,6 +184,10 @@ bool VP8Decoder::DecodeAndOutputCurrentFrame() { ...@@ -184,6 +184,10 @@ bool VP8Decoder::DecodeAndOutputCurrentFrame() {
return true; return true;
} }
gfx::Size VP8Decoder::GetPicSize() const {
return pic_size_;
}
size_t VP8Decoder::GetRequiredNumOfPictures() const { size_t VP8Decoder::GetRequiredNumOfPictures() const {
const size_t kVP8NumFramesActive = 4; const size_t kVP8NumFramesActive = 4;
const size_t kPicsInPipeline = media::limits::kMaxVideoFrames + 2; const size_t kPicsInPipeline = media::limits::kMaxVideoFrames + 2;
......
...@@ -66,7 +66,7 @@ class CONTENT_EXPORT VP8Decoder : public AcceleratedVideoDecoder { ...@@ -66,7 +66,7 @@ class CONTENT_EXPORT VP8Decoder : public AcceleratedVideoDecoder {
void Reset() override; void Reset() override;
void SetStream(const uint8_t* ptr, size_t size) override; void SetStream(const uint8_t* ptr, size_t size) override;
DecodeResult Decode() override WARN_UNUSED_RESULT; DecodeResult Decode() override WARN_UNUSED_RESULT;
gfx::Size GetPicSize() const override { return pic_size_; } gfx::Size GetPicSize() const override;
size_t GetRequiredNumOfPictures() const override; size_t GetRequiredNumOfPictures() const override;
private: private:
......
...@@ -20,34 +20,34 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { ...@@ -20,34 +20,34 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase {
AudioManagerCras(AudioLogFactory* audio_log_factory); AudioManagerCras(AudioLogFactory* audio_log_factory);
// AudioManager implementation. // AudioManager implementation.
virtual bool HasAudioOutputDevices() override; bool HasAudioOutputDevices() override;
virtual bool HasAudioInputDevices() override; bool HasAudioInputDevices() override;
virtual void ShowAudioInputSettings() override; void ShowAudioInputSettings() override;
virtual void GetAudioInputDeviceNames( void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
AudioDeviceNames* device_names) override; void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
virtual void GetAudioOutputDeviceNames( AudioParameters GetInputStreamParameters(
AudioDeviceNames* device_names) override;
virtual AudioParameters GetInputStreamParameters(
const std::string& device_id) override; const std::string& device_id) override;
virtual void SetHasKeyboardMic() override; void SetHasKeyboardMic() override;
// AudioManagerBase implementation. // AudioManagerBase implementation.
virtual AudioOutputStream* MakeLinearOutputStream( AudioOutputStream* MakeLinearOutputStream(
const AudioParameters& params) override; const AudioParameters& params) override;
virtual AudioOutputStream* MakeLowLatencyOutputStream( AudioOutputStream* MakeLowLatencyOutputStream(
const AudioParameters& params,
const std::string& device_id) override;
AudioInputStream* MakeLinearInputStream(
const AudioParameters& params,
const std::string& device_id) override;
AudioInputStream* MakeLowLatencyInputStream(
const AudioParameters& params, const AudioParameters& params,
const std::string& device_id) override; const std::string& device_id) override;
virtual AudioInputStream* MakeLinearInputStream(
const AudioParameters& params, const std::string& device_id) override;
virtual AudioInputStream* MakeLowLatencyInputStream(
const AudioParameters& params, const std::string& device_id) override;
static snd_pcm_format_t BitsToFormat(int bits_per_sample); static snd_pcm_format_t BitsToFormat(int bits_per_sample);
protected: protected:
virtual ~AudioManagerCras(); ~AudioManagerCras() override;
virtual AudioParameters GetPreferredOutputStreamParameters( AudioParameters GetPreferredOutputStreamParameters(
const std::string& output_device_id, const std::string& output_device_id,
const AudioParameters& input_params) override; const AudioParameters& input_params) override;
......
...@@ -25,22 +25,23 @@ class CrasInputStream : public AgcAudioStream<AudioInputStream> { ...@@ -25,22 +25,23 @@ class CrasInputStream : public AgcAudioStream<AudioInputStream> {
public: public:
// The ctor takes all the usual parameters, plus |manager| which is the // The ctor takes all the usual parameters, plus |manager| which is the
// audio manager who is creating this object. // audio manager who is creating this object.
CrasInputStream(const AudioParameters& params, AudioManagerCras* manager, CrasInputStream(const AudioParameters& params,
AudioManagerCras* manager,
const std::string& device_id); const std::string& device_id);
// The dtor is typically called by the AudioManager only and it is usually // The dtor is typically called by the AudioManager only and it is usually
// triggered by calling AudioOutputStream::Close(). // triggered by calling AudioOutputStream::Close().
virtual ~CrasInputStream(); ~CrasInputStream() override;
// Implementation of AudioInputStream. // Implementation of AudioInputStream.
virtual bool Open() override; bool Open() override;
virtual void Start(AudioInputCallback* callback) override; void Start(AudioInputCallback* callback) override;
virtual void Stop() override; void Stop() override;
virtual void Close() override; void Close() override;
virtual double GetMaxVolume() override; double GetMaxVolume() override;
virtual void SetVolume(double volume) override; void SetVolume(double volume) override;
virtual double GetVolume() override; double GetVolume() override;
virtual bool IsMuted() override; bool IsMuted() override;
private: private:
// Handles requests to get samples from the provided buffer. This will be // Handles requests to get samples from the provided buffer. This will be
......
...@@ -33,15 +33,15 @@ class MEDIA_EXPORT CrasUnifiedStream : public AudioOutputStream { ...@@ -33,15 +33,15 @@ class MEDIA_EXPORT CrasUnifiedStream : public AudioOutputStream {
// The dtor is typically called by the AudioManager only and it is usually // The dtor is typically called by the AudioManager only and it is usually
// triggered by calling AudioUnifiedStream::Close(). // triggered by calling AudioUnifiedStream::Close().
virtual ~CrasUnifiedStream(); ~CrasUnifiedStream() override;
// Implementation of AudioOutputStream. // Implementation of AudioOutputStream.
virtual bool Open() override; bool Open() override;
virtual void Close() override; void Close() override;
virtual void Start(AudioSourceCallback* callback) override; void Start(AudioSourceCallback* callback) override;
virtual void Stop() override; void Stop() override;
virtual void SetVolume(double volume) override; void SetVolume(double volume) override;
virtual void GetVolume(double* volume) override; void GetVolume(double* volume) override;
private: private:
// Convert Latency in time to bytes. // Convert Latency in time to bytes.
......
...@@ -48,7 +48,7 @@ class EventReaderLibevdevCros : public EventConverterEvdev { ...@@ -48,7 +48,7 @@ class EventReaderLibevdevCros : public EventConverterEvdev {
InputDeviceType type, InputDeviceType type,
const EventDeviceInfo& devinfo, const EventDeviceInfo& devinfo,
scoped_ptr<Delegate> delegate); scoped_ptr<Delegate> delegate);
~EventReaderLibevdevCros(); ~EventReaderLibevdevCros() override;
// EventConverterEvdev: // EventConverterEvdev:
void OnFileCanReadWithoutBlocking(int fd) override; void OnFileCanReadWithoutBlocking(int fd) override;
......
...@@ -23,7 +23,6 @@ namespace { ...@@ -23,7 +23,6 @@ namespace {
// Binary paths. // Binary paths.
const char kGzipCommand[] = "/bin/gzip"; const char kGzipCommand[] = "/bin/gzip";
const char kDateCommand[] = "/bin/date";
const size_t kTouchLogTimestampMaxSize = 80; const size_t kTouchLogTimestampMaxSize = 80;
......
...@@ -680,7 +680,6 @@ class MatchDeviceType : public MatchCriteria { ...@@ -680,7 +680,6 @@ class MatchDeviceType : public MatchCriteria {
public: public:
explicit MatchDeviceType(const std::string& arg); explicit MatchDeviceType(const std::string& arg);
~MatchDeviceType() override {} ~MatchDeviceType() override {}
virtual bool Match(const DevicePtr device) = 0;
protected: protected:
bool value_; bool value_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment