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

Side by Side Diff: media/formats/webm/webm_colour_parser.h

Issue 2746013006: use VideoColorSpace in decoder configuration (Closed)
Patch Set: oops, win compile fix reapplied Created 3 years, 9 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/filters/vpx_video_decoder.cc ('k') | media/formats/webm/webm_colour_parser.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_WEBM_WEBM_COLOUR_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_COLOUR_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_COLOUR_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_COLOUR_PARSER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "media/base/hdr_metadata.h" 9 #include "media/base/hdr_metadata.h"
10 #include "media/base/video_color_space.h"
10 #include "media/formats/webm/webm_parser.h" 11 #include "media/formats/webm/webm_parser.h"
11 12
12 namespace media { 13 namespace media {
13 14
14 // WebM color information, containing HDR metadata: 15 // WebM color information, containing HDR metadata:
15 // http://www.webmproject.org/docs/container/#Colour 16 // http://www.webmproject.org/docs/container/#Colour
16 struct MEDIA_EXPORT WebMColorMetadata { 17 struct MEDIA_EXPORT WebMColorMetadata {
17 unsigned BitsPerChannel = 0; 18 unsigned BitsPerChannel = 0;
18 unsigned ChromaSubsamplingHorz = 0; 19 unsigned ChromaSubsamplingHorz = 0;
19 unsigned ChromaSubsamplingVert = 0; 20 unsigned ChromaSubsamplingVert = 0;
20 unsigned CbSubsamplingHorz = 0; 21 unsigned CbSubsamplingHorz = 0;
21 unsigned CbSubsamplingVert = 0; 22 unsigned CbSubsamplingVert = 0;
22 unsigned ChromaSitingHorz = 0; 23 unsigned ChromaSitingHorz = 0;
23 unsigned ChromaSitingVert = 0; 24 unsigned ChromaSitingVert = 0;
24 25
25 gfx::ColorSpace color_space; 26 VideoColorSpace color_space;
26 27
27 HDRMetadata hdr_metadata; 28 HDRMetadata hdr_metadata;
28 29
29 WebMColorMetadata(); 30 WebMColorMetadata();
30 WebMColorMetadata(const WebMColorMetadata& rhs); 31 WebMColorMetadata(const WebMColorMetadata& rhs);
31 }; 32 };
32 33
33 // Parser for WebM MasteringMetadata within Colour element: 34 // Parser for WebM MasteringMetadata within Colour element:
34 // http://www.webmproject.org/docs/container/#MasteringMetadata 35 // http://www.webmproject.org/docs/container/#MasteringMetadata
35 class WebMMasteringMetadataParser : public WebMParserClient { 36 class WebMMasteringMetadataParser : public WebMParserClient {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 81
81 WebMMasteringMetadataParser mastering_metadata_parser_; 82 WebMMasteringMetadataParser mastering_metadata_parser_;
82 bool mastering_metadata_parsed_ = false; 83 bool mastering_metadata_parsed_ = false;
83 84
84 DISALLOW_COPY_AND_ASSIGN(WebMColourParser); 85 DISALLOW_COPY_AND_ASSIGN(WebMColourParser);
85 }; 86 };
86 87
87 } // namespace media 88 } // namespace media
88 89
89 #endif // MEDIA_FORMATS_WEBM_WEBM_COLOUR_PARSER_H_ 90 #endif // MEDIA_FORMATS_WEBM_WEBM_COLOUR_PARSER_H_
OLDNEW
« no previous file with comments | « media/filters/vpx_video_decoder.cc ('k') | media/formats/webm/webm_colour_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698