123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125 |
- From 0e365b325c7ddd78087bb48c5c4d695f505a7f6b Mon Sep 17 00:00:00 2001
- From: Andy Hu <andy.hu@starfivetech.com>
- Date: Tue, 16 Aug 2022 19:52:20 +0800
- Subject: [PATCH] wave511: fix building issue
- ---
- wave511/wave511/WaveDecode_buildroot.mak | 46 +++++++++++++++++++-
- wave511/wave511/sample_v2/helper/vpuhelper.c | 19 +++++---
- 2 files changed, 59 insertions(+), 6 deletions(-)
- diff --git a/wave511/wave511/WaveDecode_buildroot.mak b/wave511/wave511/WaveDecode_buildroot.mak
- index e8b9f06..d2d05f5 100644
- --- a/wave511/wave511/WaveDecode_buildroot.mak
- +++ b/wave511/wave511/WaveDecode_buildroot.mak
- @@ -11,6 +11,10 @@ PRODUCT := WAVE511
-
- $(shell cp sample_v2/component_list_decoder.h sample_v2/component/component_list.h)
-
- +TARGET_DIR=../../target
- +STAGING_DIR=$(TARGET_DIR)
- +INSTALL=install
- +
- USE_PTHREAD = yes
- USE_RTL_SIM = no
- LINT_HOME = etc/lint
- @@ -57,7 +61,8 @@ ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedLinux")
- endif
-
- ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedRiscvLinux")
- - CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
- +# CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
- + CROSS_CC_PREFIX =
- PLATFORM = riscvlinux
- endif
- CC = $(CROSS_CC_PREFIX)gcc
- @@ -166,3 +171,42 @@ obj/%.o: %.c $(MAKEFILE)
- lint:
- "$(LINT_HOME)/flint" -i"$(LINT_HOME)" $(DEFINES) $(INCLUDES) $(VPATH2) linux_std.lnt $(HAPS_RULE) $(NONOS_RULE) $(SOURCES_COMMON)
-
- +install:
- + @echo install ...
- + $(INSTALL) -D -m 0777 vdi/linux/driver/load.sh $(TARGET_DIR)/root/wave511/vdec_load.sh
- + $(INSTALL) -D -m 0777 vdi/linux/driver/unload.sh $(TARGET_DIR)/root/wave511/vdec_unload.sh
- + $(INSTALL) -D -m 0644 libsfdec.so $(TARGET_DIR)/usr/lib/libsfdec.so
- + $(INSTALL) -D -m 0644 ../firmware/chagall.bin $(TARGET_DIR)/lib/firmware/chagall.bin
- + @echo "install STAGING_DIR ..."
- + $(INSTALL) -D -m 0644 sample_v2/component_list_decoder.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_list_decoder.h
- + $(INSTALL) -D -m 0644 sample_v2/component_list_encoder.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_list_encoder.h
- + $(INSTALL) -D -m 0644 sample_v2/helper/misc/pbu.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/pbu.h
- + $(INSTALL) -D -m 0644 sample_v2/helper/misc/header_struct.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/header_struct.h
- + $(INSTALL) -D -m 0644 sample_v2/helper/misc/json_output.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/json_output.h
- + $(INSTALL) -D -m 0644 sample_v2/helper/misc/debug.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/debug.h
- + $(INSTALL) -D -m 0644 sample_v2/helper/misc/bw_monitor.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/bw_monitor.h
- + $(INSTALL) -D -m 0644 sample_v2/helper/main_helper.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/main_helper.h
- + $(INSTALL) -D -m 0644 sample_v2/component/component.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/component.h
- + $(INSTALL) -D -m 0644 sample_v2/component/cnm_app_internal.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/cnm_app_internal.h
- + $(INSTALL) -D -m 0644 sample_v2/component/cnm_app.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/cnm_app.h
- + $(INSTALL) -D -m 0644 sample_v2/component/component_list.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/component_list.h
- + $(INSTALL) -D -m 0644 sample_v2/component_list_all.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_list_all.h
- + $(INSTALL) -D -m 0644 sample_v2/component_encoder/encoder_listener.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_encoder/encoder_listener.h
- + $(INSTALL) -D -m 0644 sample_v2/component_decoder/decoder_listener.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_decoder/decoder_listener.h
- + $(INSTALL) -D -m 0644 vdi/vdi_osal.h $(STAGING_DIR)/usr/include/wave511/vdi/vdi_osal.h
- + $(INSTALL) -D -m 0644 vdi/linux/driver/vmm.h $(STAGING_DIR)/usr/include/wave511/vdi/linux/driver/vmm.h
- + $(INSTALL) -D -m 0644 vdi/linux/driver/vpu.h $(STAGING_DIR)/usr/include/wave511/vdi/linux/driver/vpu.h
- + $(INSTALL) -D -m 0644 vdi/mm.h $(STAGING_DIR)/usr/include/wave511/vdi/mm.h
- + $(INSTALL) -D -m 0644 vdi/vdi.h $(STAGING_DIR)/usr/include/wave511/vdi/vdi.h
- + $(INSTALL) -D -m 0644 config.h $(STAGING_DIR)/usr/include/wave511/config.h
- + $(INSTALL) -D -m 0644 vpuapi/product.h $(STAGING_DIR)/usr/include/wave511/vpuapi/product.h
- + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9_vpuconfig.h $(STAGING_DIR)/usr/include/wave511/vpuapi/coda9/coda9_vpuconfig.h
- + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9.h $(STAGING_DIR)/usr/include/wave511/vpuapi/coda9/coda9.h
- + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9_regdefine.h $(STAGING_DIR)/usr/include/wave511/vpuapi/coda9/coda9_regdefine.h
- + $(INSTALL) -D -m 0644 vpuapi/vpuapi.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuapi.h
- + $(INSTALL) -D -m 0644 vpuapi/vpuconfig.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuconfig.h
- + $(INSTALL) -D -m 0644 vpuapi/wave/wave5.h $(STAGING_DIR)/usr/include/wave511/vpuapi/wave/wave5.h
- + $(INSTALL) -D -m 0644 vpuapi/wave/wave5_regdefine.h $(STAGING_DIR)/usr/include/wave511/vpuapi/wave/wave5_regdefine.h
- + $(INSTALL) -D -m 0644 vpuapi/vpuerror.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuerror.h
- + $(INSTALL) -D -m 0644 vpuapi/vputypes.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vputypes.h
- + $(INSTALL) -D -m 0644 vpuapi/vpuapifunc.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuapifunc.h
- diff --git a/wave511/wave511/sample_v2/helper/vpuhelper.c b/wave511/wave511/sample_v2/helper/vpuhelper.c
- index d655562..8c8e888 100644
- --- a/wave511/wave511/sample_v2/helper/vpuhelper.c
- +++ b/wave511/wave511/sample_v2/helper/vpuhelper.c
- @@ -1418,9 +1418,12 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
- return 0;
- if (pEncCfg)
- strcpy(pEncConfig->yuvFileName, pCfg->SrcFileName);
- - else
- - sprintf(pEncConfig->yuvFileName, "%s%s", yuvDir, pCfg->SrcFileName);
- -
- + else {
- + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s%s", yuvDir, pCfg->SrcFileName) >=
- + sizeof(pEncConfig->yuvFileName)) {
- + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
- + }
- + }
- if (pCfg->waveCfg.roiEnable) {
- strcpy(pEncConfig->roi_file_name, pCfg->waveCfg.roiFileName);
- if (!strcmp(pCfg->waveCfg.roiQpMapFile, "0") || pCfg->waveCfg.roiQpMapFile[0] == 0) {
- @@ -1487,7 +1490,10 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
- if (parseAvcCfgFile(pCfg, pEncConfig->cfgFileName) == 0)
- return 0;
- pEncConfig->picQpY = pCfg->PicQpY;
- - sprintf(pEncConfig->yuvFileName, "%s/%s", yuvDir, pCfg->SrcFileName);
- + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s/%s", yuvDir, pCfg->SrcFileName) >=
- + sizeof(pEncConfig->yuvFileName)) {
- + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
- + }
-
- if(pCfg->frameCropLeft || pCfg->frameCropRight || pCfg->frameCropTop || pCfg->frameCropBottom)
- pCfg->frameCroppingFlag = 1;
- @@ -1497,7 +1503,10 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
- if (parseMp4CfgFile(pCfg, pEncConfig->cfgFileName) == 0)
- return 0;
- pEncConfig->picQpY = pCfg->VopQuant;
- - sprintf(pEncConfig->yuvFileName, "%s/%s", yuvDir, pCfg->SrcFileName);
- + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s/%s", yuvDir, pCfg->SrcFileName) >=
- + sizeof(pEncConfig->yuvFileName)) {
- + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
- + }
- if (pCfg->ShortVideoHeader == 1) {
- pEncOP->bitstreamFormat = STD_H263;
- bitFormat = STD_H263;
- --
- 2.36.0
|