| 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 <cstdlib> | 5 #include <cstdlib> |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "services/media/framework/allocator.h" | 8 #include "services/media/framework/payload_allocator.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| 11 namespace media { | 11 namespace media { |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 class DefaultAllocator : public Allocator { | 15 class DefaultAllocator : public PayloadAllocator { |
| 16 public: | 16 public: |
| 17 constexpr DefaultAllocator() {} | 17 constexpr DefaultAllocator() {} |
| 18 | 18 |
| 19 // Allocator implementation. | 19 // PayloadAllocator implementation. |
| 20 void* AllocatePayloadBuffer(uint64_t size) override; | 20 void* AllocatePayloadBuffer(size_t size) override; |
| 21 | 21 |
| 22 void ReleasePayloadBuffer(uint64_t size, void* buffer) override; | 22 void ReleasePayloadBuffer(size_t size, void* buffer) override; |
| 23 }; | 23 }; |
| 24 | 24 |
| 25 void* DefaultAllocator::AllocatePayloadBuffer(uint64_t size) { | 25 void* DefaultAllocator::AllocatePayloadBuffer(size_t size) { |
| 26 DCHECK(size > 0); | 26 DCHECK(size > 0); |
| 27 return std::malloc(static_cast<size_t>(size)); | 27 return std::malloc(static_cast<size_t>(size)); |
| 28 } | 28 } |
| 29 | 29 |
| 30 void DefaultAllocator::ReleasePayloadBuffer(uint64_t size, void* buffer) { | 30 void DefaultAllocator::ReleasePayloadBuffer(size_t size, void* buffer) { |
| 31 DCHECK(size > 0); | 31 DCHECK(size > 0); |
| 32 DCHECK(buffer); | 32 DCHECK(buffer); |
| 33 std::free(buffer); | 33 std::free(buffer); |
| 34 } | 34 } |
| 35 | 35 |
| 36 static constexpr DefaultAllocator default_allocator; | 36 static constexpr DefaultAllocator default_allocator; |
| 37 | 37 |
| 38 } // namespace | 38 } // namespace |
| 39 | 39 |
| 40 // static | 40 // static |
| 41 Allocator* Allocator::GetDefault() { | 41 PayloadAllocator* PayloadAllocator::GetDefault() { |
| 42 return const_cast<DefaultAllocator*>(&default_allocator); | 42 return const_cast<DefaultAllocator*>(&default_allocator); |
| 43 } | 43 } |
| 44 | 44 |
| 45 } // namespace media | 45 } // namespace media |
| 46 } // namespace mojo | 46 } // namespace mojo |
| OLD | NEW |