summaryrefslogtreecommitdiffstats
path: root/media/formats
diff options
context:
space:
mode:
Diffstat (limited to 'media/formats')
-rw-r--r--media/formats/mpeg/adts_stream_parser.h16
-rw-r--r--media/formats/mpeg/mpeg1_audio_stream_parser.h16
-rw-r--r--media/formats/mpeg/mpeg_audio_stream_parser_base.h22
-rw-r--r--media/formats/webm/webm_audio_client.h6
-rw-r--r--media/formats/webm/webm_cluster_parser.h10
-rw-r--r--media/formats/webm/webm_content_encodings_client.h10
-rw-r--r--media/formats/webm/webm_info_parser.h14
-rw-r--r--media/formats/webm/webm_stream_parser.h21
-rw-r--r--media/formats/webm/webm_tracks_parser.h14
-rw-r--r--media/formats/webm/webm_video_client.h8
10 files changed, 69 insertions, 68 deletions
diff --git a/media/formats/mpeg/adts_stream_parser.h b/media/formats/mpeg/adts_stream_parser.h
index 30354dc..d08351b 100644
--- a/media/formats/mpeg/adts_stream_parser.h
+++ b/media/formats/mpeg/adts_stream_parser.h
@@ -14,17 +14,17 @@ namespace media {
class MEDIA_EXPORT ADTSStreamParser : public MPEGAudioStreamParserBase {
public:
ADTSStreamParser();
- virtual ~ADTSStreamParser();
+ ~ADTSStreamParser() override;
private:
// MPEGAudioStreamParserBase overrides.
- virtual int ParseFrameHeader(const uint8* data,
- int size,
- int* frame_size,
- int* sample_rate,
- ChannelLayout* channel_layout,
- int* sample_count,
- bool* metadata_frame) const override;
+ int ParseFrameHeader(const uint8* data,
+ int size,
+ int* frame_size,
+ int* sample_rate,
+ ChannelLayout* channel_layout,
+ int* sample_count,
+ bool* metadata_frame) const override;
DISALLOW_COPY_AND_ASSIGN(ADTSStreamParser);
};
diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.h b/media/formats/mpeg/mpeg1_audio_stream_parser.h
index 0f33f50..b2e5086 100644
--- a/media/formats/mpeg/mpeg1_audio_stream_parser.h
+++ b/media/formats/mpeg/mpeg1_audio_stream_parser.h
@@ -68,17 +68,17 @@ class MEDIA_EXPORT MPEG1AudioStreamParser : public MPEGAudioStreamParserBase {
Header* header);
MPEG1AudioStreamParser();
- virtual ~MPEG1AudioStreamParser();
+ ~MPEG1AudioStreamParser() override;
private:
// MPEGAudioStreamParserBase overrides.
- virtual int ParseFrameHeader(const uint8* data,
- int size,
- int* frame_size,
- int* sample_rate,
- ChannelLayout* channel_layout,
- int* sample_count,
- bool* metadata_frame) const override;
+ int ParseFrameHeader(const uint8* data,
+ int size,
+ int* frame_size,
+ int* sample_rate,
+ ChannelLayout* channel_layout,
+ int* sample_count,
+ bool* metadata_frame) const override;
DISALLOW_COPY_AND_ASSIGN(MPEG1AudioStreamParser);
};
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/media/formats/mpeg/mpeg_audio_stream_parser_base.h
index fde850a..fc736c2 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h
@@ -28,19 +28,19 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser {
MPEGAudioStreamParserBase(uint32 start_code_mask,
AudioCodec audio_codec,
int codec_delay);
- virtual ~MPEGAudioStreamParserBase();
+ ~MPEGAudioStreamParserBase() override;
// StreamParser implementation.
- virtual void Init(const InitCB& init_cb,
- const NewConfigCB& config_cb,
- const NewBuffersCB& new_buffers_cb,
- bool ignore_text_tracks,
- const NeedKeyCB& need_key_cb,
- const NewMediaSegmentCB& new_segment_cb,
- const base::Closure& end_of_segment_cb,
- const LogCB& log_cb) override;
- virtual void Flush() override;
- virtual bool Parse(const uint8* buf, int size) override;
+ void Init(const InitCB& init_cb,
+ const NewConfigCB& config_cb,
+ const NewBuffersCB& new_buffers_cb,
+ bool ignore_text_tracks,
+ const NeedKeyCB& need_key_cb,
+ const NewMediaSegmentCB& new_segment_cb,
+ const base::Closure& end_of_segment_cb,
+ const LogCB& log_cb) override;
+ void Flush() override;
+ bool Parse(const uint8* buf, int size) override;
protected:
// Subclasses implement this method to parse format specific frame headers.
diff --git a/media/formats/webm/webm_audio_client.h b/media/formats/webm/webm_audio_client.h
index df274f1..2e23c13 100644
--- a/media/formats/webm/webm_audio_client.h
+++ b/media/formats/webm/webm_audio_client.h
@@ -18,7 +18,7 @@ class AudioDecoderConfig;
class WebMAudioClient : public WebMParserClient {
public:
explicit WebMAudioClient(const LogCB& log_cb);
- virtual ~WebMAudioClient();
+ ~WebMAudioClient() override;
// Reset this object's state so it can process a new audio track element.
void Reset();
@@ -38,8 +38,8 @@ class WebMAudioClient : public WebMParserClient {
private:
// WebMParserClient implementation.
- virtual bool OnUInt(int id, int64 val) override;
- virtual bool OnFloat(int id, double val) override;
+ bool OnUInt(int id, int64 val) override;
+ bool OnFloat(int id, double val) override;
LogCB log_cb_;
int channels_;
diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h
index d7d78cb..3b341e6 100644
--- a/media/formats/webm/webm_cluster_parser.h
+++ b/media/formats/webm/webm_cluster_parser.h
@@ -144,7 +144,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
const std::string& audio_encryption_key_id,
const std::string& video_encryption_key_id,
const LogCB& log_cb);
- virtual ~WebMClusterParser();
+ ~WebMClusterParser() override;
// Resets the parser state so it can accept a new cluster.
void Reset();
@@ -191,10 +191,10 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
private:
// WebMParserClient methods.
- virtual WebMParserClient* OnListStart(int id) override;
- virtual bool OnListEnd(int id) override;
- virtual bool OnUInt(int id, int64 val) override;
- virtual bool OnBinary(int id, const uint8* data, int size) override;
+ WebMParserClient* OnListStart(int id) override;
+ bool OnListEnd(int id) override;
+ bool OnUInt(int id, int64 val) override;
+ bool OnBinary(int id, const uint8* data, int size) override;
bool ParseBlock(bool is_simple_block, const uint8* buf, int size,
const uint8* additional, int additional_size, int duration,
diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h
index 5421bbc..4b1bfe0 100644
--- a/media/formats/webm/webm_content_encodings_client.h
+++ b/media/formats/webm/webm_content_encodings_client.h
@@ -23,15 +23,15 @@ typedef std::vector<ContentEncoding*> ContentEncodings;
class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient {
public:
explicit WebMContentEncodingsClient(const LogCB& log_cb);
- virtual ~WebMContentEncodingsClient();
+ ~WebMContentEncodingsClient() override;
const ContentEncodings& content_encodings() const;
// WebMParserClient methods
- virtual WebMParserClient* OnListStart(int id) override;
- virtual bool OnListEnd(int id) override;
- virtual bool OnUInt(int id, int64 val) override;
- virtual bool OnBinary(int id, const uint8* data, int size) override;
+ WebMParserClient* OnListStart(int id) override;
+ bool OnListEnd(int id) override;
+ bool OnUInt(int id, int64 val) override;
+ bool OnBinary(int id, const uint8* data, int size) override;
private:
LogCB log_cb_;
diff --git a/media/formats/webm/webm_info_parser.h b/media/formats/webm/webm_info_parser.h
index f129f4e1..44ef6b2 100644
--- a/media/formats/webm/webm_info_parser.h
+++ b/media/formats/webm/webm_info_parser.h
@@ -16,7 +16,7 @@ namespace media {
class MEDIA_EXPORT WebMInfoParser : public WebMParserClient {
public:
WebMInfoParser();
- virtual ~WebMInfoParser();
+ ~WebMInfoParser() override;
// Parses a WebM Info element in |buf|.
//
@@ -31,12 +31,12 @@ class MEDIA_EXPORT WebMInfoParser : public WebMParserClient {
private:
// WebMParserClient methods
- virtual WebMParserClient* OnListStart(int id) override;
- virtual bool OnListEnd(int id) override;
- virtual bool OnUInt(int id, int64 val) override;
- virtual bool OnFloat(int id, double val) override;
- virtual bool OnBinary(int id, const uint8* data, int size) override;
- virtual bool OnString(int id, const std::string& str) override;
+ WebMParserClient* OnListStart(int id) override;
+ bool OnListEnd(int id) override;
+ bool OnUInt(int id, int64 val) override;
+ bool OnFloat(int id, double val) override;
+ bool OnBinary(int id, const uint8* data, int size) override;
+ bool OnString(int id, const std::string& str) override;
int64 timecode_scale_;
double duration_;
diff --git a/media/formats/webm/webm_stream_parser.h b/media/formats/webm/webm_stream_parser.h
index 7a99f3a..deefa73 100644
--- a/media/formats/webm/webm_stream_parser.h
+++ b/media/formats/webm/webm_stream_parser.h
@@ -20,18 +20,19 @@ class WebMClusterParser;
class WebMStreamParser : public StreamParser {
public:
WebMStreamParser();
- virtual ~WebMStreamParser();
+ ~WebMStreamParser() override;
// StreamParser implementation.
- virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
- const NewBuffersCB& new_buffers_cb,
- bool ignore_text_tracks,
- const NeedKeyCB& need_key_cb,
- const NewMediaSegmentCB& new_segment_cb,
- const base::Closure& end_of_segment_cb,
- const LogCB& log_cb) override;
- virtual void Flush() override;
- virtual bool Parse(const uint8* buf, int size) override;
+ void Init(const InitCB& init_cb,
+ const NewConfigCB& config_cb,
+ const NewBuffersCB& new_buffers_cb,
+ bool ignore_text_tracks,
+ const NeedKeyCB& need_key_cb,
+ const NewMediaSegmentCB& new_segment_cb,
+ const base::Closure& end_of_segment_cb,
+ const LogCB& log_cb) override;
+ void Flush() override;
+ bool Parse(const uint8* buf, int size) override;
private:
enum State {
diff --git a/media/formats/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h
index 2b9d350..2801a3e 100644
--- a/media/formats/webm/webm_tracks_parser.h
+++ b/media/formats/webm/webm_tracks_parser.h
@@ -28,7 +28,7 @@ namespace media {
class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
public:
explicit WebMTracksParser(const LogCB& log_cb, bool ignore_text_tracks);
- virtual ~WebMTracksParser();
+ ~WebMTracksParser() override;
// Parses a WebM Tracks element in |buf|.
//
@@ -75,12 +75,12 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
private:
// WebMParserClient implementation.
- virtual WebMParserClient* OnListStart(int id) override;
- virtual bool OnListEnd(int id) override;
- virtual bool OnUInt(int id, int64 val) override;
- virtual bool OnFloat(int id, double val) override;
- virtual bool OnBinary(int id, const uint8* data, int size) override;
- virtual bool OnString(int id, const std::string& str) override;
+ WebMParserClient* OnListStart(int id) override;
+ bool OnListEnd(int id) override;
+ bool OnUInt(int id, int64 val) override;
+ bool OnFloat(int id, double val) override;
+ bool OnBinary(int id, const uint8* data, int size) override;
+ bool OnString(int id, const std::string& str) override;
int64 track_type_;
int64 track_num_;
diff --git a/media/formats/webm/webm_video_client.h b/media/formats/webm/webm_video_client.h
index 73e3955..8e246d9 100644
--- a/media/formats/webm/webm_video_client.h
+++ b/media/formats/webm/webm_video_client.h
@@ -18,7 +18,7 @@ class VideoDecoderConfig;
class WebMVideoClient : public WebMParserClient {
public:
explicit WebMVideoClient(const LogCB& log_cb);
- virtual ~WebMVideoClient();
+ ~WebMVideoClient() override;
// Reset this object's state so it can process a new video track element.
void Reset();
@@ -37,9 +37,9 @@ class WebMVideoClient : public WebMParserClient {
private:
// WebMParserClient implementation.
- virtual bool OnUInt(int id, int64 val) override;
- virtual bool OnBinary(int id, const uint8* data, int size) override;
- virtual bool OnFloat(int id, double val) override;
+ bool OnUInt(int id, int64 val) override;
+ bool OnBinary(int id, const uint8* data, int size) override;
+ bool OnFloat(int id, double val) override;
LogCB log_cb_;
int64 pixel_width_;
generated by cgit v1.1 at 2025-01-25 21:51:18 +0000