media/base/video_decoder_config.h - Issue 1542013004: Switch to standard integer types in media/, take 2.

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/base/video_decoder_config.h

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more stddef Created 4 years, 12 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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_BASE_VIDEO_DECODER_CONFIG_H_	5 #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_

6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_	6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_

7	7

	8 #include <stdint.h>

	9

8 #include <string>	10 #include <string>

9 #include <vector>	11 #include <vector>

10	12

	13 #include "base/macros.h"

11 #include "media/base/media_export.h"	14 #include "media/base/media_export.h"

12 #include "media/base/video_codecs.h"	15 #include "media/base/video_codecs.h"

13 #include "media/base/video_types.h"	16 #include "media/base/video_types.h"

14 #include "ui/gfx/geometry/rect.h"	17 #include "ui/gfx/geometry/rect.h"

15 #include "ui/gfx/geometry/size.h"	18 #include "ui/gfx/geometry/size.h"

16	19

17 namespace media {	20 namespace media {

18	21

19 MEDIA_EXPORT VideoCodec	22 MEDIA_EXPORT VideoCodec

20 VideoCodecProfileToVideoCodec(VideoCodecProfile profile);	23 VideoCodecProfileToVideoCodec(VideoCodecProfile profile);

(...skipping 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 bool is_encrypted_;	114 bool is_encrypted_;

112	115

113 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler	116 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler

114 // generated copy constructor and assignment operator. Since the extra data is	117 // generated copy constructor and assignment operator. Since the extra data is

115 // typically small, the performance impact is minimal.	118 // typically small, the performance impact is minimal.

116 };	119 };

117	120

118 } // namespace media	121 } // namespace media

119	122

120 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_	123 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_

OLD	NEW

« no previous file with comments | « media/base/video_capture_types.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »