zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add RTC_ prefix to non-standard format specifier macro "PRIdNS"

Browse Source 
Some of the macros in format_macros.h follow the C standard and try to fill holes in it (on Windows). But this one has no direct equivalent in the standard and is just mimicking the naming convention. That's not nice.

References:
https://devblogs.microsoft.com/cppblog/c99-library-support-in-visual-studio-2013/
https://stackoverflow.com/a/2524673

Change-Id: I53f3faca2976a5b5d4b04a67ffb56ae0f4e930b2
Bug: webrtc:10852
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147862
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28794}
This commit is contained in:
Oleh Prypin
2019-08-02 09:36:47 +02:00
committed by Commit Bot
parent 12ebfa69ba
commit b1686786e8
18 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
View File

@ -906,7 +906,7 @@ int main(int argc, char* argv[]) {
#endif
}
printf("\n");
printf("total bits = %" PRIuS " bits\n", totalbits);
printf("total bits = %" RTC_PRIuS " bits\n", totalbits);
printf("measured average bitrate = %0.3f kbits/s\n",
(double)totalbits * (sampFreqKHz) / totalsmpls);
if (doTransCoding) {
@ -925,11 +925,13 @@ int main(int argc, char* argv[]) {
(100 * runtime / length_file));
if (maxStreamLen30 != 0) {
printf("Maximum payload size 30ms Frames %" PRIuS " bytes (%0.3f kbps)\n",
printf("Maximum payload size 30ms Frames %" RTC_PRIuS
" bytes (%0.3f kbps)\n",
maxStreamLen30, maxStreamLen30 * 8 / 30.);
}
if (maxStreamLen60 != 0) {
printf("Maximum payload size 60ms Frames %" PRIuS " bytes (%0.3f kbps)\n",
printf("Maximum payload size 60ms Frames %" RTC_PRIuS
" bytes (%0.3f kbps)\n",
maxStreamLen60, maxStreamLen60 * 8 / 60.);
}
// fprintf(stderr, "\n");
@ -938,11 +940,11 @@ int main(int argc, char* argv[]) {
fprintf(stderr, " %0.1f kbps",
(double)totalbits * (sampFreqKHz) / totalsmpls);
if (maxStreamLen30 != 0) {
fprintf(stderr, " plmax-30ms %" PRIuS " bytes (%0.0f kbps)",
fprintf(stderr, " plmax-30ms %" RTC_PRIuS " bytes (%0.0f kbps)",
maxStreamLen30, maxStreamLen30 * 8 / 30.);
}
if (maxStreamLen60 != 0) {
fprintf(stderr, " plmax-60ms %" PRIuS " bytes (%0.0f kbps)",
fprintf(stderr, " plmax-60ms %" RTC_PRIuS " bytes (%0.0f kbps)",
maxStreamLen60, maxStreamLen60 * 8 / 60.);
}
if (doTransCoding) {

2
modules/audio_coding/codecs/isac/main/test/simpleKenny.c
View File

@ -424,7 +424,7 @@ int main(int argc, char* argv[]) {
printf("\n");
printf("Measured bit-rate........... %0.3f kbps\n", rate);
printf("Measured RCU bit-ratre...... %0.3f kbps\n", rateRCU);
printf("Maximum bit-rate/payloadsize %0.3f / %" PRIuS "\n",
printf("Maximum bit-rate/payloadsize %0.3f / %" RTC_PRIuS "\n",
maxStreamLen * 8 / 0.03, maxStreamLen);
printf("Measured packet-loss........ %0.1f%% \n",
100.0f * (float)lostPacketCntr / (float)packetCntr);

3
modules/audio_coding/codecs/opus/opus_fec_test.cc
View File

@ -70,7 +70,8 @@ class OpusFecTest : public TestWithParam<coding_param> {
void OpusFecTest::SetUp() {
channels_ = get<0>(GetParam());
bit_rate_ = get<1>(GetParam());
printf("Coding %" PRIuS " channel signal at %d bps.\n", channels_, bit_rate_);
printf("Coding %" RTC_PRIuS " channel signal at %d bps.\n", channels_,
bit_rate_);
in_filename_ = test::ResourcePath(get<2>(GetParam()), get<3>(GetParam()));

2
modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
View File

@ -99,7 +99,7 @@ void AudioCodecSpeedTest::EncodeDecode(size_t audio_duration_sec) {
size_t time_now_ms = 0;
float time_ms;
printf("Coding %d kHz-sampled %" PRIuS "-channel audio at %d bps ...\n",
printf("Coding %d kHz-sampled %" RTC_PRIuS "-channel audio at %d bps ...\n",
input_sampling_khz_, channels_, bit_rate_);
while (time_now_ms < audio_duration_sec * 1000) {