package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 01:26:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mpp_platform]: add px30 && rk3326 support

Browse Source 
Change-Id: If4f69842c9468faee3d6f598e2e2453cb9d8511c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-01-24 09:46:08 +08:00
committed by Herman Chen
parent 4b2c91ed78
commit 0a87e905a2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osal/mpp_platform.cpp
View File

@@ -43,6 +43,8 @@ typedef enum RockchipSocType_e {
ROCKCHIP_SOC_RK3228, ROCKCHIP_SOC_RK3228,
ROCKCHIP_SOC_RK3229, ROCKCHIP_SOC_RK3229,
ROCKCHIP_SOC_RV1108, ROCKCHIP_SOC_RV1108,
ROCKCHIP_SOC_RK3326,
ROCKCHIP_SOC_PX30,
ROCKCHIP_SOC_BUTT, ROCKCHIP_SOC_BUTT,
} RockchipSocType; } RockchipSocType;
@@ -67,6 +69,8 @@ static const MppVpuType mpp_vpu_version[] = {
{ "rk3228", ROCKCHIP_SOC_RK3228, HAVE_VPU2 | HAVE_RKVDEC, }, { "rk3228", ROCKCHIP_SOC_RK3228, HAVE_VPU2 | HAVE_RKVDEC, },
{ "rk3229", ROCKCHIP_SOC_RK3229, HAVE_VPU2 | HAVE_RKVDEC, }, { "rk3229", ROCKCHIP_SOC_RK3229, HAVE_VPU2 | HAVE_RKVDEC, },
{ "rv1108", ROCKCHIP_SOC_RV1108, HAVE_VPU2 | HAVE_RKVDEC | HAVE_RKVENC, }, { "rv1108", ROCKCHIP_SOC_RV1108, HAVE_VPU2 | HAVE_RKVDEC | HAVE_RKVENC, },
{ "rk3326", ROCKCHIP_SOC_RK3326, HAVE_VPU2 | HAVE_HEVC_DEC, },
{ "px30", ROCKCHIP_SOC_RK3326, HAVE_VPU2 | HAVE_HEVC_DEC, },
}; };
/* For vpu1 / vpu2 */ /* For vpu1 / vpu2 */
@@ -244,13 +248,6 @@ MppPlatformService::MppPlatformService()
/* for all chip vpu decoder */ /* for all chip vpu decoder */
if (!mpp_find_device(mpp_vpu_dev)) if (!mpp_find_device(mpp_vpu_dev))
vcodec_type &= ~(HAVE_VPU1 | HAVE_VPU2); vcodec_type &= ~(HAVE_VPU1 | HAVE_VPU2);
else {
/* new chip with rkvdec always uses VPU2 */
if (vcodec_type & HAVE_RKVDEC)
vcodec_type |= HAVE_VPU2;
else
vcodec_type |= HAVE_VPU1;
}
mpp_dbg(MPP_DBG_PLATFORM, "vcodec type %08x\n", vcodec_type); mpp_dbg(MPP_DBG_PLATFORM, "vcodec type %08x\n", vcodec_type);
#endif #endif
@@ -349,7 +346,9 @@ const char *mpp_get_vcodec_dev_name(MppCtxType type, MppCodingType coding)
} break; } break;
case ROCKCHIP_SOC_RK3288 : case ROCKCHIP_SOC_RK3288 :
case ROCKCHIP_SOC_RK312X : case ROCKCHIP_SOC_RK312X :
case ROCKCHIP_SOC_RK3368 : { case ROCKCHIP_SOC_RK3368 :
case ROCKCHIP_SOC_RK3326 :
case ROCKCHIP_SOC_PX30 : {
/* /*
* rk3288/rk312x/rk3368 have codec: * rk3288/rk312x/rk3368 have codec:
* 1 - vpu1 * 1 - vpu1