| OLD | NEW |
|---|
| 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 #include "media/cdm/simple_cdm_allocator.h" | 5 #include "media/cdm/simple_cdm_allocator.h" |
| 6 | 6 |
| 7 #include "base/bind.h" |
| 7 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 8 #include "media/base/video_frame.h" | 9 #include "media/base/video_frame.h" |
| 9 #include "media/cdm/cdm_helpers.h" | 10 #include "media/cdm/cdm_helpers.h" |
| 10 #include "media/cdm/simple_cdm_buffer.h" | 11 #include "media/cdm/simple_cdm_buffer.h" |
| 11 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 12 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
| 13 | 14 |
| 14 namespace media { | 15 namespace media { |
| 15 | 16 |
| 16 namespace { | 17 namespace { |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 66 |
| 66 return SimpleCdmBuffer::Create(capacity); | 67 return SimpleCdmBuffer::Create(capacity); |
| 67 } | 68 } |
| 68 | 69 |
| 69 // Creates a new SimpleCdmVideoFrame on every request. | 70 // Creates a new SimpleCdmVideoFrame on every request. |
| 70 std::unique_ptr<VideoFrameImpl> SimpleCdmAllocator::CreateCdmVideoFrame() { | 71 std::unique_ptr<VideoFrameImpl> SimpleCdmAllocator::CreateCdmVideoFrame() { |
| 71 return base::MakeUnique<SimpleCdmVideoFrame>(); | 72 return base::MakeUnique<SimpleCdmVideoFrame>(); |
| 72 } | 73 } |
| 73 | 74 |
| 74 } // namespace media | 75 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2354903003:
Don't include the tracing in gpu_memory_buffer.h (Closed)
