media/formats/mpeg/mpeg1_audio_stream_parser.h - Issue 623263003: replace OVERRIDE and FINAL with override and final in media/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/formats/mpeg/mpeg1_audio_stream_parser.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « media/formats/mpeg/adts_stream_parser.h ('k') | media/formats/mpeg/mpeg_audio_stream_parser_base.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_	5 #ifndef MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_

6 #define MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_	6 #define MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "media/base/media_export.h"	9 #include "media/base/media_export.h"

10 #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h"	10 #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h"

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 virtual ~MPEG1AudioStreamParser();	71 virtual ~MPEG1AudioStreamParser();

72	72

73 private:	73 private:

74 // MPEGAudioStreamParserBase overrides.	74 // MPEGAudioStreamParserBase overrides.

75 virtual int ParseFrameHeader(const uint8* data,	75 virtual int ParseFrameHeader(const uint8* data,

76 int size,	76 int size,

77 int* frame_size,	77 int* frame_size,

78 int* sample_rate,	78 int* sample_rate,

79 ChannelLayout* channel_layout,	79 ChannelLayout* channel_layout,

80 int* sample_count,	80 int* sample_count,

81 bool* metadata_frame) const OVERRIDE;	81 bool* metadata_frame) const override;

82	82

83 DISALLOW_COPY_AND_ASSIGN(MPEG1AudioStreamParser);	83 DISALLOW_COPY_AND_ASSIGN(MPEG1AudioStreamParser);

84 };	84 };

85	85

86 } // namespace media	86 } // namespace media

87	87

88 #endif // MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_	88 #endif // MEDIA_FORMATS_MPEG_MPEG1_AUDIO_STREAM_PARSER_H_

OLD	NEW