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> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 VideoCodecProfile profile() const { return profile_; } | 79 VideoCodecProfile profile() const { return profile_; } |
80 | 80 |
81 // Video format used to determine YUV buffer sizes. | 81 // Video format used to determine YUV buffer sizes. |
82 VideoPixelFormat format() const { return format_; } | 82 VideoPixelFormat format() const { return format_; } |
83 | 83 |
84 // The default color space of the decoded frames. Decoders should output | 84 // The default color space of the decoded frames. Decoders should output |
85 // frames tagged with this color space unless they find a different value in | 85 // frames tagged with this color space unless they find a different value in |
86 // the bitstream. | 86 // the bitstream. |
87 ColorSpace color_space() const { return color_space_; } | 87 ColorSpace color_space() const { return color_space_; } |
88 | 88 |
| 89 // Deprecated. TODO(wolenetz): Remove. See https://crbug.com/665539. |
89 // Width and height of video frame immediately post-decode. Not all pixels | 90 // Width and height of video frame immediately post-decode. Not all pixels |
90 // in this region are valid. | 91 // in this region are valid. |
91 gfx::Size coded_size() const { return coded_size_; } | 92 gfx::Size coded_size() const { return coded_size_; } |
92 | 93 |
93 // Region of |coded_size_| that is visible. | 94 // Region of |coded_size_| that is visible. |
94 gfx::Rect visible_rect() const { return visible_rect_; } | 95 gfx::Rect visible_rect() const { return visible_rect_; } |
95 | 96 |
96 // Final visible width and height of a video frame with aspect ratio taken | 97 // Final visible width and height of a video frame with aspect ratio taken |
97 // into account. | 98 // into account. |
98 gfx::Size natural_size() const { return natural_size_; } | 99 gfx::Size natural_size() const { return natural_size_; } |
(...skipping 21 matching lines...) Expand all Loading... |
120 | 121 |
121 private: | 122 private: |
122 VideoCodec codec_; | 123 VideoCodec codec_; |
123 VideoCodecProfile profile_; | 124 VideoCodecProfile profile_; |
124 | 125 |
125 VideoPixelFormat format_; | 126 VideoPixelFormat format_; |
126 | 127 |
127 // TODO(servolk): Deprecated, use color_space_info_ instead. | 128 // TODO(servolk): Deprecated, use color_space_info_ instead. |
128 ColorSpace color_space_; | 129 ColorSpace color_space_; |
129 | 130 |
| 131 // Deprecated. TODO(wolenetz): Remove. See https://crbug.com/665539. |
130 gfx::Size coded_size_; | 132 gfx::Size coded_size_; |
| 133 |
131 gfx::Rect visible_rect_; | 134 gfx::Rect visible_rect_; |
132 gfx::Size natural_size_; | 135 gfx::Size natural_size_; |
133 | 136 |
134 std::vector<uint8_t> extra_data_; | 137 std::vector<uint8_t> extra_data_; |
135 | 138 |
136 EncryptionScheme encryption_scheme_; | 139 EncryptionScheme encryption_scheme_; |
137 | 140 |
138 gfx::ColorSpace color_space_info_; | 141 gfx::ColorSpace color_space_info_; |
139 base::Optional<HDRMetadata> hdr_metadata_; | 142 base::Optional<HDRMetadata> hdr_metadata_; |
140 | 143 |
141 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler | 144 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
142 // generated copy constructor and assignment operator. Since the extra data is | 145 // generated copy constructor and assignment operator. Since the extra data is |
143 // typically small, the performance impact is minimal. | 146 // typically small, the performance impact is minimal. |
144 }; | 147 }; |
145 | 148 |
146 } // namespace media | 149 } // namespace media |
147 | 150 |
148 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 151 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
OLD | NEW |