Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/jpeg_encoder_example_v5.5' into 'release/v5.5'

Browse Source 
fix(jpeg): broken link in the example readme (v5.5)

See merge request espressif/esp-idf!50141
This commit is contained in:
morris
2026-07-16 17:45:49 +08:00
parent cc5a3fbcb5 494135ddeb
commit 78d6b6342e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.pre-commit-config.yaml
+1
View File
@@ -40,6 +40,7 @@ repos:
- id: check-executables-have-shebangs - id: check-executables-have-shebangs
- id: mixed-line-ending - id: mixed-line-ending
args: ['-f=lf'] args: ['-f=lf']
exclude: *whitespace_excludes
- id: double-quote-string-fixer - id: double-quote-string-fixer
- id: no-commit-to-branch - id: no-commit-to-branch
name: Do not use more than one slash in the branch name name: Do not use more than one slash in the branch name
components/esp_driver_jpeg/test_apps/jpeg_test_apps/main/test_jpeg_encode.c
+2 -2
View File
@@ -57,11 +57,11 @@ TEST_CASE("JPEG encode performance test for 480*640 RGB->YUV picture", "[jpeg]")
}; };
jpeg_encode_memory_alloc_cfg_t rx_mem_cfg = { jpeg_encode_memory_alloc_cfg_t rx_mem_cfg = {
.buffer_direction = JPEG_DEC_ALLOC_OUTPUT_BUFFER, .buffer_direction = JPEG_ENC_ALLOC_OUTPUT_BUFFER,
}; };
jpeg_encode_memory_alloc_cfg_t tx_mem_cfg = { jpeg_encode_memory_alloc_cfg_t tx_mem_cfg = {
.buffer_direction = JPEG_DEC_ALLOC_INPUT_BUFFER, .buffer_direction = JPEG_ENC_ALLOC_INPUT_BUFFER,
}; };
size_t rx_buffer_size = 0; size_t rx_buffer_size = 0;
examples/peripherals/jpeg/jpeg_encode/CMakeLists.txt
+1 -1
View File
@@ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.16)
include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{IDF_PATH}/tools/cmake/project.cmake)
# "Trim" the build. Include the minimal set of components, main, and anything it depends on. # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
idf_build_set_property(MINIMAL_BUILD ON) idf_build_set_property(MINIMAL_BUILD ON)
project(jpeg_encode) project(jpeg_encode_example)
examples/peripherals/jpeg/jpeg_encode/README.md
+7 -8
View File
@@ -16,7 +16,6 @@ This example makes use of the hardware-based JPEG encoder. If you have multiple
* An Espressif development board based on a chip listed in supported targets * An Espressif development board based on a chip listed in supported targets
* A USB cable for power supply and serial communication * A USB cable for power supply and serial communication
* Computer with ESP-IDF installed and configured * Computer with ESP-IDF installed and configured
* The raw picture is the only source that you need to prepare (We have an [esp1080p.rgb](https://github.com/espressif/esp-idf/tree/master/examples/peripherals/jpeg/jpeg_encode/resources/esp1080.rgb) in resources folder, you can also get it from [jpeg_decode](https://github.com/espressif/esp-idf/tree/master/examples/peripherals/jpeg/jpeg_decode) example).
* ffmpeg can also be used to produce rgb picture. For example `ffmpeg -i input.jpg -pix_fmt rgb24 output.rgb` * ffmpeg can also be used to produce rgb picture. For example `ffmpeg -i input.jpg -pix_fmt rgb24 output.rgb`
### Build and Flash ### Build and Flash
@@ -33,13 +32,13 @@ See the [Getting Started Guide](https://docs.espressif.com/projects/esp-idf/en/l
```bash ```bash
I (1114) jpeg.example: Initializing SD card I (1114) jpeg.example: Initializing SD card
I (1114) gpio: GPIO[43]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0 I (1114) gpio: GPIO[43]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0
I (1124) gpio: GPIO[44]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0 I (1124) gpio: GPIO[44]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0
I (1134) gpio: GPIO[39]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0 I (1134) gpio: GPIO[39]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0
I (1144) gpio: GPIO[40]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0 I (1144) gpio: GPIO[40]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0
I (1154) gpio: GPIO[41]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0 I (1154) gpio: GPIO[41]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0
I (1164) gpio: GPIO[42]| InputEn: 0| OutputEn: 1| OpenDrain: 0| Pullup: 0| Pulldown: 0| Intr:0 I (1164) gpio: GPIO[42]| InputEn: 0| OutputEn: 1| OpenDrain: 0| Pullup: 0| Pulldown: 0| Intr:0
I (1414) gpio: GPIO[42]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0 I (1414) gpio: GPIO[42]| InputEn: 0| OutputEn: 0| OpenDrain: 0| Pullup: 1| Pulldown: 0| Intr:0
Name: SD64G Name: SD64G
Type: SDHC/SDXC Type: SDHC/SDXC
Speed: 40.00 MHz (limit: 40.00 MHz) Speed: 40.00 MHz (limit: 40.00 MHz)