56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
diff -urp libsrtp-1.5.0/test/srtp_driver.c l/test/srtp_driver.c
|
|
--- libsrtp-1.5.0/test/srtp_driver.c 2014-10-13 16:35:33.000000000 +0200
|
|
+++ libsrtp-1.5.4/test/srtp_driver.c 2015-09-18 06:41:50.740727805 +0200
|
|
@@ -341,7 +341,7 @@ main (int argc, char *argv[]) {
|
|
if (do_codec_timing) {
|
|
srtp_policy_t policy;
|
|
int ignore;
|
|
- double mips = mips_estimate(1000000000, &ignore);
|
|
+ double mips_est = mips_estimate(1000000000, &ignore);
|
|
|
|
crypto_policy_set_rtp_default(&policy.rtp);
|
|
crypto_policy_set_rtcp_default(&policy.rtcp);
|
|
@@ -353,33 +353,33 @@ main (int argc, char *argv[]) {
|
|
policy.allow_repeat_tx = 0;
|
|
policy.next = NULL;
|
|
|
|
- printf("mips estimate: %e\n", mips);
|
|
+ printf("mips estimate: %e\n", mips_est);
|
|
|
|
printf("testing srtp processing time for voice codecs:\n");
|
|
printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n");
|
|
printf("G.711\t\t%d\t\t\t%e\n", 80,
|
|
- (double) mips * (80 * 8) /
|
|
+ (double) mips_est * (80 * 8) /
|
|
srtp_bits_per_second(80, &policy) / .01 );
|
|
printf("G.711\t\t%d\t\t\t%e\n", 160,
|
|
- (double) mips * (160 * 8) /
|
|
+ (double) mips_est * (160 * 8) /
|
|
srtp_bits_per_second(160, &policy) / .02);
|
|
printf("G.726-32\t%d\t\t\t%e\n", 40,
|
|
- (double) mips * (40 * 8) /
|
|
+ (double) mips_est * (40 * 8) /
|
|
srtp_bits_per_second(40, &policy) / .01 );
|
|
printf("G.726-32\t%d\t\t\t%e\n", 80,
|
|
- (double) mips * (80 * 8) /
|
|
+ (double) mips_est * (80 * 8) /
|
|
srtp_bits_per_second(80, &policy) / .02);
|
|
printf("G.729\t\t%d\t\t\t%e\n", 10,
|
|
- (double) mips * (10 * 8) /
|
|
+ (double) mips_est * (10 * 8) /
|
|
srtp_bits_per_second(10, &policy) / .01 );
|
|
printf("G.729\t\t%d\t\t\t%e\n", 20,
|
|
- (double) mips * (20 * 8) /
|
|
+ (double) mips_est * (20 * 8) /
|
|
srtp_bits_per_second(20, &policy) / .02 );
|
|
printf("Wideband\t%d\t\t\t%e\n", 320,
|
|
- (double) mips * (320 * 8) /
|
|
+ (double) mips_est * (320 * 8) /
|
|
srtp_bits_per_second(320, &policy) / .01 );
|
|
printf("Wideband\t%d\t\t\t%e\n", 640,
|
|
- (double) mips * (640 * 8) /
|
|
+ (double) mips_est * (640 * 8) /
|
|
srtp_bits_per_second(640, &policy) / .02 );
|
|
}
|
|
|