~ubuntu-branches/ubuntu/precise/crtmpserver/precise-backports

« back to all changes in this revision

Viewing changes to thelib/src/protocols/rtp/rtcpprotocol.cpp

Committer: Package Import Robot
Author(s): Micah Gersten
Date: 2012-07-04 00:04:40 UTC
mfrom: (3.1.7 sid)
Revision ID: package-import@ubuntu.com-20120704000440-u9x7yhyglqjvspk8

Tags: 1.0~dfsg-3~ubuntu12.04.1

https://launchpad.net/bugs/964153

No-change backport to precise (LP: #964153)

files added:
.pc/.quilt_patches

.pc/.quilt_series

.pc/19_gcc_4_7_compatibility.diff

.pc/19_gcc_4_7_compatibility.diff/common

.pc/19_gcc_4_7_compatibility.diff/common/include

.pc/19_gcc_4_7_compatibility.diff/common/include/platform

.pc/19_gcc_4_7_compatibility.diff/common/include/platform/linux

.pc/19_gcc_4_7_compatibility.diff/common/include/platform/linux/linuxplatform.h

LICENSE

README

applications/proxypublish/include/jobstimerappprotocolhandler.h

applications/proxypublish/include/jobstimerprotocol.h

applications/proxypublish/src/jobstimerappprotocolhandler.cpp

applications/proxypublish/src/jobstimerprotocol.cpp

debian/crtmpserver-apps.prerm

debian/patches/19_gcc_4_7_compatibility.diff

tests

tests/CMakeLists.txt

tests/include

tests/include/basetestssuite.h

tests/include/commontestssuite.h

tests/include/thelibtestssuite.h

tests/include/varianttestssuite.h

tests/src

tests/src/basetestssuite.cpp

tests/src/commontestssuite.cpp

tests/src/main.cpp

tests/src/thelibtestssuite.cpp

tests/src/varianttestssuite.cpp

thelib/include/configuration/module.h

thelib/include/protocols/rtp/nattraversalprotocol.h

thelib/src/configuration/module.cpp

thelib/src/protocols/rtp/nattraversalprotocol.cpp

files removed:
.pc/11_change_log_location.diff

.pc/11_change_log_location.diff/crtmpserver

.pc/11_change_log_location.diff/crtmpserver/crtmpserver.lua

applications/appselector/server.crt

applications/appselector/server.key

applications/flvplayback/users.lua

crtmpserver/crtmpserver.lua

debian/crtmpserver-apps.examples

debian/patches/11_change_log_location.diff

files modified:
.pc/05_dont_Werror.diff/CMakeLists.txt

.pc/10_disable_tests_vmtests.diff/CMakeLists.txt

.pc/applied-patches

CMakeLists.txt

applications/admin/include/admin.h

applications/admin/src/admin.cpp

applications/applestreamingclient/include/applestreamingclient.h

applications/applestreamingclient/src/applestreamingclient.cpp

applications/applestreamingclient/src/clientcontext.cpp

applications/appselector/include/appselector.h

applications/appselector/src/appselector.cpp

applications/flvplayback/include/flvplayback.h

applications/flvplayback/src/flvplayback.cpp

applications/proxypublish/include/proxypublish.h

applications/proxypublish/include/proxypublishapplication.h

applications/proxypublish/src/proxypublish.cpp

applications/proxypublish/src/proxypublishapplication.cpp

applications/samplefactory/include/samplefactory.h

applications/samplefactory/include/samplefactoryapplication.h

applications/samplefactory/src/httpdownloadprotocol.cpp

applications/samplefactory/src/samplefactory.cpp

applications/samplefactory/src/samplefactoryapplication.cpp

applications/stresstest/include/stresstest.h

applications/stresstest/src/rtmpappprotocolhandler.cpp

applications/stresstest/src/stresstest.cpp

applications/vptests/include/vptests.h

applications/vptests/src/vptests.cpp

cmake_find_modules/Find_dl.cmake

common/include/defines.h

common/include/platform/android/androidplatform.h

common/include/platform/dfreebsd/dfreebsdplatform.h

common/include/platform/freebsd/freebsdplatform.h

common/include/platform/linux/linuxplatform.h

common/include/platform/openbsd/openbsdplatform.h

common/include/platform/osx/osxplatform.h

common/include/platform/solaris/solarisplatform.h

common/include/platform/windows/win32platform.h

common/include/utils/logging/baseloglocation.h

common/include/utils/logging/consoleloglocation.h

common/include/utils/logging/fileloglocation.h

common/include/utils/logging/logcatloglocation.h

common/include/utils/logging/logger.h

common/include/utils/logging/syslogloglocation.h

common/include/utils/misc/crypto.h

common/include/utils/misc/uri.h

common/include/utils/misc/variant.h

common/src/platform/android/androidplatform.cpp

common/src/platform/dfreebsd/dfreebsdplatform.cpp

common/src/platform/freebsd/freebsdplatform.cpp

common/src/platform/linux/linuxplatform.cpp

common/src/platform/openbsd/openbsdplatform.cpp

common/src/platform/osx/osxplatform.cpp

common/src/platform/solaris/solarisplatform.cpp

common/src/platform/windows/win32platform.cpp

common/src/utils/logging/baseloglocation.cpp

common/src/utils/logging/consoleloglocation.cpp

common/src/utils/logging/fileloglocation.cpp

common/src/utils/logging/logcatloglocation.cpp

common/src/utils/logging/logger.cpp

common/src/utils/logging/syslogloglocation.cpp

common/src/utils/lua/luautils.cpp

common/src/utils/misc/crypto.cpp

common/src/utils/misc/uri.cpp

common/src/utils/misc/variant.cpp

constants/constants.lua

crtmpserver/src/crtmpserver.cpp

debian/changelog

debian/compat

debian/control

debian/crtmpserver-apps-scripts/enabled_applications.conf

debian/crtmpserver-apps-scripts/flvplayback.lua

debian/crtmpserver-apps-scripts/proxypublish.lua

debian/crtmpserver-apps.dirs

debian/crtmpserver-apps.install

debian/crtmpserver-apps.postinst

debian/crtmpserver-scripts/log_appenders.lua

debian/crtmpserver.examples

debian/patches/series

debian/rules

thelib/include/application/baseappprotocolhandler.h

thelib/include/application/baseclientapplication.h

thelib/include/configuration/configfile.h

thelib/include/mediaformats/mp4/atommdhd.h

thelib/include/netio/epoll/inboundnamedpipecarrier.h

thelib/include/netio/epoll/iohandler.h

thelib/include/netio/epoll/iohandlermanager.h

thelib/include/netio/epoll/iotimer.h

thelib/include/netio/epoll/stdiocarrier.h

thelib/include/netio/epoll/tcpacceptor.h

thelib/include/netio/epoll/tcpcarrier.h

thelib/include/netio/epoll/tcpconnector.h

thelib/include/netio/epoll/udpcarrier.h

thelib/include/netio/kqueue/inboundnamedpipecarrier.h

thelib/include/netio/kqueue/iohandler.h

thelib/include/netio/kqueue/iohandlermanager.h

thelib/include/netio/kqueue/iotimer.h

thelib/include/netio/kqueue/stdiocarrier.h

thelib/include/netio/kqueue/tcpacceptor.h

thelib/include/netio/kqueue/tcpcarrier.h

thelib/include/netio/kqueue/tcpconnector.h

thelib/include/netio/kqueue/udpcarrier.h

thelib/include/netio/select/inboundnamedpipecarrier.h

thelib/include/netio/select/iohandler.h

thelib/include/netio/select/iohandlermanager.h

thelib/include/netio/select/iotimer.h

thelib/include/netio/select/stdiocarrier.h

thelib/include/netio/select/tcpacceptor.h

thelib/include/netio/select/tcpcarrier.h

thelib/include/netio/select/tcpconnector.h

thelib/include/netio/select/udpcarrier.h

thelib/include/protocols/baseprotocol.h

thelib/include/protocols/liveflv/innetliveflvstream.h

thelib/include/protocols/mms/innetaacstream.h

thelib/include/protocols/mms/innetmp3stream.h

thelib/include/protocols/protocoltypes.h

thelib/include/protocols/rtmp/basertmpappprotocolhandler.h

thelib/include/protocols/rtmp/basertmpprotocol.h

thelib/include/protocols/rtmp/messagefactories/genericmessagefactory.h

thelib/include/protocols/rtmp/messagefactories/streammessagefactory.h

thelib/include/protocols/rtmp/streaming/baseoutnetrtmpstream.h

thelib/include/protocols/rtmp/streaming/innetrtmpstream.h

thelib/include/protocols/rtmp/streaming/outnetrtmp4tsstream.h

thelib/include/protocols/rtp/basertspappprotocolhandler.h

thelib/include/protocols/rtp/connectivity/inboundconnectivity.h

thelib/include/protocols/rtp/connectivity/outboundconnectivity.h

thelib/include/protocols/rtp/rtspprotocol.h

thelib/include/protocols/rtp/sdp.h

thelib/include/protocols/rtp/streaming/innetrtpstream.h

thelib/include/protocols/rtp/streaming/outnetrtpudph264stream.h

thelib/include/protocols/ts/inboundtsprotocol.h

thelib/include/protocols/ts/innettsstream.h

thelib/include/protocols/variant/basevariantappprotocolhandler.h

thelib/include/streaming/baseinstream.h

thelib/include/streaming/baseoutstream.h

thelib/include/streaming/basestream.h

thelib/include/streaming/innetrawstream.h

thelib/include/streaming/outnetrawstream.h

thelib/src/application/baseappprotocolhandler.cpp

thelib/src/application/baseclientapplication.cpp

thelib/src/configuration/configfile.cpp

thelib/src/mediaformats/mp4/atomilst.cpp

thelib/src/mediaformats/mp4/atommdhd.cpp

thelib/src/netio/epoll/inboundnamedpipecarrier.cpp

thelib/src/netio/epoll/iohandlermanager.cpp

thelib/src/netio/epoll/iotimer.cpp

thelib/src/netio/epoll/stdiocarrier.cpp

thelib/src/netio/epoll/tcpacceptor.cpp

thelib/src/netio/epoll/tcpcarrier.cpp

thelib/src/netio/epoll/udpcarrier.cpp

thelib/src/netio/kqueue/inboundnamedpipecarrier.cpp

thelib/src/netio/kqueue/iohandlermanager.cpp

thelib/src/netio/kqueue/iotimer.cpp

thelib/src/netio/kqueue/stdiocarrier.cpp

thelib/src/netio/kqueue/tcpacceptor.cpp

thelib/src/netio/kqueue/tcpcarrier.cpp

thelib/src/netio/kqueue/udpcarrier.cpp

thelib/src/netio/select/inboundnamedpipecarrier.cpp

thelib/src/netio/select/iohandlermanager.cpp

thelib/src/netio/select/iotimer.cpp

thelib/src/netio/select/stdiocarrier.cpp

thelib/src/netio/select/tcpacceptor.cpp

thelib/src/netio/select/tcpcarrier.cpp

thelib/src/netio/select/udpcarrier.cpp

thelib/src/protocols/baseprotocol.cpp

thelib/src/protocols/cli/http4cliprotocol.cpp

thelib/src/protocols/cli/inboundjsoncliprotocol.cpp

thelib/src/protocols/defaultprotocolfactory.cpp

thelib/src/protocols/liveflv/innetliveflvstream.cpp

thelib/src/protocols/mms/innetaacstream.cpp

thelib/src/protocols/mms/innetmp3stream.cpp

thelib/src/protocols/rtmp/amf0serializer.cpp

thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp

thelib/src/protocols/rtmp/basertmpprotocol.cpp

thelib/src/protocols/rtmp/messagefactories/genericmessagefactory.cpp

thelib/src/protocols/rtmp/messagefactories/streammessagefactory.cpp

thelib/src/protocols/rtmp/rtmpprotocolserializer.cpp

thelib/src/protocols/rtmp/streaming/baseoutnetrtmpstream.cpp

thelib/src/protocols/rtmp/streaming/innetrtmpstream.cpp

thelib/src/protocols/rtmp/streaming/outnetrtmp4tsstream.cpp

thelib/src/protocols/rtp/basertspappprotocolhandler.cpp

thelib/src/protocols/rtp/connectivity/inboundconnectivity.cpp

thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp

thelib/src/protocols/rtp/inboundrtpprotocol.cpp

thelib/src/protocols/rtp/rtcpprotocol.cpp

thelib/src/protocols/rtp/rtspprotocol.cpp

thelib/src/protocols/rtp/sdp.cpp

thelib/src/protocols/rtp/streaming/baseoutnetrtpudpstream.cpp

thelib/src/protocols/rtp/streaming/innetrtpstream.cpp

thelib/src/protocols/rtp/streaming/outnetrtpudph264stream.cpp

thelib/src/protocols/tcpprotocol.cpp

thelib/src/protocols/ts/inboundtsprotocol.cpp

thelib/src/protocols/ts/innettsstream.cpp

thelib/src/protocols/variant/basevariantappprotocolhandler.cpp

thelib/src/protocols/variant/basevariantprotocol.cpp

thelib/src/streaming/baseinfilestream.cpp

thelib/src/streaming/baseinstream.cpp

thelib/src/streaming/baseoutstream.cpp

thelib/src/streaming/basestream.cpp

thelib/src/streaming/innetrawstream.cpp

thelib/src/streaming/outnetrawstream.cpp

thelib/src/streaming/streamcapabilities.cpp

Show diffs side-by-side

added added

removed removed

thelib/src/protocols/rtp/rtcpprotocol.cpp

uint64_t ntpMicroseconds = (uint32_t) (((double) ntpFrac / (double) (0x100000000LL))*1000000.0);

ntpMicroseconds += ((uint64_t) ntpSec)*1000000;

uint32_t rtpTimestamp = ENTOHLP(pBuffer + 16);

_pConnectivity->ReportSR(ntpMicroseconds, rtpTimestamp, _isAudio, false);

_pConnectivity->ReportSR(ntpMicroseconds, rtpTimestamp, _isAudio);

break;

100

}

101

default:

Older »