0002-wave420l-fix-building-issue.patch 8.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124
  1. From 0131ee14620181c35ce8ad775fb289fcb4cf0a38 Mon Sep 17 00:00:00 2001
  2. From: Andy Hu <andy.hu@starfivetech.com>
  3. Date: Tue, 16 Aug 2022 21:52:55 +0800
  4. Subject: [PATCH] wave420l: fix building issue
  5. ---
  6. wave420l/code/WaveEncoder_buildroot.mak | 47 ++++++++++++++++++++++++-
  7. wave420l/code/sample/helper/vpuhelper.c | 24 +++++++++----
  8. 2 files changed, 64 insertions(+), 7 deletions(-)
  9. diff --git a/wave420l/code/WaveEncoder_buildroot.mak b/wave420l/code/WaveEncoder_buildroot.mak
  10. index a6ea84d..1f6b938 100755
  11. --- a/wave420l/code/WaveEncoder_buildroot.mak
  12. +++ b/wave420l/code/WaveEncoder_buildroot.mak
  13. @@ -43,7 +43,8 @@ ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedLinux")
  14. endif
  15. ifeq ("$(BUILD_CONFIGURATION)", "RiscvLinux")
  16. - CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
  17. +# CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
  18. + CROSS_CC_PREFIX =
  19. PLATFORM = riscvlinux
  20. USE_FFMPEG = no
  21. USE_PTHREAD = yes
  22. @@ -273,3 +274,47 @@ endif
  23. force_dependency :
  24. true
  25. +TARGET_DIR=../../target
  26. +STAGING_DIR=$(TARGET_DIR)
  27. +INSTALL=install
  28. +
  29. +install:
  30. + @echo install ...
  31. + $(INSTALL) -D -m 0777 vdi/linux/driver/load.sh $(TARGET_DIR)/root/wave420l/venc_load.sh
  32. + $(INSTALL) -D -m 0777 vdi/linux/driver/unload.sh $(TARGET_DIR)/root/wave420l/venc_unload.sh
  33. + $(INSTALL) -D -m 0644 libsfenc.so $(TARGET_DIR)/usr/lib/libsfenc.so
  34. + $(INSTALL) -D -m 0644 ../firmware/monet.bin $(TARGET_DIR)/lib/firmware/monet.bin
  35. + $(INSTALL) -D -m 0644 cfg/encoder_defconfig.cfg $(TARGET_DIR)/lib/firmware/encoder_defconfig.cfg
  36. + @echo "install STAGING_DIR ..."
  37. + $(INSTALL) -D -m 0644 vpuapi/vpuconfig.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/vpuconfig.h
  38. + $(INSTALL) -D -m 0644 vpuapi/product.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/product.h
  39. + $(INSTALL) -D -m 0644 vpuapi/vputypes.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/vputypes.h
  40. + $(INSTALL) -D -m 0644 vpuapi/vpuapi.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/vpuapi.h
  41. + $(INSTALL) -D -m 0644 vpuapi/vpuapifunc.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/vpuapifunc.h
  42. + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9_vpuconfig.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/coda9/coda9_vpuconfig.h
  43. + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/coda9/coda9.h
  44. + $(INSTALL) -D -m 0644 vpuapi/coda9/coda9_regdefine.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/coda9/coda9_regdefine.h
  45. + $(INSTALL) -D -m 0644 vpuapi/wave/coda7q/coda7q_regdefine.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/coda7q/coda7q_regdefine.h
  46. + $(INSTALL) -D -m 0644 vpuapi/wave/coda7q/coda7q.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/coda7q/coda7q.h
  47. + $(INSTALL) -D -m 0644 vpuapi/wave/wave4/wave4.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/wave4/wave4.h
  48. + $(INSTALL) -D -m 0644 vpuapi/wave/wave4/wave4_regdefine.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/wave4/wave4_regdefine.h
  49. + $(INSTALL) -D -m 0644 vpuapi/wave/wave5/wave5.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/wave5/wave5.h
  50. + $(INSTALL) -D -m 0644 vpuapi/wave/wave5/wave5_regdefine.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/wave5/wave5_regdefine.h
  51. + $(INSTALL) -D -m 0644 vpuapi/wave/common/common.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/common/common.h
  52. + $(INSTALL) -D -m 0644 vpuapi/wave/common/common_vpuconfig.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/common/common_vpuconfig.h
  53. + $(INSTALL) -D -m 0644 vpuapi/wave/common/common_regdefine.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/wave/common/common_regdefine.h
  54. + $(INSTALL) -D -m 0644 vpuapi/vpuerror.h $(STAGING_DIR)/usr/include/wave420l/vpuapi/vpuerror.h
  55. + $(INSTALL) -D -m 0644 sample/helper/misc/pbu.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/misc/pbu.h
  56. + $(INSTALL) -D -m 0644 sample/helper/misc/skip.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/misc/skip.h
  57. + $(INSTALL) -D -m 0644 sample/helper/misc/getopt.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/misc/getopt.h
  58. + $(INSTALL) -D -m 0644 sample/helper/misc/header_struct.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/misc/header_struct.h
  59. + $(INSTALL) -D -m 0644 sample/helper/misc/debug.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/misc/debug.h
  60. + $(INSTALL) -D -m 0644 sample/helper/msvc/inttypes.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/msvc/inttypes.h
  61. + $(INSTALL) -D -m 0644 sample/helper/msvc/stdint.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/msvc/stdint.h
  62. + $(INSTALL) -D -m 0644 sample/helper/main_helper.h $(STAGING_DIR)/usr/include/wave420l/sample/helper/main_helper.h
  63. + $(INSTALL) -D -m 0644 vdi/mm.h $(STAGING_DIR)/usr/include/wave420l/vdi/mm.h
  64. + $(INSTALL) -D -m 0644 vdi/linux/driver/vmm.h $(STAGING_DIR)/usr/include/wave420l/vdi/linux/driver/vmm.h
  65. + $(INSTALL) -D -m 0644 vdi/linux/driver/vpu.h $(STAGING_DIR)/usr/include/wave420l/vdi/linux/driver/vpu.h
  66. + $(INSTALL) -D -m 0644 vdi/vdi.h $(STAGING_DIR)/usr/include/wave420l/vdi/vdi.h
  67. + $(INSTALL) -D -m 0644 vdi/vdi_osal.h $(STAGING_DIR)/usr/include/wave420l/vdi/vdi_osal.h
  68. + $(INSTALL) -D -m 0644 config.h $(STAGING_DIR)/usr/include/wave420l/config.h
  69. diff --git a/wave420l/code/sample/helper/vpuhelper.c b/wave420l/code/sample/helper/vpuhelper.c
  70. index 711375b..688dbf6 100644
  71. --- a/wave420l/code/sample/helper/vpuhelper.c
  72. +++ b/wave420l/code/sample/helper/vpuhelper.c
  73. @@ -1674,8 +1674,12 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
  74. pEncConfig->picQpY = pCfg->PicQpY;
  75. if (pEncCfg)
  76. strcpy(pEncConfig->yuvFileName, pCfg->SrcFileName);
  77. - else
  78. - sprintf(pEncConfig->yuvFileName, "%s%s", yuvDir, pCfg->SrcFileName);
  79. + else {
  80. + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s%s", yuvDir, pCfg->SrcFileName) >=
  81. + sizeof(pEncConfig->yuvFileName)) {
  82. + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
  83. + }
  84. + }
  85. #ifdef SUPPORT_980_RC_LIB
  86. if(pEncOP->EncStdParam.avcParam.svcExtension == TRUE)
  87. @@ -1699,8 +1703,12 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
  88. pEncConfig->picQpY = pCfg->VopQuant;
  89. if (pEncCfg)
  90. strcpy(pEncConfig->yuvFileName, pCfg->SrcFileName);
  91. - else
  92. - sprintf(pEncConfig->yuvFileName, "%s%s", yuvDir, pCfg->SrcFileName);
  93. + else {
  94. + if (snprintf(pEncConfig->yuvFileName, sizeof(pEncConfig->yuvFileName), "%s%s", yuvDir, pCfg->SrcFileName) >=
  95. + sizeof(pEncConfig->yuvFileName)) {
  96. + fprintf(stderr, "yuvFileName overflow -- string is truncated\n");
  97. + }
  98. + }
  99. if (pCfg->ShortVideoHeader == 1) {
  100. pEncOP->bitstreamFormat = STD_H263;
  101. bitFormat = STD_H263;
  102. @@ -1711,8 +1719,12 @@ Int32 GetEncOpenParam(EncOpenParam *pEncOP, TestEncConfig *pEncConfig, ENC_CFG *
  103. return 0;
  104. if (pEncCfg)
  105. strcpy(pEncConfig->yuvFileName, pCfg->SrcFileName);
  106. - else
  107. - sprintf(pEncConfig->yuvFileName, "%s%s", yuvDir, pCfg->SrcFileName);
  108. + else {
  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. + }
  114. if (pEncConfig->bitstreamFileName[0] == 0 && pCfg->BitStreamFileName[0] != 0)
  115. sprintf(pEncConfig->bitstreamFileName, "%s", pCfg->BitStreamFileName);
  116. --
  117. 2.36.0