Skip to content

Commit c05b9bc

Browse files
committed
Merge branch 'bugfix/fix_build_issue_for_h264' into 'master'
esp_video_codec: Fix h264 build issue for not supported board See merge request adf/esp-adf-libs!275
2 parents 5bf018a + fcf352d commit c05b9bc

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

esp_video_codec/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## v0.5.1
4+
5+
### Features
6+
7+
- Fix build issue for board not support `esp_h264`
8+
39
## v0.5.0
410

511
### Features

esp_video_codec/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/inc/hw_caps/${IDF_TARGET}")
2222
list(APPEND COMPONENT_PRIV_INCLUDE "./inc/hw_caps/${IDF_TARGET}")
2323
endif()
2424

25+
list(APPEND COMPONENT_REQUIRES esp_mm)
26+
2527
if(${IDF_TARGET} STREQUAL "esp32p4")
26-
list(APPEND COMPONENT_REQUIRES esp_mm esp_driver_jpeg)
28+
list(APPEND COMPONENT_REQUIRES esp_driver_jpeg)
2729
endif()
2830

2931
if(CONFIG_VIDEO_DECODER_HW_MJPEG_SUPPORT)

esp_video_codec/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ menu "Video Codec Configuration"
33
config VIDEO_DECODER_SW_H264_SUPPORT
44
bool "Support SW H264 Decoder"
55
default y
6+
depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4
67
help
78
Enable this option to register software H264 decoder
89

@@ -31,6 +32,7 @@ menu "Video Codec Configuration"
3132
config VIDEO_ENCODER_SW_H264_SUPPORT
3233
bool "Support SW H264 Encoder"
3334
default y
35+
depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4
3436
help
3537
Enable this option to register software H264 encoder
3638

esp_video_codec/idf_component.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
dependencies:
22
idf:
33
version: '>=4.4'
4-
espressif/esp_h264: "*"
4+
espressif/esp_h264:
5+
rules:
6+
- if: "target in [esp32p4, esp32s3]"
57
espressif/esp_new_jpeg: "*"
6-
description: Espressif video codec
8+
description: Espressif video codec
79
issues: https://github.com/espressif/esp-adf/issues
810
repository: https://github.com/espressif/esp-adf-libs.git
911
url: https://github.com/espressif/esp-adf-libs/tree/master/esp_video_codec
10-
version: 0.5.0
12+
version: 0.5.1
1113
tags:
1214
- video_codec
1315
- multimedia

0 commit comments

Comments
 (0)