[Opalvoip-svn] SF.net SVN: opalvoip:[31123] opal/branches/v3_12

[<rjo...@us...>]

Revision: 31123
          http://sourceforge.net/p/opalvoip/code/31123
Author:   rjongbloed
Date:     2013-12-20 05:05:40 +0000 (Fri, 20 Dec 2013)
Log Message:
-----------
Fixed including out of bounds OLC generic parameter when it has the suppress value. H.264 is not refused by some H.323 endpoints now.

Modified Paths:
--------------
    opal/branches/v3_12/plugins/video/H.264/h264-x264.cxx
    opal/branches/v3_12/src/codec/h264mf.cxx

Modified: opal/branches/v3_12/plugins/video/H.264/h264-x264.cxx
===================================================================
--- opal/branches/v3_12/plugins/video/H.264/h264-x264.cxx	2013-12-20 03:47:10 UTC (rev 31122)
+++ opal/branches/v3_12/plugins/video/H.264/h264-x264.cxx	2013-12-20 05:05:40 UTC (rev 31123)
@@ -231,7 +231,7 @@
   ,
   NULL,
   NULL,
-  "0"                                 // H.245 default value
+  STRINGIZE(MAX_MBPS_H241)            // H.245 default value
 #endif
 };
 
@@ -265,7 +265,7 @@
   ,
   NULL,
   NULL,
-  "0"                                 // H.245 default value
+  STRINGIZE(MAX_MBPS_H241)            // H.245 default value
 #endif
 };
 
@@ -299,7 +299,7 @@
   ,
   NULL,
   NULL,
-  "0"                                 // H.245 default value
+  STRINGIZE(MAX_FS_H241)              // H.245 default value
 #endif
 };
 
@@ -333,7 +333,7 @@
   ,
   NULL,
   NULL,
-  "0"                                 // H.245 default value
+  STRINGIZE(MAX_BR_H241)              // H.245 default value
 #endif
 };
 

Modified: opal/branches/v3_12/src/codec/h264mf.cxx
===================================================================
--- opal/branches/v3_12/src/codec/h264mf.cxx	2013-12-20 03:47:10 UTC (rev 31122)
+++ opal/branches/v3_12/src/codec/h264mf.cxx	2013-12-20 05:05:40 UTC (rev 31123)
@@ -97,20 +97,20 @@
       option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_LEVEL));
       AddOption(option);
 
-      option = new OpalMediaOptionUnsigned(MaxMBPS_H241_Name, true, OpalMediaOption::MinMerge, MAX_MBPS_H241, 0, 1966);
-      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxMBPS, "0"));
+      option = new OpalMediaOptionUnsigned(MaxMBPS_H241_Name, true, OpalMediaOption::MinMerge, MAX_MBPS_H241, 0, MAX_MBPS_H241);
+      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxMBPS, STRINGIZE(MAX_MBPS_H241)));
       AddOption(option);
 
-      option = new OpalMediaOptionUnsigned(MaxSMBPS_H241_Name, true, OpalMediaOption::MinMerge, MAX_MBPS_H241, 0, 1966);
-      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxSMBPS, "0"));
+      option = new OpalMediaOptionUnsigned(MaxSMBPS_H241_Name, true, OpalMediaOption::MinMerge, MAX_MBPS_H241, 0, MAX_MBPS_H241);
+      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxSMBPS, STRINGIZE(MAX_MBPS_H241)));
       AddOption(option);
 
-      option = new OpalMediaOptionUnsigned(MaxFS_H241_Name, true, OpalMediaOption::MinMerge, MAX_FS_H241, 0, 144);
-      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxFS, "0"));
+      option = new OpalMediaOptionUnsigned(MaxFS_H241_Name, true, OpalMediaOption::MinMerge, MAX_FS_H241, 0, MAX_FS_H241);
+      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxFS, STRINGIZE(MAX_FS_H241)));
       AddOption(option);
 
-      option = new OpalMediaOptionUnsigned(MaxBR_H241_Name, true, OpalMediaOption::MinMerge, MAX_BR_H241, 0, 9600);
-      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxBRandCPB, "0"));
+      option = new OpalMediaOptionUnsigned(MaxBR_H241_Name, true, OpalMediaOption::MinMerge, MAX_BR_H241, 0, MAX_BR_H241);
+      option->SetH245Generic(OpalMediaOption::H245GenericInfo(H241_CustomMaxBRandCPB, STRINGIZE(MAX_BR_H241)));
       AddOption(option);
 
       static const char * const PacketizationModes[] = {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.