generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation errors on Fedora 20.

Browse Source 
peerconnection_jni.cc: syscall() comes from <unistd.h>
RTPtimeshift.cc: char* being compared to 0 instead of the atoi() of it
rtp_payload_registry_unittest.cc: avoid narrowing int to uint32.

BUG=2700
R=andrew@webrtc.org, fischman@webrtc.org, henrik.lundin@webrtc.org, henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5019004

Patch from Victor Costan <costan@gmail.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5248 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-12-09 21:34:30 +00:00
parent c329529047
commit eb7def234e
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -10,6 +10,7 @@ Martin Storsjo <martin@martin.st>
Pali Rohar Pali Rohar
Robert Nagy Robert Nagy
Silviu Caragea <silviu.cpp@gmail.com> Silviu Caragea <silviu.cpp@gmail.com>
Victor Costan <costan@gmail.com>
Google Inc. Google Inc.
Intel Corporation Intel Corporation

1
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -61,6 +61,7 @@
#include <map> #include <map>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <unistd.h>
#include "talk/app/webrtc/mediaconstraintsinterface.h" #include "talk/app/webrtc/mediaconstraintsinterface.h"
#include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/peerconnectioninterface.h"

10
webrtc/modules/audio_coding/neteq4/test/RTPtimeshift.cc
View File

@ -68,12 +68,14 @@ int main(int argc, char* argv[])
uint32_t ATdiff = 0; uint32_t ATdiff = 0;
if (argc > 4) if (argc > 4)
{ {
if (argv[4] >= 0) int startSN = atoi(argv[4]);
SNdiff = atoi(argv[4]) - packet.sequenceNumber(); if (startSN >= 0)
SNdiff = startSN - packet.sequenceNumber();
if (argc > 5) if (argc > 5)
{ {
if (argv[5] >= 0) int startTS = atoi(argv[5]);
ATdiff = atoi(argv[5]) - packet.time(); if (startTS >= 0)
ATdiff = startTS - packet.time();
} }
} }

2
webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
View File

@ -38,7 +38,7 @@ class RtpPayloadRegistryTest : public ::testing::Test {
protected: protected:
ModuleRTPUtility::Payload* ExpectReturnOfTypicalAudioPayload( ModuleRTPUtility::Payload* ExpectReturnOfTypicalAudioPayload(
uint8_t payload_type, int rate) { uint8_t payload_type, uint32_t rate) {
bool audio = true; bool audio = true;
ModuleRTPUtility::Payload returned_payload = { "name", audio, { ModuleRTPUtility::Payload returned_payload = { "name", audio, {
// Initialize the audio struct in this case. // Initialize the audio struct in this case.