jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-29 06:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[online_image] Support 24 bit bmp images (#8612)

Browse Source
This commit is contained in:
Jesse Hills 2025-05-14 09:21:19 +12:00 committed by GitHub
parent 0aa7911b1b
commit 4ea63af796
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
esphome/components/online_image/bmp_image.cpp
View File

@ -62,6 +62,13 @@ int HOT BmpDecoder::decode(uint8_t *buffer, size_t size) {
case 1: case 1:
this->width_bytes_ = (this->width_ % 8 == 0) ? (this->width_ / 8) : (this->width_ / 8 + 1); this->width_bytes_ = (this->width_ % 8 == 0) ? (this->width_ / 8) : (this->width_ / 8 + 1);
break; break;
case 24:
this->width_bytes_ = this->width_ * 3;
if (this->width_bytes_ % 4 != 0) {
this->padding_bytes_ = 4 - (this->width_bytes_ % 4);
this->width_bytes_ += this->padding_bytes_;
}
break;
default: default:
ESP_LOGE(TAG, "Unsupported bits per pixel: %d", this->bits_per_pixel_); ESP_LOGE(TAG, "Unsupported bits per pixel: %d", this->bits_per_pixel_);
return DECODE_ERROR_UNSUPPORTED_FORMAT; return DECODE_ERROR_UNSUPPORTED_FORMAT;
@ -78,18 +85,48 @@ int HOT BmpDecoder::decode(uint8_t *buffer, size_t size) {
this->current_index_ = this->data_offset_; this->current_index_ = this->data_offset_;
index = this->data_offset_; index = this->data_offset_;
} }
while (index < size) { switch (this->bits_per_pixel_) {
size_t paint_index = this->current_index_ - this->data_offset_; case 1: {
while (index < size) {
uint8_t current_byte = buffer[index]; uint8_t current_byte = buffer[index];
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 8; i++) {
size_t x = (paint_index * 8) % this->width_ + i; size_t x = (this->paint_index_ % this->width_) + i;
size_t y = (this->height_ - 1) - (paint_index / this->width_bytes_); size_t y = (this->height_ - 1) - (this->paint_index_ / this->width_);
Color c = (current_byte & (1 << (7 - i))) ? display::COLOR_ON : display::COLOR_OFF; Color c = (current_byte & (1 << (7 - i))) ? display::COLOR_ON : display::COLOR_OFF;
this->draw(x, y, 1, 1, c); this->draw(x, y, 1, 1, c);
}
this->paint_index_ += 8;
this->current_index_++;
index++;
}
break;
} }
this->current_index_++; case 24: {
index++; while (index < size) {
if (index + 2 >= size) {
this->decoded_bytes_ += index;
return index;
}
uint8_t b = buffer[index];
uint8_t g = buffer[index + 1];
uint8_t r = buffer[index + 2];
size_t x = this->paint_index_ % this->width_;
size_t y = (this->height_ - 1) - (this->paint_index_ / this->width_);
Color c = Color(r, g, b);
this->draw(x, y, 1, 1, c);
this->paint_index_++;
this->current_index_ += 3;
index += 3;
if (x == this->width_ - 1 && this->padding_bytes_ > 0) {
index += this->padding_bytes_;
this->current_index_ += this->padding_bytes_;
}
}
break;
}
default:
ESP_LOGE(TAG, "Unsupported bits per pixel: %d", this->bits_per_pixel_);
return DECODE_ERROR_UNSUPPORTED_FORMAT;
} }
this->decoded_bytes_ += size; this->decoded_bytes_ += size;
return size; return size;

2
esphome/components/online_image/bmp_image.h
View File

@ -24,6 +24,7 @@ class BmpDecoder : public ImageDecoder {
protected: protected:
size_t current_index_{0}; size_t current_index_{0};
size_t paint_index_{0};
ssize_t width_{0}; ssize_t width_{0};
ssize_t height_{0}; ssize_t height_{0};
uint16_t bits_per_pixel_{0}; uint16_t bits_per_pixel_{0};
@ -32,6 +33,7 @@ class BmpDecoder : public ImageDecoder {
uint32_t color_table_entries_{0}; uint32_t color_table_entries_{0};
size_t width_bytes_{0}; size_t width_bytes_{0};
size_t data_offset_{0}; size_t data_offset_{0};
uint8_t padding_bytes_{0};
}; };
} // namespace online_image } // namespace online_image