[svn-commits] file: trunk r371427 - in /trunk: ./ res/res_format_attr_h264.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Aug 17 07:25:40 2012
New Revision: 371427

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371427
Log:
Add some additional H.264 attributes, "max-smbps" and "max-fps", for passthrough.

(closes issue ASTERISK-20206)
Reported by: ddkprog
Patches:
     res_format_attr_h264.c.diff uploaded by ddkprog (license 6008)
........

Merged revisions 371426 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/res/res_format_attr_h264.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Fri Aug 17 07:25:40 2012
@@ -1,1 +1,1 @@
-/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399
+/branches/11:1-371121,371143,371146,371200,371227,371258,371272,371295,371324,371355,371382,371395,371399,371426

Modified: trunk/res/res_format_attr_h264.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_format_attr_h264.c?view=diff&rev=371427&r1=371426&r2=371427
==============================================================================
--- trunk/res/res_format_attr_h264.c (original)
+++ trunk/res/res_format_attr_h264.c Fri Aug 17 07:25:40 2012
@@ -53,6 +53,8 @@
 	H264_ATTR_KEY_MAX_CPB,
 	H264_ATTR_KEY_MAX_DPB,
 	H264_ATTR_KEY_MAX_BR,
+	H264_ATTR_KEY_MAX_SMBPS,
+	H264_ATTR_KEY_MAX_FPS,
 	H264_ATTR_KEY_REDUNDANT_PIC_CAP,
 	H264_ATTR_KEY_PARAMETER_ADD,
 	H264_ATTR_KEY_PACKETIZATION_MODE,
@@ -138,6 +140,10 @@
 			format_attr->format_attr[H264_ATTR_KEY_MAX_DPB] = val;
 		} else if (sscanf(attrib, "max-br=%30u", &val) == 1) {
 			format_attr->format_attr[H264_ATTR_KEY_MAX_BR] = val;
+		} else if (sscanf(attrib, "max-smbps=%30u", &val) == 1) {
+			format_attr->format_attr[H264_ATTR_KEY_MAX_SMBPS] = val;
+		} else if (sscanf(attrib, "max-fps=%30u", &val) == 1) {
+			format_attr->format_attr[H264_ATTR_KEY_MAX_FPS] = val;
 		} else if (sscanf(attrib, "redundant-pic-cap=%30u", &val) == 1) {
 			format_attr->format_attr[H264_ATTR_KEY_REDUNDANT_PIC_CAP] = val;
 		} else if (sscanf(attrib, "parameter-add=%30u", &val) == 1) {
@@ -178,6 +184,10 @@
 		return "max-dpb";
 	case H264_ATTR_KEY_MAX_BR:
 		return "max-br";
+	case H264_ATTR_KEY_MAX_SMBPS:
+		return "max-smbps";
+	case H264_ATTR_KEY_MAX_FPS:
+		return "max-fps";
 	case H264_ATTR_KEY_REDUNDANT_PIC_CAP:
 		return "redundant-pic-cap";
 	case H264_ATTR_KEY_PARAMETER_ADD: