| 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/gpu/vt_video_decode_accelerator_mac.h" | 5 #include "media/gpu/vt_video_decode_accelerator_mac.h" |
| 6 | 6 |
| 7 #include <CoreVideo/CoreVideo.h> | 7 #include <CoreVideo/CoreVideo.h> |
| 8 #include <OpenGL/CGLIOSurface.h> | 8 #include <OpenGL/CGLIOSurface.h> |
| 9 #include <OpenGL/gl.h> | 9 #include <OpenGL/gl.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 return false; | 1106 return false; |
| 1107 } | 1107 } |
| 1108 | 1108 |
| 1109 // Assign the new image(s) to the the picture info. | 1109 // Assign the new image(s) to the the picture info. |
| 1110 picture_info->gl_image = gl_image; | 1110 picture_info->gl_image = gl_image; |
| 1111 picture_info->cv_image = frame.image; | 1111 picture_info->cv_image = frame.image; |
| 1112 available_picture_ids_.pop_back(); | 1112 available_picture_ids_.pop_back(); |
| 1113 | 1113 |
| 1114 DVLOG(3) << "PictureReady(picture_id=" << picture_id << ", " | 1114 DVLOG(3) << "PictureReady(picture_id=" << picture_id << ", " |
| 1115 << "bitstream_id=" << frame.bitstream_id << ")"; | 1115 << "bitstream_id=" << frame.bitstream_id << ")"; |
| 1116 // TODO(hubbe): Use the correct color space. http://crbug.com/647725 | |
| 1117 client_->PictureReady(Picture(picture_id, frame.bitstream_id, | 1116 client_->PictureReady(Picture(picture_id, frame.bitstream_id, |
| 1118 gfx::Rect(frame.image_size), gfx::ColorSpace(), | 1117 gfx::Rect(frame.image_size), true)); |
| 1119 true)); | |
| 1120 return true; | 1118 return true; |
| 1121 } | 1119 } |
| 1122 | 1120 |
| 1123 void VTVideoDecodeAccelerator::NotifyError( | 1121 void VTVideoDecodeAccelerator::NotifyError( |
| 1124 Error vda_error_type, | 1122 Error vda_error_type, |
| 1125 VTVDASessionFailureType session_failure_type) { | 1123 VTVDASessionFailureType session_failure_type) { |
| 1126 DCHECK_LT(session_failure_type, SFT_MAX + 1); | 1124 DCHECK_LT(session_failure_type, SFT_MAX + 1); |
| 1127 if (!gpu_task_runner_->BelongsToCurrentThread()) { | 1125 if (!gpu_task_runner_->BelongsToCurrentThread()) { |
| 1128 gpu_task_runner_->PostTask( | 1126 gpu_task_runner_->PostTask( |
| 1129 FROM_HERE, | 1127 FROM_HERE, |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1196 SupportedProfile profile; | 1194 SupportedProfile profile; |
| 1197 profile.profile = supported_profile; | 1195 profile.profile = supported_profile; |
| 1198 profile.min_resolution.SetSize(16, 16); | 1196 profile.min_resolution.SetSize(16, 16); |
| 1199 profile.max_resolution.SetSize(4096, 2160); | 1197 profile.max_resolution.SetSize(4096, 2160); |
| 1200 profiles.push_back(profile); | 1198 profiles.push_back(profile); |
| 1201 } | 1199 } |
| 1202 return profiles; | 1200 return profiles; |
| 1203 } | 1201 } |
| 1204 | 1202 |
| 1205 } // namespace media | 1203 } // namespace media |
| OLD | NEW |