0001-wave511-fix-building-issue.patch 8.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125
  1. From 0e365b325c7ddd78087bb48c5c4d695f505a7f6b Mon Sep 17 00:00:00 2001
  2. From: Andy Hu <andy.hu@starfivetech.com>
  3. Date: Tue, 16 Aug 2022 19:52:20 +0800
  4. Subject: [PATCH] wave511: fix building issue
  5. ---
  6. wave511/wave511/WaveDecode_buildroot.mak | 46 +++++++++++++++++++-
  7. wave511/wave511/sample_v2/helper/vpuhelper.c | 19 +++++---
  8. 2 files changed, 59 insertions(+), 6 deletions(-)
  9. diff --git a/wave511/wave511/WaveDecode_buildroot.mak b/wave511/wave511/WaveDecode_buildroot.mak
  10. index e8b9f06..d2d05f5 100644
  11. --- a/wave511/wave511/WaveDecode_buildroot.mak
  12. +++ b/wave511/wave511/WaveDecode_buildroot.mak
  13. @@ -11,6 +11,10 @@ PRODUCT := WAVE511
  14. $(shell cp sample_v2/component_list_decoder.h sample_v2/component/component_list.h)
  15. +TARGET_DIR=../../target
  16. +STAGING_DIR=$(TARGET_DIR)
  17. +INSTALL=install
  18. +
  19. USE_PTHREAD = yes
  20. USE_RTL_SIM = no
  21. LINT_HOME = etc/lint
  22. @@ -57,7 +61,8 @@ ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedLinux")
  23. endif
  24. ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedRiscvLinux")
  25. - CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
  26. +# CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
  27. + CROSS_CC_PREFIX =
  28. PLATFORM = riscvlinux
  29. endif
  30. CC = $(CROSS_CC_PREFIX)gcc
  31. @@ -166,3 +171,42 @@ obj/%.o: %.c $(MAKEFILE)
  32. lint:
  33. "$(LINT_HOME)/flint" -i"$(LINT_HOME)" $(DEFINES) $(INCLUDES) $(VPATH2) linux_std.lnt $(HAPS_RULE) $(NONOS_RULE) $(SOURCES_COMMON)
  34. +install:
  35. + @echo install ...
  36. + $(INSTALL) -D -m 0777 vdi/linux/driver/load.sh $(TARGET_DIR)/root/wave511/vdec_load.sh
  37. + $(INSTALL) -D -m 0777 vdi/linux/driver/unload.sh $(TARGET_DIR)/root/wave511/vdec_unload.sh
  38. + $(INSTALL) -D -m 0644 libsfdec.so $(TARGET_DIR)/usr/lib/libsfdec.so
  39. + $(INSTALL) -D -m 0644 ../firmware/chagall.bin $(TARGET_DIR)/lib/firmware/chagall.bin
  40. + @echo "install STAGING_DIR ..."
  41. + $(INSTALL) -D -m 0644 sample_v2/component_list_decoder.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_list_decoder.h
  42. + $(INSTALL) -D -m 0644 sample_v2/component_list_encoder.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_list_encoder.h
  43. + $(INSTALL) -D -m 0644 sample_v2/helper/misc/pbu.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/pbu.h
  44. + $(INSTALL) -D -m 0644 sample_v2/helper/misc/header_struct.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/header_struct.h
  45. + $(INSTALL) -D -m 0644 sample_v2/helper/misc/json_output.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/json_output.h
  46. + $(INSTALL) -D -m 0644 sample_v2/helper/misc/debug.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/debug.h
  47. + $(INSTALL) -D -m 0644 sample_v2/helper/misc/bw_monitor.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/misc/bw_monitor.h
  48. + $(INSTALL) -D -m 0644 sample_v2/helper/main_helper.h $(STAGING_DIR)/usr/include/wave511/sample_v2/helper/main_helper.h
  49. + $(INSTALL) -D -m 0644 sample_v2/component/component.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/component.h
  50. + $(INSTALL) -D -m 0644 sample_v2/component/cnm_app_internal.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/cnm_app_internal.h
  51. + $(INSTALL) -D -m 0644 sample_v2/component/cnm_app.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/cnm_app.h
  52. + $(INSTALL) -D -m 0644 sample_v2/component/component_list.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component/component_list.h
  53. + $(INSTALL) -D -m 0644 sample_v2/component_list_all.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_list_all.h
  54. + $(INSTALL) -D -m 0644 sample_v2/component_encoder/encoder_listener.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_encoder/encoder_listener.h
  55. + $(INSTALL) -D -m 0644 sample_v2/component_decoder/decoder_listener.h $(STAGING_DIR)/usr/include/wave511/sample_v2/component_decoder/decoder_listener.h
  56. + $(INSTALL) -D -m 0644 vdi/vdi_osal.h $(STAGING_DIR)/usr/include/wave511/vdi/vdi_osal.h
  57. + $(INSTALL) -D -m 0644 vdi/linux/driver/vmm.h $(STAGING_DIR)/usr/include/wave511/vdi/linux/driver/vmm.h
  58. + $(INSTALL) -D -m 0644 vdi/linux/driver/vpu.h $(STAGING_DIR)/usr/include/wave511/vdi/linux/driver/vpu.h
  59. + $(INSTALL) -D -m 0644 vdi/mm.h $(STAGING_DIR)/usr/include/wave511/vdi/mm.h
  60. + $(INSTALL) -D -m 0644 vdi/vdi.h $(STAGING_DIR)/usr/include/wave511/vdi/vdi.h
  61. + $(INSTALL) -D -m 0644 config.h $(STAGING_DIR)/usr/include/wave511/config.h
  62. + $(INSTALL) -D -m 0644 vpuapi/product.h $(STAGING_DIR)/usr/include/wave511/vpuapi/product.h
  63. + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9_vpuconfig.h $(STAGING_DIR)/usr/include/wave511/vpuapi/coda9/coda9_vpuconfig.h
  64. + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9.h $(STAGING_DIR)/usr/include/wave511/vpuapi/coda9/coda9.h
  65. + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9_regdefine.h $(STAGING_DIR)/usr/include/wave511/vpuapi/coda9/coda9_regdefine.h
  66. + $(INSTALL) -D -m 0644 vpuapi/vpuapi.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuapi.h
  67. + $(INSTALL) -D -m 0644 vpuapi/vpuconfig.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuconfig.h
  68. + $(INSTALL) -D -m 0644 vpuapi/wave/wave5.h $(STAGING_DIR)/usr/include/wave511/vpuapi/wave/wave5.h
  69. + $(INSTALL) -D -m 0644 vpuapi/wave/wave5_regdefine.h $(STAGING_DIR)/usr/include/wave511/vpuapi/wave/wave5_regdefine.h
  70. + $(INSTALL) -D -m 0644 vpuapi/vpuerror.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuerror.h
  71. + $(INSTALL) -D -m 0644 vpuapi/vputypes.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vputypes.h
  72. + $(INSTALL) -D -m 0644 vpuapi/vpuapifunc.h $(STAGING_DIR)/usr/include/wave511/vpuapi/vpuapifunc.h
  73. diff --git a/wave511/wave511/sample_v2/helper/vpuhelper.c b/wave511/wave511/sample_v2/helper/vpuhelper.c
  74. index d655562..8c8e888 100644
  75. --- a/wave511/wave511/sample_v2/helper/vpuhelper.c
  76. +++ b/wave511/wave511/sample_v2/helper/vpuhelper.c
  77. @@ -1418,9 +1418,12 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
  78. return 0;
  79. if (pEncCfg)
  80. strcpy(pEncConfig->yuvFileName, pCfg->SrcFileName);
  81. - else
  82. - sprintf(pEncConfig->yuvFileName, "%s%s", yuvDir, pCfg->SrcFileName);
  83. -
  84. + else {
  85. + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s%s", yuvDir, pCfg->SrcFileName) >=
  86. + sizeof(pEncConfig->yuvFileName)) {
  87. + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
  88. + }
  89. + }
  90. if (pCfg->waveCfg.roiEnable) {
  91. strcpy(pEncConfig->roi_file_name, pCfg->waveCfg.roiFileName);
  92. if (!strcmp(pCfg->waveCfg.roiQpMapFile, "0") || pCfg->waveCfg.roiQpMapFile[0] == 0) {
  93. @@ -1487,7 +1490,10 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
  94. if (parseAvcCfgFile(pCfg, pEncConfig->cfgFileName) == 0)
  95. return 0;
  96. pEncConfig->picQpY = pCfg->PicQpY;
  97. - sprintf(pEncConfig->yuvFileName, "%s/%s", yuvDir, pCfg->SrcFileName);
  98. + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s/%s", yuvDir, pCfg->SrcFileName) >=
  99. + sizeof(pEncConfig->yuvFileName)) {
  100. + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
  101. + }
  102. if(pCfg->frameCropLeft || pCfg->frameCropRight || pCfg->frameCropTop || pCfg->frameCropBottom)
  103. pCfg->frameCroppingFlag = 1;
  104. @@ -1497,7 +1503,10 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
  105. if (parseMp4CfgFile(pCfg, pEncConfig->cfgFileName) == 0)
  106. return 0;
  107. pEncConfig->picQpY = pCfg->VopQuant;
  108. - sprintf(pEncConfig->yuvFileName, "%s/%s", yuvDir, pCfg->SrcFileName);
  109. + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s/%s", yuvDir, pCfg->SrcFileName) >=
  110. + sizeof(pEncConfig->yuvFileName)) {
  111. + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
  112. + }
  113. if (pCfg->ShortVideoHeader == 1) {
  114. pEncOP->bitstreamFormat = STD_H263;
  115. bitFormat = STD_H263;
  116. --
  117. 2.36.0