| 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 #include "media/formats/webm/webm_video_client.h" | 5 #include "media/formats/webm/webm_video_client.h" |
| 6 | 6 |
| 7 #include "media/base/video_decoder_config.h" | 7 #include "media/base/video_decoder_config.h" |
| 8 #include "media/formats/webm/webm_constants.h" | 8 #include "media/formats/webm/webm_constants.h" |
| 9 | 9 |
| 10 namespace media { | 10 namespace media { |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 return false; | 88 return false; |
| 89 } | 89 } |
| 90 gfx::Size natural_size = gfx::Size(display_width_, display_height_); | 90 gfx::Size natural_size = gfx::Size(display_width_, display_height_); |
| 91 const uint8* extra_data = NULL; | 91 const uint8* extra_data = NULL; |
| 92 size_t extra_data_size = 0; | 92 size_t extra_data_size = 0; |
| 93 if (codec_private.size() > 0) { | 93 if (codec_private.size() > 0) { |
| 94 extra_data = &codec_private[0]; | 94 extra_data = &codec_private[0]; |
| 95 extra_data_size = codec_private.size(); | 95 extra_data_size = codec_private.size(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 config->Initialize(video_codec, profile, format, COLOR_SPACE_UNSPECIFIED, | 98 config->Initialize(video_codec, profile, format, COLOR_SPACE_HD_REC709, |
| 99 coded_size, visible_rect, natural_size, extra_data, | 99 coded_size, visible_rect, natural_size, extra_data, |
| 100 extra_data_size, is_encrypted, true); | 100 extra_data_size, is_encrypted, true); |
| 101 return config->IsValidConfig(); | 101 return config->IsValidConfig(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 bool WebMVideoClient::OnUInt(int id, int64 val) { | 104 bool WebMVideoClient::OnUInt(int id, int64 val) { |
| 105 int64* dst = NULL; | 105 int64* dst = NULL; |
| 106 | 106 |
| 107 switch (id) { | 107 switch (id) { |
| 108 case kWebMIdPixelWidth: | 108 case kWebMIdPixelWidth: |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 // Accept binary fields we don't care about for now. | 154 // Accept binary fields we don't care about for now. |
| 155 return true; | 155 return true; |
| 156 } | 156 } |
| 157 | 157 |
| 158 bool WebMVideoClient::OnFloat(int id, double val) { | 158 bool WebMVideoClient::OnFloat(int id, double val) { |
| 159 // Accept float fields we don't care about for now. | 159 // Accept float fields we don't care about for now. |
| 160 return true; | 160 return true; |
| 161 } | 161 } |
| 162 | 162 |
| 163 } // namespace media | 163 } // namespace media |
| OLD | NEW |