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

[mpi]: enable mpeg4 decoder at mpi

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@995 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-07-08 10:56:34 +00:00
parent 56b704f4cb
commit 0b95b8b305
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mpp/legacy/vpu_api.cpp
View File

@@ -272,10 +272,11 @@ RK_S32 vpu_open_context(VpuCodecContext **ctx)
} }
#endif #endif
if (s != NULL) { if (s != NULL) {
mpp_log("s->videoCoding=%d, s->width=%d, s->height=%d \n", s->videoCoding, s->width, s->height); MppCtxType type = (s->codecType == CODEC_DECODER) ? (MPP_CTX_DEC) :
if (s->videoCoding == OMX_RK_VIDEO_CodingHEVC (s->codecType == CODEC_ENCODER) ? (MPP_CTX_ENC) : (MPP_CTX_BUTT);
|| s->videoCoding == OMX_RK_VIDEO_CodingVP9 MppCodingType coding = (MppCodingType)s->videoCoding;
|| s->videoCoding == OMX_RK_VIDEO_CodingAVS mpp_log("videoCoding %d, width %d, height %d \n", s->videoCoding, s->width, s->height);
if (MPP_OK == mpp_check_support_format(type, coding)
|| (s->videoCoding == OMX_RK_VIDEO_CodingAVC && || (s->videoCoding == OMX_RK_VIDEO_CodingAVC &&
s->codecType == CODEC_DECODER && ((s->width > 1920) || (s->height > 1088) || use_mpp_mode))) { s->codecType == CODEC_DECODER && ((s->width > 1920) || (s->height > 1088) || use_mpp_mode))) {
free(s); free(s);

4
mpp/mpi.cpp
View File

@@ -35,10 +35,12 @@ typedef struct {
} MppCodingTypeInfo; } MppCodingTypeInfo;
static MppCodingTypeInfo support_list[] = { static MppCodingTypeInfo support_list[] = {
{ MPP_CTX_DEC, MPP_VIDEO_CodingVP8, "dec", "vp8", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingMPEG2, "dec", "mpeg2", }, { MPP_CTX_DEC, MPP_VIDEO_CodingMPEG2, "dec", "mpeg2", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingMPEG4, "dec", "mpeg4", },
// { MPP_CTX_DEC, MPP_VIDEO_CodingH263, "dec", "h.263", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingAVC, "dec", "h.264/AVC", }, { MPP_CTX_DEC, MPP_VIDEO_CodingAVC, "dec", "h.264/AVC", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingHEVC, "dec", "h.265/HEVC", }, { MPP_CTX_DEC, MPP_VIDEO_CodingHEVC, "dec", "h.265/HEVC", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingVP8, "dec", "vp8", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingVP9, "dec", "VP9", }, { MPP_CTX_DEC, MPP_VIDEO_CodingVP9, "dec", "VP9", },
{ MPP_CTX_DEC, MPP_VIDEO_CodingAVS, "dec", "avs+", }, { MPP_CTX_DEC, MPP_VIDEO_CodingAVS, "dec", "avs+", },
}; };