diff --git a/mpp/codec/CMakeLists.txt b/mpp/codec/CMakeLists.txt index b75970a7..4c27a15d 100644 --- a/mpp/codec/CMakeLists.txt +++ b/mpp/codec/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(mpp_codec STATIC mpp_buf_slot.cpp mpp_enc.cpp mpp_dec.cpp - ) set_target_properties(mpp_codec PROPERTIES FOLDER "mpp/codec") add_subdirectory(dec) diff --git a/mpp/mpp.h b/mpp/mpp.h index 45dba06c..5d919d3b 100644 --- a/mpp/mpp.h +++ b/mpp/mpp.h @@ -34,7 +34,8 @@ extern RK_U32 mpp_debug; #define mpp_dbg(flag, fmt, ...) _mpp_dbg(mpp_debug, flag, fmt, ## __VA_ARGS__) -class Mpp { +class Mpp +{ public: Mpp(MppCtxType type, MppCodingType coding); ~Mpp(); diff --git a/mpp/syntax/dxva_syntax.h b/mpp/syntax/dxva_syntax.h index 6e64da27..c48c8687 100644 --- a/mpp/syntax/dxva_syntax.h +++ b/mpp/syntax/dxva_syntax.h @@ -20,8 +20,7 @@ #include "rk_type.h" -enum __MIDL___MIDL_itf_dxva2api_0000_0000_0012 -{ +enum __MIDL___MIDL_itf_dxva2api_0000_0000_0012 { DXVA2_PictureParametersBufferType = 0, DXVA2_MacroBlockControlBufferType = 1, DXVA2_ResidualDifferenceBufferType = 2, @@ -33,8 +32,7 @@ enum __MIDL___MIDL_itf_dxva2api_0000_0000_0012 DXVA2_FilmGrainBuffer = 8 }; -typedef struct _DXVA2_ConfigPictureDecode -{ +typedef struct _DXVA2_ConfigPictureDecode { //GUID guidConfigBitstreamEncryption; //GUID guidConfigMBcontrolEncryption; //GUID guidConfigResidDiffEncryption; @@ -52,10 +50,9 @@ typedef struct _DXVA2_ConfigPictureDecode //UINT Config4GroupedCoefs; //USHORT ConfigMinRenderTargetBuffCount; //USHORT ConfigDecoderSpecific; -}DXVA2_ConfigPictureDecode; +} DXVA2_ConfigPictureDecode; -typedef struct _DXVA2_DecodeBufferDesc -{ +typedef struct _DXVA2_DecodeBufferDesc { RK_U32 CompressedBufferType; RK_U32 BufferIndex; RK_U32 DataOffset; diff --git a/mpp/syntax/h264d_syntax.h b/mpp/syntax/h264d_syntax.h index b366e74e..46cb9089 100644 --- a/mpp/syntax/h264d_syntax.h +++ b/mpp/syntax/h264d_syntax.h @@ -418,8 +418,7 @@ typedef struct _DXVA_PicParams_H264_MVC { } DXVA_PicParams_H264_MVC, *LPDXVA_PicParams_H264_MVC; -typedef struct h264d_syntax_t -{ +typedef struct h264d_syntax_t { RK_U32 num; DXVA2_DecodeBufferDesc *buf; } H264D_Syntax_t; diff --git a/mpp/test/CMakeLists.txt b/mpp/test/CMakeLists.txt index caad0909..d5628506 100644 --- a/mpp/test/CMakeLists.txt +++ b/mpp/test/CMakeLists.txt @@ -14,7 +14,7 @@ macro(add_mpp_test module) if(${test_tag}) add_executable(${test_name} ${test_name}.c) target_link_libraries(${test_name} mpp) - set_target_properties(${test_name} PROPERTIES FOLDER "mpp/test") + set_target_properties(${test_name} PROPERTIES FOLDER "mpp/test") install(TARGETS ${test_name} RUNTIME DESTINATION ${TEST_INSTALL_DIR}) endif() endmacro() diff --git a/osal/test/CMakeLists.txt b/osal/test/CMakeLists.txt index 47a97309..4411ca8b 100644 --- a/osal/test/CMakeLists.txt +++ b/osal/test/CMakeLists.txt @@ -14,7 +14,7 @@ macro(add_mpp_osal_test module) if(${test_tag}) add_executable(${test_name} ${test_name}.c) target_link_libraries(${test_name} osal) - set_target_properties(${test_name} PROPERTIES FOLDER "osal/test") + set_target_properties(${test_name} PROPERTIES FOLDER "osal/test") install(TARGETS ${test_name} RUNTIME DESTINATION ${TEST_INSTALL_DIR}) add_test(NAME ${test_name} COMMAND ${test_name}) endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 560638ed..fc0f76a0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,7 +14,7 @@ macro(add_mpp_test module) if(${test_tag}) add_executable(${test_name} ${test_name}.c) target_link_libraries(${test_name} mpp) - set_target_properties(${test_name} PROPERTIES FOLDER "test") + set_target_properties(${test_name} PROPERTIES FOLDER "test") install(TARGETS ${test_name} RUNTIME DESTINATION ${TEST_INSTALL_DIR}) add_test(NAME ${test_name} COMMAND ${test_name}) endif() diff --git a/test/vpu_api_test.c b/test/vpu_api_test.c index c0249940..2dbfcd58 100644 --- a/test/vpu_api_test.c +++ b/test/vpu_api_test.c @@ -232,7 +232,7 @@ PARSE_OPINIONS_OUT: static RK_S32 readBytesFromFile(RK_U8* buf, RK_S32 aBytes, FILE* file) { - RK_S32 ret = 0; + RK_S32 ret = 0; if ((NULL == buf) || (NULL == file) || (0 == aBytes)) { return -1; @@ -261,14 +261,14 @@ static RK_S32 vpu_encode_demo(VpuApiDemoCmdContext_t *cmd) EncInputStream_t *enc_in = NULL; EncParameter_t *enc_param = NULL; RK_S64 fakeTimeUs = 0; - RK_U32 w_align = 0; - RK_U32 h_align = 0; + RK_U32 w_align = 0; + RK_U32 h_align = 0; int Format = VPU_H264ENC_YUV420_SEMIPLANAR; - if (cmd == NULL) { - return -1; - } + if (cmd == NULL) { + return -1; + } if ((cmd->have_input == 0) || (cmd->width <= 0) || (cmd->height <= 0) || (cmd->coding <= OMX_RK_VIDEO_CodingAutoDetect)) { @@ -475,7 +475,7 @@ ENCODE_OUT: static RK_S32 vpu_decode_demo(VpuApiDemoCmdContext_t *cmd) { - FILE* pInFile = NULL; + FILE* pInFile = NULL; FILE* pOutFile = NULL; struct VpuCodecContext* ctx = NULL; RK_S32 fileSize = 0, pkt_size = 0; @@ -489,13 +489,13 @@ static RK_S32 vpu_decode_demo(VpuApiDemoCmdContext_t *cmd) RK_S64 fakeTimeUs = 0; RK_U8* pExtra = NULL; RK_U32 extraSize = 0; - RK_U32 wAlign16 = 0; - RK_U32 hAlign16 = 0; - RK_U32 frameSize = 0; + RK_U32 wAlign16 = 0; + RK_U32 hAlign16 = 0; + RK_U32 frameSize = 0; - if (cmd == NULL) { - return -1; - } + if (cmd == NULL) { + return -1; + } if ((cmd->have_input == 0) || (cmd->width <= 0) || (cmd->height <= 0) || (cmd->coding <= OMX_RK_VIDEO_CodingAutoDetect)) { @@ -710,12 +710,12 @@ DECODE_OUT: int main(int argc, char **argv) { - RK_S32 ret = 0; + RK_S32 ret = 0; VpuApiDemoCmdContext_t demoCmdCtx; - VpuApiDemoCmdContext_t *cmd = NULL; + VpuApiDemoCmdContext_t *cmd = NULL; VPU_API_DEMO_DEBUG_DISABLE = 0; - mpp_log("/******* vpu api demo in *******/\n"); + mpp_log("/******* vpu api demo in *******/\n"); if (argc == 1) { show_usage(); mpp_log("vpu api demo complete directly\n");