From 7fb749e209862d3d85e5fe5be4b364a261475a90 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 26 Oct 2002 12:27:10 +0000 Subject: ChangeLogTag: Sat Oct 26 12:23:12 UTC 2002 Johnny Willemsen --- TAO/orbsvcs/orbsvcs/AV/RTCP.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/media_timer.cpp | 91 ++++++++++++++++++++++++++++++++++ TAO/orbsvcs/orbsvcs/AV/media_timer.h | 61 +++++++++++++++++++++++ 3 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 TAO/orbsvcs/orbsvcs/AV/media_timer.cpp create mode 100644 TAO/orbsvcs/orbsvcs/AV/media_timer.h (limited to 'TAO/orbsvcs/orbsvcs/AV') diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 852642a828a..4569f90079c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -35,7 +35,7 @@ // $Id$ #include "ntp-time.h" #include "RTCP.h" -#include "media-timer.h" +#include "media_timer.h" #include "tao/debug.h" #include "global.h" #include "md5.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp new file mode 100644 index 00000000000..d3a2285f861 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -0,0 +1,91 @@ +//$Id$ +/* + * Copyright (c) 1995 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the Computer Systems + * Engineering Group at Lawrence Berkeley Laboratory. + * 4. Neither the name of the University nor of the Laboratory may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* +static const char rcsid[] = + "@(#) $Header$"; +*/ + +#include "media-timer.h" +// FUZZ: disable check_for_math_include +#include + + +MediaTimer* MediaTimer::instance_; + +MediaTimer::MediaTimer() +{ + instance_ = this; + offset_ = ACE_OS::rand (); +} + +MediaTimer::~MediaTimer() +{ + instance_ = 0; +} + +/* + * Default media timestamp -- convert unix system clock + * into a 90Khz timestamp. Grabbers override this virtual + * method if they can provide their own time base. + * + * XXX + * We save the corresponding unix time stamp to handle the + * unix_ts() call the transmitter will make to get the correspondence + * between the media timestamp & unix time. + */ +ACE_UINT32 MediaTimer::media_ts() +{ + //timeval tv; + ACE_Time_Value tv = ACE_OS::gettimeofday(); + ACE_UINT32 u = tv.usec (); + u = (u << 3) + u; /* x 9 */ + /* sec * 90Khz + (usec * 90Khz) / 1e6 */ + u = tv.sec () * 90000 + (u / 100); + return (u + offset_); +} + +/* + * compute media time corresponding to the current unix time. + * in this generic routine, this is the same as media_ts() but, + * if a grabber has hardware or kernel timestamping, this routine + * must compute the correspondence between the hardware timestamp + * and the unix clock and appropriately offset the timestamp to + * correspond to the current clock. (This information if vital + * for cross-media synchronization.) + */ +ACE_UINT32 MediaTimer::ref_ts() +{ + return (media_ts()); +} diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h new file mode 100644 index 00000000000..c49126a9431 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h @@ -0,0 +1,61 @@ +/* -*- C++ -*- */ +// $Id$ +/* + * Copyright (c) 1995 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the Computer Systems + * Engineering Group at Lawrence Berkeley Laboratory. + * 4. Neither the name of the University nor of the Laboratory may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#) $Header$ + */ + +#ifndef TAO_AV_MEDIA_TIMER_H +#define TAO_AV_MEDIA_TIMER_H +#include "ace/pre.h" + +#include "ace/OS.h" +//long random (void); + +class MediaTimer +{ + public: + MediaTimer(); + virtual ~MediaTimer(); + static inline MediaTimer* instance() { return (instance_); } + virtual ACE_UINT32 media_ts(); + virtual ACE_UINT32 ref_ts(); + inline ACE_UINT32 offset() const { return (offset_); } + private: + static MediaTimer* instance_; + protected: + ACE_UINT32 offset_; /* random offset */ +}; + +#include "ace/post.h" +#endif /* TAO_AV_MEDIA_TIMER_H */ -- cgit v1.2.1