[asterisk-scf-commits] asterisk-scf/integration/mediaformatgeneric.git branch "operation-context-propagation" created.

[Commits to the Asterisk SCF project code repositories]

branch "operation-context-propagation" has been created
        at  258ca2e3f1fbf20fa20084788be3b2acf0f59662 (commit)

- Log -----------------------------------------------------------------
commit 258ca2e3f1fbf20fa20084788be3b2acf0f59662
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Feb 6 16:19:39 2012 -0330

    Initial addition of operation context to signatures

diff --git a/src/Component.cpp b/src/Component.cpp
index 94d8ffb..de5eeeb 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -95,7 +95,9 @@ void SDPDescriptorCompareServiceImpl::removeAllFormats()
     mSupportedFormats.clear();
 }
 
-FormatPtr SDPDescriptorServiceImpl::getNamedFormat(const std::string& name, int, int, const Ice::StringSeq& params, const Ice::Current&)
+FormatPtr SDPDescriptorServiceImpl::getNamedFormat(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const std::string& name, int, int, const Ice::StringSeq& params, const Ice::Current&)
 {
     boost::shared_lock<boost::shared_mutex> lock(mLock);
     std::map<std::string, FormatPtr>::const_iterator format = mNamedFormats.find(name);
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index 2f29437..ab6aac0 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -174,7 +174,8 @@ ConfigurationGroupSeq ConfigurationServiceImpl::getConfigurationGroups(const Ice
     return groups;
 }
 
-void ConfigurationServiceImpl::setConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
+void ConfigurationServiceImpl::setConfiguration(const AsteriskSCF::System::V1::OperationContextPtr&,
+    const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
     class GroupVisitor : public FormatsConfigurationGroupVisitor
     {
@@ -254,7 +255,9 @@ void ConfigurationServiceImpl::setConfiguration(const AsteriskSCF::System::Confi
     }
 }
 
-void ConfigurationServiceImpl::removeConfigurationItems(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
+void ConfigurationServiceImpl::removeConfigurationItems(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
     class GroupVisitor : public FormatsConfigurationGroupVisitor
     {
@@ -314,7 +317,9 @@ void ConfigurationServiceImpl::removeConfigurationItems(const AsteriskSCF::Syste
     }
 }
 
-void ConfigurationServiceImpl::removeConfigurationGroups(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
+void ConfigurationServiceImpl::removeConfigurationGroups(
+    const AsteriskSCF::System::V1::OperationContextPtr&,
+    const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
     class GroupVisitor : public FormatsConfigurationGroupVisitor
     {
diff --git a/src/Configuration.h b/src/Configuration.h
index 5982fc7..16b0be9 100644
--- a/src/Configuration.h
+++ b/src/Configuration.h
@@ -38,9 +38,12 @@ public:
     AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq getConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
     AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq getConfigurationAll(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
     AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq getConfigurationGroups(const Ice::Current&);
-    void setConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
-    void removeConfigurationItems(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
-    void removeConfigurationGroups(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+    void setConfiguration(const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+    void removeConfigurationItems(const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+    void removeConfigurationGroups(const AsteriskSCF::System::V1::OperationContextPtr&,
+        const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
 
 private:
     /**
diff --git a/src/MediaFormatGeneric.h b/src/MediaFormatGeneric.h
index f5f52c0..64d7a6a 100644
--- a/src/MediaFormatGeneric.h
+++ b/src/MediaFormatGeneric.h
@@ -56,7 +56,9 @@ typedef IceUtil::Handle<SDPDescriptorCompareServiceImpl> SDPDescriptorCompareSer
 class SDPDescriptorServiceImpl : public AsteriskSCF::Media::SDP::V1::SDPDescriptorService
 {
 public:
-    AsteriskSCF::Media::V1::FormatPtr getNamedFormat(const std::string&, int, int, const Ice::StringSeq&, const Ice::Current&);
+    AsteriskSCF::Media::V1::FormatPtr getNamedFormat(
+        const AsteriskSCF::System::V1::OperationContextPtr&,
+        const std::string&, int, int, const Ice::StringSeq&, const Ice::Current&);
     AsteriskSCF::Media::V1::FormatPtr getDescribedFormat(const AsteriskSCF::Media::SDP::V1::SDPDescriptorPtr&,
                                                          const Ice::Current&);
     AsteriskSCF::Media::SDP::V1::SDPDescriptorPtr getDescriptor(const AsteriskSCF::Media::V1::FormatPtr&,

commit b61ce3985ccedf90ba7d244f503f586d51dc33e1
Merge: 34850d5 2693fde
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Dec 30 14:54:02 2011 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/mediaformatgeneric


commit 2693fde6377f6e4f2ace06f7c9712d7e966390f4
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Dec 17 19:22:29 2011 -0400

    Set the sampleSize field in the format so code that uses it will operate correctly. (issue ASTSCF-398)

diff --git a/config/MediaFormatGenericConfigurator.py b/config/MediaFormatGenericConfigurator.py
index fde156e..7fb2bc8 100755
--- a/config/MediaFormatGenericConfigurator.py
+++ b/config/MediaFormatGenericConfigurator.py
@@ -56,6 +56,7 @@ class MediaFormatGenericSectionVisitors(Configurator.SectionVisitors):
         elif format.descriptor.type == 'video':
             format.format = AsteriskSCF.Media.V1.VideoFormat()
         format.format.name = section
+        format.format.sampleSize = format.descriptor.samplerate / 1000
 
         self.formats.configurationItems[section] = format
 
diff --git a/src/Component.cpp b/src/Component.cpp
index 09694c7..4be456a 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -480,6 +480,7 @@ void Component::createPrimaryServices()
 
         // Add the ulaw audio format
         G711uLAWPtr ulaw = new G711uLAW();
+        ulaw->sampleSize = 8;
         ulaw->name = "ulaw";
         SDPDescriptorPtr ulawSDP = new SDPDescriptor();
         ulawSDP->payload = 0;
@@ -491,6 +492,7 @@ void Component::createPrimaryServices()
 
         // Add the alaw audio format
         G711aLAWPtr alaw = new G711aLAW();
+        alaw->sampleSize = 8;
         alaw->name = "alaw";
         SDPDescriptorPtr alawSDP = new SDPDescriptor();
         alawSDP->payload = 8;

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/mediaformatgeneric.git