[Opalvoip-svn] SF.net SVN: opalvoip:[34738] opal/trunk
Brought to you by:
csoutheren,
rjongbloed
|
From: <rjo...@us...> - 2016-03-29 09:39:51
|
Revision: 34738
http://sourceforge.net/p/opalvoip/code/34738
Author: rjongbloed
Date: 2016-03-29 09:39:49 +0000 (Tue, 29 Mar 2016)
Log Message:
-----------
Adedd OpalAudioFormat::operator=() with RHS as an OpalMediaFormat.
Modified Paths:
--------------
opal/trunk/include/opal/mediafmt.h
opal/trunk/src/opal/mediafmt.cxx
Modified: opal/trunk/include/opal/mediafmt.h
===================================================================
--- opal/trunk/include/opal/mediafmt.h 2016-03-29 09:23:32 UTC (rev 34737)
+++ opal/trunk/include/opal/mediafmt.h 2016-03-29 09:39:49 UTC (rev 34738)
@@ -1363,6 +1363,7 @@
friend class OpalMediaFormatInternal;
friend class OpalMediaFormatList;
+ friend class OpalAudioFormat;
friend class OpalVideoFormat;
};
@@ -1391,6 +1392,8 @@
unsigned channels = 1 ///< Stereo/mono
);
+ OpalAudioFormat & operator=(const OpalMediaFormat & other);
+
static const PString & RxFramesPerPacketOption();
static const PString & TxFramesPerPacketOption();
static const PString & MaxFramesPerPacketOption();
Modified: opal/trunk/src/opal/mediafmt.cxx
===================================================================
--- opal/trunk/src/opal/mediafmt.cxx 2016-03-29 09:23:32 UTC (rev 34737)
+++ opal/trunk/src/opal/mediafmt.cxx 2016-03-29 09:39:49 UTC (rev 34738)
@@ -1796,6 +1796,16 @@
}
+OpalAudioFormat & OpalAudioFormat::operator=(const OpalMediaFormat & other)
+{
+ if (dynamic_cast<OpalAudioFormatInternal *>(other.m_info) != NULL)
+ OpalMediaFormat::operator=(other);
+ else
+ OpalMediaFormat::operator=(OpalMediaFormat());
+ return *this;
+}
+
+
OpalAudioFormatInternal::OpalAudioFormatInternal(const char * fullName,
RTP_DataFrame::PayloadTypes rtpPayloadType,
const char * encodingName,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|