diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-18 03:11:29 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-18 03:11:29 +0000 |
| commit | b82d50e7c156943a494a2c16b1a311db43bbf896 (patch) | |
| tree | ed12da495bd076a1c8532d7e051393aa343f2357 | |
| parent | 42f9dffd4ef4e9a010f286ced7d80079ba0750a6 (diff) | |
| parent | 662d81de5cbf3667f1baaafe051b8b4ab0b12fe2 (diff) | |
| download | libsrtp-b82d50e7c156943a494a2c16b1a311db43bbf896.tar.gz | |
Merge third_party/libsrtp from https://chromium.googlesource.com/chromium/deps/libsrtp.git at 662d81de5cbf3667f1baaafe051b8b4ab0b12fe2
This commit was generated by merge_from_chromium.py.
Change-Id: I228102856110fba75530b2ffa9e463acb75967d2
| -rw-r--r-- | srtp/test/srtp_driver.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/srtp/test/srtp_driver.c b/srtp/test/srtp_driver.c index a1b4866..5f67fdd 100644 --- a/srtp/test/srtp_driver.c +++ b/srtp/test/srtp_driver.c @@ -338,7 +338,7 @@ main (int argc, char *argv[]) { if (do_codec_timing) { srtp_policy_t policy; int ignore; - double mips = mips_estimate(1000000000, &ignore); + double mips_value = mips_estimate(1000000000, &ignore); crypto_policy_set_rtp_default(&policy.rtp); crypto_policy_set_rtcp_default(&policy.rtcp); @@ -350,33 +350,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_value); 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_value * (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_value * (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_value * (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_value * (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_value * (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_value * (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_value * (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_value * (640 * 8) / srtp_bits_per_second(640, &policy) / .02 ); } |