Skip to content

Commit 46b8c28

Browse files
committed
Merge branch 'main' of github.com:airockchip/librga
2 parents 6acc57e + fb5f019 commit 46b8c28

5 files changed

+11
-25
lines changed

README.md

100644100755
+7-7
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ RGA (Raster Graphic Acceleration Unit)是一个独立的2D硬件加速器,可
2424
<SDK_path>/external/linux-rga
2525
```
2626
27-
- 百度网盘
27+
- 联想网盘
2828
29-
可通过以下链接选择对应版本驱动源码更新至SDK对应目录下,或独立编译使用。
29+
可通过以下链接选择对应版本源码更新至SDK对应目录下,或独立编译使用。
3030
31-
https://eyun.baidu.com/s/3jJ9Aiz0
31+
https://console.zbox.filez.com/l/fuGojC (提取码:rkrga)
3232
3333
#### 驱动版本适配:
3434
@@ -89,20 +89,20 @@ RGA (Raster Graphic Acceleration Unit)是一个独立的2D硬件加速器,可
8989
<kernel_path>/driver/video/rockchip/rga3
9090
```
9191
92-
- 百度网盘
92+
- 联想网盘
9393
9494
可通过以下链接选择对应版本驱动源码更新至SDK对应目录下。
9595
96-
https://eyun.baidu.com/s/3dGhufEL
96+
https://console.zbox.filez.com/l/7oOrKO (提取码:rkrga)
9797
9898
9999
### 适用芯片平台
100100
101-
Rockchip RK3128 | RK3126c | RK3288 | RK3288w | RV1108 | RK3368 | RK3326 | RK3228 | RK3228H | RK3326 | RK1808 | RV1126 | RV1109 | RK3399 | RK3399pro | RK3566 | RK3568 | RK3588 | RK3326S | RV1106 | RV1103 | RK3528 | RK3562
101+
Rockchip RK3128 | RK3126c | RK3288 | RK3288w | RV1108 | RK3368 | RK3326 | RK3228 | RK3228H | RK3326 | RK1808 | RV1126 | RV1109 | RK3399 | RK3399pro | RK3566 | RK3568 | RK3588 | RK3326S | RV1106 | RV1103 | RK3528 | RK3562 |RK3576
102102
103103
> 本仓库预编译文件只支持以下芯片平台,其他芯片平台可以使用SDK中源码进行编译。
104104
105-
Rockchip RK1808 | RV1126 | RV1109 | RK3399 | RK3399pro | RK3566 | RK3568 | RK3588 | RV1106 | RV1103 | RK3528 | RK3562
105+
Rockchip RK1808 | RV1126 | RV1109 | RK3399 | RK3399pro | RK3566 | RK3568 | RK3588 | RV1106 | RV1103 | RK3528 | RK3562 |RK3576
106106
107107
### 目录说明
108108

docs/Rockchip_Developer_Guide_RGA_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Rockchip Electronics Co., Ltd.
5959
| 2022/09/15 | 2.2.0 | 陈城,李煌,余乔伟 | - 补充默认值相关说明<br/>- 新增array接口<br/>- 新增task接口<br/>- 新增矩形边框绘制接口 |
6060
| 2023/02/09 | 2.2.1 | 余乔伟 | 更正文档格式 |
6161
| 2023/06/28 | 2.2.2 | 余乔伟 | - 增加芯片RK3562介绍<br/>- 完善针对灰度图的注意事项 |
62-
| 2022/06/28 | 2.2.3 | 余乔伟 | 增加芯片RK3576介绍 |
62+
| 2024/03/06 | 2.2.3 | 余乔伟 | 增加芯片RK3576介绍 |
6363

6464
---
6565

docs/Rockchip_FAQ_RGA_CN.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ API版本号分为主版本号、次版本号、修订版本号、编译版本
106106

107107
- 联想网盘链接:
108108

109-
https://console.zbox.filez.com/l/fuGojC(提取码:rkrga)
109+
https://console.zbox.filez.com/l/fuGojC (提取码:rkrga)
110110

111111

112112

@@ -129,7 +129,7 @@ API版本号分为主版本号、次版本号、修订版本号、编译版本
129129

130130
- 联想网盘链接:
131131

132-
https://console.zbox.filez.com/l/7oOrKO(提取码:rkrga)
132+
https://console.zbox.filez.com/l/7oOrKO (提取码:rkrga)
133133

134134

135135

@@ -146,7 +146,7 @@ API版本号分为主版本号、次版本号、修订版本号、编译版本
146146

147147
通常发布的SDK中是版本是匹配的,但是出于一些应用对高版本librga.so的依赖,可以使用以下百度网盘链接获取RGA模块代码更新包:
148148

149-
https://console.zbox.filez.com/l/mu2SOR(提取码:rkrga)
149+
https://console.zbox.filez.com/l/mu2SOR (提取码:rkrga)
150150

151151
- update-to-MULTI_RGA
152152

@@ -1146,8 +1146,6 @@ Date: Tue Nov 24 19:50:17 2020 +0800
11461146

11471147
​ 该问题的解决方案有两种,一为更新SDK或RGA驱动,保持librga与驱动是匹配的即可,第二种则是如若无需新版本librga才有的功能,可以使用SDK自带的librga即可。
11481148

1149-
​ rga模块源码更新包可以通过百度网盘获取:https://eyun.baidu.com/s/3i6sbsDR
1150-
11511149

11521150

11531151
**Q2.12**:RGA如何实现OSD叠加字幕?

docs/Rockchip_FAQ_RGA_EN.md

-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ The API version number consists of major, minor, revision and build. The four le
100100

101101
- Zbox Cloud:
102102

103-
104103
https://console.zbox.filez.com/l/fuGojC (fetch code: rkrga)
105104

106105

@@ -1133,8 +1132,6 @@ Date: Tue Nov 24 19:50:17 2020 +0800
11331132

11341133
​ There are two solutions to this problem: one is to update the SDK or RGA driver and keep librga matching with the driver; the other is to use the librga provided with SDK if the functions only available in the new version librga are not needed.
11351134

1136-
​ The rga module source code update package can be obtained through Baidu Netdisk: https://eyun.baidu.com/s/3i6sbsDR
1137-
11381135

11391136

11401137
**Q2.12**:How does RGA implement OSD overlay subtitle?

include/rga.h

-9
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
#ifndef _RGA_DRIVER_H_
2020
#define _RGA_DRIVER_H_
2121

22-
23-
#ifndef ENABLE
24-
#define ENABLE 1
25-
#endif
26-
27-
#ifndef DISABLE
28-
#define DISABLE 0
29-
#endif
30-
3122
#ifdef __cplusplus
3223
extern "C"
3324
{

0 commit comments

Comments
 (0)