Attachment #83586 for bug #119376

View | Details | Raw Unified | Return to bug 119376
Collapse All | Expand All

Lines 6-16 Link Here

(-)openh323/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= openh323	8	PORTNAME= openh323
9	PORTVERSION= 1.18.0	9	PORTVERSION= 1.19.0.1
10	PORTREVISION= 6
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= http://www.voxgratia.org/releases/	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src-	12	DISTNAME= openh323/${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
14	EXTRACT_SUFX= tar.gz	13	EXTRACT_SUFX= tar.gz
15		14
16	MAINTAINER= steve@energistic.com	15	MAINTAINER= steve@energistic.com

Lines 1-3 Link Here

(-)openh323/distinfo (-3 / +3 lines)
1	MD5 (openh323-v1_18_0-src-tar.gz) = d7043ba34b5038f0113b099ede0884fb	1	MD5 (openh323/openh323-v1_19_0_1-src-tar.gz) = e7ba3ae6b50d0d02c5cbe9ed3a3152c4
2	SHA256 (openh323-v1_18_0-src-tar.gz) = 26b4c9cf21dc1c92edf1583046670fce6be5b13045ef5d06e11403d36ffff218	2	SHA256 (openh323/openh323-v1_19_0_1-src-tar.gz) = a4909d8d26a50eec42d3bfb6b88ff53ef0a714e6c6b6cf381b783050a09d31ea
3	SIZE (openh323-v1_18_0-src-tar.gz) = 3742730	3	SIZE (openh323/openh323-v1_19_0_1-src-tar.gz) = 3959271




diff -ruN include/h4601.h.orig include/h4601.h
--- include/h4601.h.orig    2006-06-08 09:26:16.000000000 -0400
+++ include/h4601.h        2007-12-31 15:10:41.000000000 -0500
@@ -61,6 +61,7 @@

 #include "h225.h"
 #include "transports.h"
+#include <ptlib/pluginmgr.h>
 #include <ptclib/url.h>







--- ../openh323.orig/work/openh323_v1_18_0/include/mediafmt.h	2005-11-30 08:05:01.000000000 -0500
+++ work/openh323_v1_19_0_1/include/mediafmt.h	2008-01-05 23:12:39.000000000 -0500
@@ -163,9 +163,13 @@
     RTP_DataFrame::PayloadTypes GetPayloadType() const { return rtpPayloadType; }
 
     enum {
-      DefaultAudioSessionID = 1,
-      DefaultVideoSessionID = 2,
-      DefaultDataSessionID  = 3
+      FirstSessionID            = 1,
+      DefaultAudioSessionID     = 1,
+      DefaultVideoSessionID     = 2,
+      DefaultDataSessionID      = 3,
+      DefaultH224SessionID      = 4,
+      DefaultExtVideoSessionID  = 5,
+      LastSessionID             = 5
     };
 
     /**Get the default session ID for media format.

Line 0 Link Here

(-)openh323/files/patch-src-h261codec-cxx (+11 lines)
	1	diff -ruN src/h261codec.cxx.orig src/h261codec.cxx
	2	--- src/h261codec.cxx 2006-06-06 04:05:40.000000000 -0400
	3	+++ src/h261codec.cxx 2007-12-31 15:17:29.000000000 -0500
	4	@@ -279,6 +279,7 @@
	5	#include "h245.h"
	6	#include "rtp.h"
	7
	8	+#include <ptlib/video.h>
	9	#include "vic/p64.h"
	10	#include "vic/p64encoder.h"
	11




--- src/h323caps.cxx.orig	2006-05-16 07:36:01.000000000 -0400
+++ src/h323caps.cxx	2007-12-31 15:28:02.000000000 -0500
@@ -2076,7 +2076,7 @@
                                             PINDEX simultaneous,
                                             const PString & name)
 {
-  PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
+/*  PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
 
   PStringArray wildcard = name.Tokenise('*', FALSE);
 
@@ -2109,6 +2109,46 @@
   }
 
   return reply;
+*/
+
+
+
+
+  PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
+
+  PStringArray wildcard = name.Tokenise('*', FALSE);
+
+  H323CapabilityFactory::KeyList_T stdCaps = H323CapabilityFactory::GetKeyList();
+
+  for (unsigned session = OpalMediaFormat::FirstSessionID; session <= OpalMediaFormat::LastSessionID; session++) {
+    for (H323CapabilityFactory::KeyList_T::const_iterator r = stdCaps.begin(); r != stdCaps.end(); ++r) {
+      PString capName(*r);
+      if (MatchWildcard(capName, wildcard) && (FindCapability(capName) == NULL)) {
+        OpalMediaFormat mediaFormat(capName);
+        if (!mediaFormat.IsValid() && (capName.Right(4) == "{sw}") && capName.GetLength() > 4)
+          mediaFormat = OpalMediaFormat(capName.Left(capName.GetLength()-4));
+        if (mediaFormat.IsValid() && mediaFormat.GetDefaultSessionID() == session) {
+          // add the capability
+          H323Capability * capability = H323Capability::Create(capName);
+          PINDEX num = SetCapability(descriptorNum, simultaneous, capability);
+          if (descriptorNum == P_MAX_INDEX) {
+            reply = num;
+            descriptorNum = num;
+            simultaneous = P_MAX_INDEX;
+          }
+          else if (simultaneous == P_MAX_INDEX) {
+            if (reply == P_MAX_INDEX)
+              reply = num;
+            simultaneous = num;
+          }
+        }
+      }
+    }
+    simultaneous = P_MAX_INDEX;
+  }
+
+  return reply;
+
 }
 
 

Line 0 Link Here

(-)openh323/files/patch-src-h323ep-cxx (+11 lines)
	1	diff -ruN src/h323ep.cxx.orig src/h323ep.cxx
	2	--- src/h323ep.cxx.orig 2006-06-09 02:30:12.000000000 -0400
	3	+++ src/h323ep.cxx 2007-12-31 13:11:13.000000000 -0500
	4	@@ -793,6 +793,7 @@
	5	#include <ptclib/url.h>
	6	#include <ptclib/pils.h>
	7	#include <ptclib/enum.h>
	8	+#include <ptlib/sound.h>
	9
	10	#if defined(H323_RTP_AGGREGATE) \|\| defined(H323_SIGNAL_AGGREGATE)
	11	#include <ptclib/sockagg.h>




diff -ruN src/h323pluginmgr.cxx.orig src/h323pluginmgr.
cxx
--- src/h323pluginmgr.cxx.orig      2005-08-05 13:11:03.000000000 -0400
+++ src/h323pluginmgr.cxx  2007-12-31 15:04:53.000000000 -0500
@@ -1305,7 +1305,7 @@
         PTRACE(4, "H323PLUGIN\tCannot instantiate static codec plugin " << *r);
       } else {
         PTRACE(4, "H323PLUGIN\tLoading static codec plugin " << *r);
-        RegisterStaticCodec(*r, instance->Get_GetAPIFn(), instance->Get_GetCodecFn());
+        RegisterStaticCodec(r->c_str(), instance->Get_GetAPIFn(), instance->Get_GetCodecFn());
       }
     }
   }




diff -ruN src/mediafmt.cxx.orig src/mediafmt.cxx
--- src/mediafmt.cxx.orig   2005-01-11 02:12:13.000000000 -0500
+++ src/mediafmt.cxx       2007-12-31 14:48:26.000000000 -0500
@@ -395,7 +395,7 @@
     OpalMediaFormatFactory::KeyMap_T & keyMap = OpalMediaFormatFactory::GetKeyMap();
     OpalMediaFormatFactory::KeyMap_T::const_iterator r;
     for (r = keyMap.begin(); r != keyMap.end(); ++r) {
-      if (r->first.Find(search) != P_MAX_INDEX) {
+      if (r->first.find(search) != P_MAX_INDEX) {
         *this = *OpalMediaFormatFactory::CreateInstance(r->first);
         break;
       }

Lines 46-51 Link Here

(-)openh323/pkg-plist (+1 lines)
46	include/openh323/h460.h	46	include/openh323/h460.h
47	include/openh323/h501.h	47	include/openh323/h501.h
48	include/openh323/h501pdu.h	48	include/openh323/h501pdu.h
		49	include/openh323/h4601.h
49	include/openh323/hid.h	50	include/openh323/hid.h
50	include/openh323/ixjDefs.h	51	include/openh323/ixjDefs.h
51	include/openh323/ixjidb.h	52	include/openh323/ixjidb.h

Return to bug 119376

Line 0 Link Here

(-)openh323/files/patch-include-h4601.h (+12 lines)
	1	diff -ruN include/h4601.h.orig include/h4601.h
	2	--- include/h4601.h.orig 2006-06-08 09:26:16.000000000 -0400
	3	+++ include/h4601.h 2007-12-31 15:10:41.000000000 -0500
	4	@@ -61,6 +61,7 @@
	5
	6	#include "h225.h"
	7	#include "transports.h"
	8	+#include <ptlib/pluginmgr.h>
	9	#include <ptclib/url.h>
	10
	11
	12

Line 0 Link Here

(-)openh323/files/patch-include-mediafmt.h (+19 lines)
	1	--- ../openh323.orig/work/openh323_v1_18_0/include/mediafmt.h 2005-11-30 08:05:01.000000000 -0500
	2	+++ work/openh323_v1_19_0_1/include/mediafmt.h 2008-01-05 23:12:39.000000000 -0500
	3	@@ -163,9 +163,13 @@
	4	RTP_DataFrame::PayloadTypes GetPayloadType() const { return rtpPayloadType; }
	5
	6	enum {
	7	- DefaultAudioSessionID = 1,
	8	- DefaultVideoSessionID = 2,
	9	- DefaultDataSessionID = 3
	10	+ FirstSessionID = 1,
	11	+ DefaultAudioSessionID = 1,
	12	+ DefaultVideoSessionID = 2,
	13	+ DefaultDataSessionID = 3,
	14	+ DefaultH224SessionID = 4,
	15	+ DefaultExtVideoSessionID = 5,
	16	+ LastSessionID = 5
	17	};
	18
	19	/**Get the default session ID for media format.

Line 0 Link Here

(-)openh323/files/patch-src-h323caps.cxx (+58 lines)
	1	--- src/h323caps.cxx.orig 2006-05-16 07:36:01.000000000 -0400
	2	+++ src/h323caps.cxx 2007-12-31 15:28:02.000000000 -0500
	3	@@ -2076,7 +2076,7 @@
	4	PINDEX simultaneous,
	5	const PString & name)
	6	{
	7	- PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
	8	+/* PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
	9
	10	PStringArray wildcard = name.Tokenise('*', FALSE);
	11
	12	@@ -2109,6 +2109,46 @@
	13	}
	14
	15	return reply;
	16	+*/
	17	+
	18	+
	19	+
	20	+
	21	+ PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
	22	+
	23	+ PStringArray wildcard = name.Tokenise('*', FALSE);
	24	+
	25	+ H323CapabilityFactory::KeyList_T stdCaps = H323CapabilityFactory::GetKeyList();
	26	+
	27	+ for (unsigned session = OpalMediaFormat::FirstSessionID; session <= OpalMediaFormat::LastSessionID; session++) {
	28	+ for (H323CapabilityFactory::KeyList_T::const_iterator r = stdCaps.begin(); r != stdCaps.end(); ++r) {
	29	+ PString capName(*r);
	30	+ if (MatchWildcard(capName, wildcard) && (FindCapability(capName) == NULL)) {
	31	+ OpalMediaFormat mediaFormat(capName);
	32	+ if (!mediaFormat.IsValid() && (capName.Right(4) == "{sw}") && capName.GetLength() > 4)
	33	+ mediaFormat = OpalMediaFormat(capName.Left(capName.GetLength()-4));
	34	+ if (mediaFormat.IsValid() && mediaFormat.GetDefaultSessionID() == session) {
	35	+ // add the capability
	36	+ H323Capability * capability = H323Capability::Create(capName);
	37	+ PINDEX num = SetCapability(descriptorNum, simultaneous, capability);
	38	+ if (descriptorNum == P_MAX_INDEX) {
	39	+ reply = num;
	40	+ descriptorNum = num;
	41	+ simultaneous = P_MAX_INDEX;
	42	+ }
	43	+ else if (simultaneous == P_MAX_INDEX) {
	44	+ if (reply == P_MAX_INDEX)
	45	+ reply = num;
	46	+ simultaneous = num;
	47	+ }
	48	+ }
	49	+ }
	50	+ }
	51	+ simultaneous = P_MAX_INDEX;
	52	+ }
	53	+
	54	+ return reply;
	55	+
	56	}
	57
	58

Line 0 Link Here

(-)openh323/files/patch-src-h323pluginmgr-cxx (+13 lines)
	1	diff -ruN src/h323pluginmgr.cxx.orig src/h323pluginmgr.
	2	cxx
	3	--- src/h323pluginmgr.cxx.orig 2005-08-05 13:11:03.000000000 -0400
	4	+++ src/h323pluginmgr.cxx 2007-12-31 15:04:53.000000000 -0500
	5	@@ -1305,7 +1305,7 @@
	6	PTRACE(4, "H323PLUGIN\tCannot instantiate static codec plugin " << *r);
	7	} else {
	8	PTRACE(4, "H323PLUGIN\tLoading static codec plugin " << *r);
	9	- RegisterStaticCodec(*r, instance->Get_GetAPIFn(), instance->Get_GetCodecFn());
	10	+ RegisterStaticCodec(r->c_str(), instance->Get_GetAPIFn(), instance->Get_GetCodecFn());
	11	}
	12	}
	13	}

Line 0 Link Here

(-)openh323/files/patch-src-mediafmt.cxx (+12 lines)
	1	diff -ruN src/mediafmt.cxx.orig src/mediafmt.cxx
	2	--- src/mediafmt.cxx.orig 2005-01-11 02:12:13.000000000 -0500
	3	+++ src/mediafmt.cxx 2007-12-31 14:48:26.000000000 -0500
	4	@@ -395,7 +395,7 @@
	5	OpalMediaFormatFactory::KeyMap_T & keyMap = OpalMediaFormatFactory::GetKeyMap();
	6	OpalMediaFormatFactory::KeyMap_T::const_iterator r;
	7	for (r = keyMap.begin(); r != keyMap.end(); ++r) {
	8	- if (r->first.Find(search) != P_MAX_INDEX) {
	9	+ if (r->first.find(search) != P_MAX_INDEX) {
	10	this = OpalMediaFormatFactory::CreateInstance(r->first);
	11	break;
	12	}