| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/cdm/ppapi/cdm_helpers.h" | 5 #include "media/cdm/ppapi/cdm_helpers.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | |
| 9 | 8 |
| 10 #include "base/basictypes.h" | |
| 11 #include "base/compiler_specific.h" | |
| 12 #include "build/build_config.h" | |
| 13 #include "media/cdm/ppapi/api/content_decryption_module.h" | |
| 14 #include "ppapi/c/pp_errors.h" | |
| 15 #include "ppapi/c/pp_stdint.h" | |
| 16 #include "ppapi/cpp/core.h" | 9 #include "ppapi/cpp/core.h" |
| 17 #include "ppapi/cpp/dev/buffer_dev.h" | |
| 18 #include "ppapi/cpp/instance.h" | |
| 19 #include "ppapi/cpp/logging.h" | |
| 20 #include "ppapi/cpp/module.h" | 10 #include "ppapi/cpp/module.h" |
| 21 | 11 |
| 22 namespace media { | 12 namespace media { |
| 23 | 13 |
| 24 // static | 14 // static |
| 25 PpbBuffer* PpbBuffer::Create(const pp::Buffer_Dev& buffer, | 15 PpbBuffer* PpbBuffer::Create(const pp::Buffer_Dev& buffer, |
| 26 uint32_t buffer_id, | 16 uint32_t buffer_id, |
| 27 PpbBufferAllocator* allocator) { | 17 PpbBufferAllocator* allocator) { |
| 28 PP_DCHECK(buffer.data()); | 18 PP_DCHECK(buffer.data()); |
| 29 PP_DCHECK(buffer.size()); | 19 PP_DCHECK(buffer.size()); |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 strides_[i] = 0; | 139 strides_[i] = 0; |
| 150 } | 140 } |
| 151 } | 141 } |
| 152 | 142 |
| 153 VideoFrameImpl::~VideoFrameImpl() { | 143 VideoFrameImpl::~VideoFrameImpl() { |
| 154 if (frame_buffer_) | 144 if (frame_buffer_) |
| 155 frame_buffer_->Destroy(); | 145 frame_buffer_->Destroy(); |
| 156 } | 146 } |
| 157 | 147 |
| 158 } // namespace media | 148 } // namespace media |
| OLD | NEW |