发现2个编译的小问题哈

cestlavieliu commented 5 years ago

diff --git a/project/razor.vcxproj b/project/razor.vcxproj
index 010f219..7a2a1e6 100644
--- a/project/razor.vcxproj
+++ b/project/razor.vcxproj
@@ -98,10 +98,9 @@
     <ClCompile Include="..\estimator\aimd_rate_control.c" />
     <ClCompile Include="..\estimator\bitrate_controller.c" />
     <ClCompile Include="..\estimator\cc_loss_stat.c" />
+    <ClCompile Include="..\estimator\cc_feedback_adapter.c" />
     <ClCompile Include="..\estimator\delay_base_bwe.c" />
     <ClCompile Include="..\estimator\estimator_common.c" />
-    <ClCompile Include="..\estimator\cc_feedback_adapter.c" />
-    <ClCompile Include="..\estimator\cc_feedback_adapter.h" />
     <ClCompile Include="..\estimator\inter_arrival.c" />
     <ClCompile Include="..\estimator\kalman_filter.c" />
     <ClCompile Include="..\estimator\overuse_detector.c" />
@@ -120,7 +119,7 @@
     <ClInclude Include="..\bbr\bbr_bandwidth_sample.h" />
     <ClInclude Include="..\bbr\bbr_common.h" />
     <ClInclude Include="..\bbr\bbr_controller.h" />
-    <ClInclude Include="..\bbr\bbr_feedback_adpater.h" />
+    <ClInclude Include="..\bbr\bbr_feedback_adapter.h" />
     <ClInclude Include="..\bbr\bbr_loss_rate_filter.h" />
     <ClInclude Include="..\bbr\bbr_pacer.h" />
     <ClInclude Include="..\bbr\bbr_receiver.h" />
@@ -142,6 +141,7 @@
     <ClInclude Include="..\estimator\ack_bitrate_estimator.h" />
     <ClInclude Include="..\estimator\aimd_rate_control.h" />
     <ClInclude Include="..\estimator\bitrate_controller.h" />
+    <ClInclude Include="..\estimator\cc_feedback_adapter.h" />
     <ClInclude Include="..\estimator\cc_loss_stat.h" />
     <ClInclude Include="..\estimator\delay_base_bwe.h" />
     <ClInclude Include="..\estimator\estimator_common.h" />
diff --git a/test/bbr_controller_test.c b/test/bbr_controller_test.c
index 18d1e70..98b98c6 100644
--- a/test/bbr_controller_test.c
+++ b/test/bbr_controller_test.c
@@ -192,7 +192,9 @@
                    feedback.data_in_flight += packet->size;
                }

-               ctrl->update = bbr_on_feedback(ctrl->bbr, &feedback);
+               uint32_t acked_bitrate;
+               acked_bitrate = bbr_feedback_get_birate(&feedback) / 8000;
+               ctrl->update = bbr_on_feedback(ctrl->bbr, &feedback, acked_bitrate);
            }
        }

Ravendocker commented 5 years ago

请问一下，编译出错误，cc_feedback_adapter.obj : warning LNK4042: object specified more than once; extras ignored，导致razor.lib(sender_congestion_controller.obj) : error LNK2019: unresolved external symbol _cc_feedback_adapter_init referenced in function _sender_cc_create，怎么解决呀

yuanrongxi commented 5 years ago

在cc_feedback_adapter.c上空格下，再编译就好了

powervv commented 4 years ago

主要原因是razor.vcxproj多了 ClCompile Include="..\estimator\cc_feedback_adapter.h"，把这个去掉，问题解决彻底点。

Alexyali commented 4 years ago

请问在cc_feedback_adapter.c上空格下是什么意思，老师可以详细说明一下吗

Ravendocker commented 4 years ago

        cc_feedback_adaptor后加空格再加.c

                        ravenfhw

                                邮箱：ravenfhw@foxmail.com

Signature is customized by Netease Mail Master

        在2020年05月01日 22:18，Alexyali 写道：

请问在cc_feedback_adapter.c上空格下是什么意思，老师可以详细说明一下吗

—You are receiving this because you commented.Reply to this email directly, view it on GitHub, or unsubscribe.

[

{

"@context": "http://schema.org",

"@type": "EmailMessage",

"potentialAction": {

"@type": "ViewAction",

"target": "https://github.com/yuanrongxi/razor/issues/19#issuecomment-622406461",

"url": "https://github.com/yuanrongxi/razor/issues/19#issuecomment-622406461",

"name": "View Issue"

},

"description": "View this Issue on GitHub",

"publisher": {

"@type": "Organization",

"name": "GitHub",

"url": "https://github.com"

}

]

Alexyali commented 4 years ago

调通项目以后，让sender和receiver通信，但是每次sender端发到frame Id=544左右的时候就会出现内存读取访问权限冲突的中断问题，显示sender变量的内存无法读取。请问有什么解决办法吗？

yuanrongxi / razor

发现2个编译的小问题哈 #19