mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-18 15:35:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

[online_image] Remove stored RAMAllocator member from DownloadBuffer (#13999)

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-16 08:09:13 -06:00
committed by GitHub
parent f2c827f9a2
commit ffb9a00e26
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/online_image/download_buffer.cpp
View File

@@ -7,7 +7,8 @@ namespace esphome::online_image {
static const char *const TAG = "online_image.download_buffer";
DownloadBuffer::DownloadBuffer(size_t size) : size_(size) {
this->buffer_ = this->allocator_.allocate(size);
RAMAllocator<uint8_t> allocator;
this->buffer_ = allocator.allocate(size);
this->reset();
if (!this->buffer_) {
ESP_LOGE(TAG, "Initial allocation of download buffer failed!");
@@ -38,15 +39,16 @@ size_t DownloadBuffer::resize(size_t size) {
// Avoid useless reallocations; if the buffer is big enough, don't reallocate.
return this->size_;
}
this->allocator_.deallocate(this->buffer_, this->size_);
this->buffer_ = this->allocator_.allocate(size);
RAMAllocator<uint8_t> allocator;
allocator.deallocate(this->buffer_, this->size_);
this->buffer_ = allocator.allocate(size);
this->reset();
if (this->buffer_) {
this->size_ = size;
return size;
} else {
ESP_LOGE(TAG, "allocation of %zu bytes failed. Biggest block in heap: %zu Bytes", size,
this->allocator_.get_max_free_block_size());
allocator.get_max_free_block_size());
this->size_ = 0;
return 0;
}

6
esphome/components/online_image/download_buffer.h
View File

@@ -15,7 +15,10 @@ namespace esphome::online_image {
class DownloadBuffer {
public:
DownloadBuffer(size_t size);
~DownloadBuffer() { this->allocator_.deallocate(this->buffer_, this->size_); }
~DownloadBuffer() {
RAMAllocator<uint8_t> allocator;
allocator.deallocate(this->buffer_, this->size_);
}
uint8_t *data(size_t offset = 0);
uint8_t *append() { return this->data(this->unread_); }
@@ -34,7 +37,6 @@ class DownloadBuffer {
size_t resize(size_t size);
protected:
RAMAllocator<uint8_t> allocator_{};
uint8_t *buffer_;
size_t size_;
/** Total number of downloaded bytes not yet read. */