summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxueli <[email protected]>2023-02-22 18:27:33 +0800
committerliuxueli <[email protected]>2023-02-22 18:27:33 +0800
commit06647224445664907b49fbc9dcdc08bc7dbe430e (patch)
treec28e68185c7d0ff1d509b8b5174eaddc8693d543
parenta5d304979694dd40f76766bd763ef35d38867aea (diff)
对命中的策略去重后,若无新增命中策略则不通知shapingv5.10.5
-rw-r--r--src/tsg_entry.cpp2
-rw-r--r--test/src/gtest_common.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp
index f64ad86..a83c5f7 100644
--- a/src/tsg_entry.cpp
+++ b/src/tsg_entry.cpp
@@ -1182,7 +1182,7 @@ static void set_shaping_result_to_project(const struct streaminfo *a_stream, str
}
}
- if(inc_result==0)
+ if(inc_result_num==0)
{
return ;
}
diff --git a/test/src/gtest_common.cpp b/test/src/gtest_common.cpp
index 883d5b8..6dcf036 100644
--- a/test/src/gtest_common.cpp
+++ b/test/src/gtest_common.cpp
@@ -108,10 +108,7 @@ int stream_bridge_register_data_free_cb(int bridge_id, stream_bridge_free_cb_t *
int stream_bridge_register_data_sync_cb(int bridge_id, stream_bridge_sync_cb_t * sync_cb_fun)
{
- if(g_bridge_sync_cb[bridge_id])
- {
- g_bridge_sync_cb[bridge_id]=sync_cb_fun;
- }
+ g_bridge_sync_cb[bridge_id]=*(stream_bridge_sync_cb_t *)sync_cb_fun;
return 0;
}