[Pkg-voip-commits] r4688 - in /openmcu/trunk/debian: changelog patches/00list patches/compilation_fixes_backport.dpatch
kilian at alioth.debian.org
kilian at alioth.debian.org
Sat Oct 6 16:06:50 UTC 2007
Author: kilian
Date: Sat Oct 6 16:06:50 2007
New Revision: 4688
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4688
Log:
* Backport compilation fixes from CVS HEAD
Added:
openmcu/trunk/debian/patches/00list
openmcu/trunk/debian/patches/compilation_fixes_backport.dpatch (with props)
Modified:
openmcu/trunk/debian/changelog
Modified: openmcu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openmcu/trunk/debian/changelog?rev=4688&op=diff
==============================================================================
--- openmcu/trunk/debian/changelog (original)
+++ openmcu/trunk/debian/changelog Sat Oct 6 16:06:50 2007
@@ -15,8 +15,9 @@
* Don't set DH_COMPAT, rather use debian/compat
* Change gnomemeeting into ekiga for Recommends (Closes: #442186)
* Add Homepage field as added in dpkg-dev 1.14.6.
+ * Backport compilation fixes from CVS HEAD
- -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 12:08:49 +0200
+ -- Kilian Krause <kilian at debian.org> Sat, 06 Oct 2007 17:56:47 +0200
openmcu (2.1.1-3) unstable; urgency=low
Added: openmcu/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/openmcu/trunk/debian/patches/00list?rev=4688&op=file
==============================================================================
--- openmcu/trunk/debian/patches/00list (added)
+++ openmcu/trunk/debian/patches/00list Sat Oct 6 16:06:50 2007
@@ -1,0 +1,1 @@
+compilation_fixes_backport
Added: openmcu/trunk/debian/patches/compilation_fixes_backport.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/openmcu/trunk/debian/patches/compilation_fixes_backport.dpatch?rev=4688&op=file
==============================================================================
--- openmcu/trunk/debian/patches/compilation_fixes_backport.dpatch (added)
+++ openmcu/trunk/debian/patches/compilation_fixes_backport.dpatch Sat Oct 6 16:06:50 2007
@@ -1,0 +1,262 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## compilation_fixes_backport.dpatch by <kk at hera.verfaction.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openmcu-2.2.1~/filemembers.h openmcu-2.2.1/filemembers.h
+--- openmcu-2.2.1~/filemembers.h 2006-08-02 08:24:53.000000000 +0200
++++ openmcu-2.2.1/filemembers.h 2007-10-06 17:55:29.000000000 +0200
+@@ -29,6 +29,9 @@
+ * Craig Southeren (craig at postincrement.com)
+ *
+ * $Log: filemembers.h,v $
++ * Revision 2.6 2007/01/11 03:47:27 csoutheren
++ * Add missing <deque>
++ *
+ * Revision 2.5 2006/08/02 06:24:53 csoutheren
+ * Add provision for recording input audio
+ *
+@@ -84,6 +87,8 @@
+ #include <opalwavfile.h>
+ #include "conference.h"
+
++#include <deque>
++
+
+ class ConferenceSoundCardMember : public ConferenceMember
+ {
+diff -urNad openmcu-2.2.1~/h323.cxx openmcu-2.2.1/h323.cxx
+--- openmcu-2.2.1~/h323.cxx 2006-08-07 08:18:22.000000000 +0200
++++ openmcu-2.2.1/h323.cxx 2007-10-06 17:55:43.000000000 +0200
+@@ -30,6 +30,15 @@
+ * Craig Southeren (craig at postincrement.com)
+ *
+ * $Log: h323.cxx,v $
++ * Revision 2.10 2007/09/13 05:27:18 rjongbloed
++ * Fix caps
++ *
++ * Revision 2.9 2007/09/13 05:15:03 rjongbloed
++ * Fix compilation.
++ *
++ * Revision 2.8 2007/02/12 23:35:51 csoutheren
++ * Removed compile warning
++ *
+ * Revision 2.7 2006/08/07 06:18:22 csoutheren
+ * Fix detection of MCU members
+ * Add auto-removal of conferences only containing MCU members
+@@ -101,11 +110,6 @@
+ #include <h323pdu.h>
+
+ #if OPENMCU_VIDEO
+-#include <h261codec.h>
+-
+-#ifdef H323_RFC2190_AVCODEC
+-#include <rfc2190avcodec.h>
+-#endif
+
+ const unsigned int DefaultVideoFrameRate = 10;
+ const unsigned int DefaultVideoQuality = 10;
+@@ -220,29 +224,8 @@
+ }
+ */
+
+- AddAllCapabilities(0, 0, "*");
++ AddAllCapabilities(0, P_MAX_INDEX, "*");
+
+-#if OPENMCU_VIDEO
+- if (enableVideo) {
+-
+- OpalMediaFormat::List mediaFormats = H323PluginCodecManager::GetMediaFormats();
+-
+-#ifdef H323_RFC2190_AVCODEC
+- if (mediaFormats.GetValuesIndex(OpalMediaFormat("RFC2190 H.263")) != P_MAX_INDEX) {
+- int maxbps = 0; //videoBitRate/100;
+- SetCapability(0, 1, new H323_RFC2190_H263Capability(0, 0, 1, 0, 0, maxbps)); // CIF
+- SetCapability(0, 1, new H323_RFC2190_H263Capability(0, 1, 0, 0, 0, maxbps)); // QCIF
+- SetCapability(0, 1, new H323_RFC2190_H263Capability(1, 1, 0, 0, 0, maxbps)); // SQCIF
+- }
+-#endif
+-
+- if (mediaFormats.GetValuesIndex(OpalMediaFormat("H.261")) != P_MAX_INDEX) {
+- SetCapability(0, 1, new H323_H261Capability(0, 1, FALSE, FALSE, 6217)); // CIF
+- SetCapability(0, 1, new H323_H261Capability(1, 0, FALSE, FALSE, 6217)); // QCIF
+- }
+- }
+-#endif // OPENMCU_VIDEO
+-
+ // disable codecs as required
+ PString disableCodecs = cfg.GetString(DisableCodecsKey);
+ rsrc->Add(new PHTTPStringField(DisableCodecsKey, 50, disableCodecs));
+@@ -251,30 +234,6 @@
+ capabilities.Remove(toRemove);
+ }
+
+-#if 0 // old MCU options
+- int videoTxQual = 10;
+- if (args.HasOption("videotxquality"))
+- videoTxQual = args.GetOptionString("videotxquality").AsInteger();
+- endpoint.videoTxQuality = PMAX(1, PMIN(31, videoTxQual));
+-
+- int videoF = 2;
+- if (args.HasOption("videofill"))
+- videoF = args.GetOptionString("videofill").AsInteger();
+- endpoint.videoFill = PMAX(1, PMIN(99, videoF));
+-
+- int videoFPS = 10;
+- if (args.HasOption("videotxfps"))
+- videoFPS = args.GetOptionString("videotxfps").AsInteger();
+- endpoint.videoFramesPS = PMAX(1,PMIN(30,videoFPS));
+-
+- int videoBitRate = 0; //disable setting videoBitRate.
+- if (args.HasOption("videobitrate")) {
+- videoBitRate = args.GetOptionString("videobitrate").AsInteger();
+- videoBitRate = 1024 * PMAX(16, PMIN(2048, videoBitRate));
+- }
+- endpoint.videoBitRate = videoBitRate;
+-#endif
+-
+ AddAllUserInputCapabilities(0, 2);
+
+ switch (gkMode) {
+@@ -862,7 +821,7 @@
+ OnFinishRecording();
+ }
+ else {
+- const WORD * samples = (const WORD *)buffer;
++ const short * samples = (const short *)buffer;
+ PINDEX sampleCount = amount / 2;
+ BOOL silence = TRUE;
+ while (sampleCount-- > 0 && silence) {
+diff -urNad openmcu-2.2.1~/mcu.cxx openmcu-2.2.1/mcu.cxx
+--- openmcu-2.2.1~/mcu.cxx 2006-07-14 07:28:01.000000000 +0200
++++ openmcu-2.2.1/mcu.cxx 2007-10-06 17:55:29.000000000 +0200
+@@ -30,6 +30,13 @@
+ * Craig Southeren (craig at postincrement.com)
+ *
+ * $Log: mcu.cxx,v $
++ * Revision 2.4 2007/09/13 05:15:03 rjongbloed
++ * Fix compilation.
++ *
++ * Revision 2.3 2007/02/12 23:36:23 csoutheren
++ * Applied 1636260 - OpenMCU patch to have return link in web UI
++ * Thanks to RM Fleming
++ *
+ * Revision 2.2 2006/07/14 05:28:01 csoutheren
+ * Removed old code
+ *
+@@ -90,8 +97,6 @@
+ static const char ForceSplitVideoKey[] = "Force split screen video";
+ #endif
+
+-#define new PNEW
+-
+
+ ///////////////////////////////////////////////////////////////
+
+@@ -129,6 +134,10 @@
+ OpenMCU & app;
+ };
+
++
++#define new PNEW
++
++
+ ///////////////////////////////////////////////////////////////
+
+ OpenMCU::OpenMCU()
+@@ -412,7 +421,8 @@
+
+ << PHTML::Paragraph()
+
+- //<< PHTML::Form()
++ << PHTML::HRule()
++ << PHTML::HotLink("/") << "Home page" << PHTML::HotLink()
+
+ << PHTML::HRule()
+
+@@ -485,6 +495,8 @@
+ << PHTML::Form()
+ << PHTML::HRule()
+ << app.GetCopyrightText()
++ << PHTML::HRule()
++ << PHTML::HotLink("/") << "Home page" << PHTML::HotLink()
+ << PHTML::Body();
+
+ string = html;
+@@ -523,7 +535,10 @@
+ }
+
+ msg << PHTML::Title() << "Invite succeeded" << PHTML::Body()
+- << PHTML::Heading(1) << "Inviting " << address << " to room " << room << PHTML::Heading(1);
++ << PHTML::Heading(1) << "Inviting " << address << " to room " << room << PHTML::Heading(1)
++ << PHTML::HRule()
++ << PHTML::HotLink("/") << "Home page" << PHTML::HotLink();
++
+
+ return TRUE;
+ }
+diff -urNad openmcu-2.2.1~/mcu.h openmcu-2.2.1/mcu.h
+--- openmcu-2.2.1~/mcu.h 2006-06-09 06:39:59.000000000 +0200
++++ openmcu-2.2.1/mcu.h 2007-10-06 17:55:29.000000000 +0200
+@@ -29,6 +29,9 @@
+ * Craig Southeren (craig at postincrement.com)
+ *
+ * $Log: mcu.h,v $
++ * Revision 2.2 2007/09/13 05:15:03 rjongbloed
++ * Fix compilation.
++ *
+ * Revision 2.1 2006/06/09 04:39:59 csoutheren
+ * Migrated VideoBranch to main trunk
+ *
+@@ -77,7 +80,6 @@
+ #include <h323ep.h>
+ #include <h323pdu.h>
+ #include <h245.h>
+-#include <lid.h>
+
+ #include "conference.h"
+ #include "filemembers.h"
+@@ -147,7 +149,6 @@
+ ConferenceManager * manager;
+ OpenMCUH323EndPoint * endpoint;
+ long GetCodec(const PString & codecname);
+- OpalLineInterfaceDevice * GetDevice(const PString & device);
+
+ PString defaultRoomName;
+ PFilePath logFilename;
+diff -urNad openmcu-2.2.1~/video.cxx openmcu-2.2.1/video.cxx
+--- openmcu-2.2.1~/video.cxx 2006-07-21 10:01:40.000000000 +0200
++++ openmcu-2.2.1/video.cxx 2007-10-06 17:55:29.000000000 +0200
+@@ -30,6 +30,12 @@
+ * Craig Southeren (craig at postincrement.com)
+ *
+ * $Log: video.cxx,v $
++ * Revision 2.8 2007/09/20 08:34:30 rjongbloed
++ * Fixed assert
++ *
++ * Revision 2.7 2007/09/13 05:15:03 rjongbloed
++ * Fix compilation.
++ *
+ * Revision 2.6 2006/07/21 08:01:40 csoutheren
+ * Fixed conference member detect
+ * Re-factored video mixer code slightly
+@@ -285,7 +291,7 @@
+
+ BOOL PVideoInputDevice_OpenMCU::GetFrameData(BYTE * buffer, PINDEX * bytesReturned)
+ {
+- grabDelay.Delay(msBetweenFrames);
++ grabDelay.Delay(1000/GetFrameRate());
+
+ return GetFrameDataNoDelay(buffer, bytesReturned);
+ }
+@@ -441,7 +447,7 @@
+
+ // return not found
+ found = FALSE;
+- return *(videoFrameStoreList.end()->second);
++ return *(videoFrameStoreList.begin()->second);
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////
Propchange: openmcu/trunk/debian/patches/compilation_fixes_backport.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-voip-commits
mailing list