Chromium Code Reviews| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 return false; | 84 return false; |
| 85 } else { | 85 } else { |
| 86 MEDIA_LOG(ERROR, media_log_) << "Unsupported display unit type " | 86 MEDIA_LOG(ERROR, media_log_) << "Unsupported display unit type " |
| 87 << display_unit_; | 87 << display_unit_; |
| 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 | 91 |
| 92 config->Initialize(video_codec, profile, format, COLOR_SPACE_HD_REC709, | 92 config->Initialize(video_codec, profile, format, COLOR_SPACE_HD_REC709, |
| 93 coded_size, visible_rect, natural_size, codec_private, | 93 coded_size, visible_rect, natural_size, codec_private, |
| 94 is_encrypted); | 94 EncryptionScheme(is_encrypted)); |
|
ddorwin
2015/12/10 18:36:02
ditto
dougsteed
2015/12/14 21:19:02
See my earlier response. Will do it if you think a
| |
| 95 return config->IsValidConfig(); | 95 return config->IsValidConfig(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 bool WebMVideoClient::OnUInt(int id, int64 val) { | 98 bool WebMVideoClient::OnUInt(int id, int64 val) { |
| 99 int64* dst = NULL; | 99 int64* dst = NULL; |
| 100 | 100 |
| 101 switch (id) { | 101 switch (id) { |
| 102 case kWebMIdPixelWidth: | 102 case kWebMIdPixelWidth: |
| 103 dst = &pixel_width_; | 103 dst = &pixel_width_; |
| 104 break; | 104 break; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 // Accept binary fields we don't care about for now. | 148 // Accept binary fields we don't care about for now. |
| 149 return true; | 149 return true; |
| 150 } | 150 } |
| 151 | 151 |
| 152 bool WebMVideoClient::OnFloat(int id, double val) { | 152 bool WebMVideoClient::OnFloat(int id, double val) { |
| 153 // Accept float fields we don't care about for now. | 153 // Accept float fields we don't care about for now. |
| 154 return true; | 154 return true; |
| 155 } | 155 } |
| 156 | 156 |
| 157 } // namespace media | 157 } // namespace media |
| OLD | NEW |