Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Side by Side Diff: media/base/video_decoder_config.h

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 years, 11 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/base/test_helpers.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 #include "media/base/video_frame.h" 13 #include "media/base/video_frame.h"
14 #include "ui/gfx/rect.h" 14 #include "ui/gfx/geometry/rect.h"
15 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 enum VideoCodec { 19 enum VideoCodec {
20 // These values are histogrammed over time; do not change their ordinal 20 // These values are histogrammed over time; do not change their ordinal
21 // values. When deleting a codec replace it with a dummy value; when adding a 21 // values. When deleting a codec replace it with a dummy value; when adding a
22 // codec, do so at the bottom (and update kVideoCodecMax). 22 // codec, do so at the bottom (and update kVideoCodecMax).
23 kUnknownVideoCodec = 0, 23 kUnknownVideoCodec = 0,
24 kCodecH264, 24 kCodecH264,
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 bool is_encrypted_; 153 bool is_encrypted_;
154 154
155 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler 155 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
156 // generated copy constructor and assignment operator. Since the extra data is 156 // generated copy constructor and assignment operator. Since the extra data is
157 // typically small, the performance impact is minimal. 157 // typically small, the performance impact is minimal.
158 }; 158 };
159 159
160 } // namespace media 160 } // namespace media
161 161
162 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 162 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/test_helpers.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698