[sip-comm-dev] Re: svn commit: r4883 - trunk/src/net/java/sip/communicator: impl/media impl/protocol/sip service/protocol


#1

Hi Emil,

One of the two changes in ProcessorUtility.java is the following addition in the waitForState method:

System.out.println("d1");

Was it really intended to be part of the commit?

Best regards,
Lubo

emcho@dev.java.net wrote:

···

Author: emcho
Date: 2009-01-07 23:49:48+0000
New Revision: 4883

Modified:
   trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
   trunk/src/net/java/sip/communicator/impl/media/MediaControl.java
   trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java
   trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
   trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java
   trunk/src/net/java/sip/communicator/service/protocol/Call.java

Log:
Cosmetics only (unfortunately since we still have the 2nd SIP call issue).

Modified: trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java&p2=trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java 2009-01-07 23:49:48+0000
@@ -238,7 +238,7 @@
                 8,
                 1,
                 -1,
- AudioFormat.SIGNED) + AudioFormat.SIGNED)
     };
      /**
@@ -256,10 +256,10 @@
      /**
      * Holds the "Master" ZRTP session.
- * + *
      * This session must be started first and must have negotiated the key material
      * before any other media session to the same client can be started. See the
- * ZRTP specification, topic multi-streaming mode. + * ZRTP specification, topic multi-streaming mode.
      */
     private TransformConnector zrtpDHSession = null;
     /**
@@ -1601,7 +1601,7 @@
                 {
                     am.setAttribute("rtpmap", "4 G723/8000");
                     am.setAttribute("fmtp", "4 annexa=no;bitrate=6.3");
- } + }
             }
              byte onHold = this.onHold;
@@ -1626,19 +1626,19 @@
                     , 1
                     , "RTP/AVP"
                     , supportedVideoEncodings);
- +
             String h264Str = String.valueOf(Constants.H264_RTP_SDP);
- for (int i = 0; i < supportedVideoEncodings.length; i++) + for (int i = 0; i < supportedVideoEncodings.length; i++)
             {
                 if(supportedVideoEncodings[i].equals(h264Str))
                 {
- vm.setAttribute("rtpmap", + vm.setAttribute("rtpmap",
                         Constants.H264_RTP_SDP + " H264/90000");
- vm.setAttribute("fmtp", + vm.setAttribute("fmtp",
                         Constants.H264_RTP_SDP + " packetization-mode=1");
- } + }
             }
- +
             byte onHold = this.onHold;
              if (!mediaServCallback.getDeviceConfiguration()
@@ -2061,8 +2061,8 @@
                  SCCallback callback = new SCCallback(this);
                 boolean zrtpAutoStart = false;
- - // Decide if this will become the ZRTP Master session: +
+ // Decide if this will become the ZRTP Master session:
                 // - Statement: audio media session will be started before video media session
                 // - if no other audio session was started before then this will become
                 // ZRTP Master session
@@ -2091,9 +2091,9 @@
                 engine.setUserCallback(callback);
                  // Case 1: user toggled secure communication prior to the call
- // call is encrypted by default due to the option set in + // call is encrypted by default due to the option set in
                 // the account registration wizard
- if (this.getCall().isDefaultEncrypted()) + if (this.getCall().isDefaultEncrypted())
                 {
                     if (engine.initialize("GNUZRTP4J.zid", zrtpAutoStart))
                     {
@@ -2107,7 +2107,7 @@
                     {
                        engine.sendInfo(ZrtpCodes.MessageSeverity.Info,
                                 EnumSet.of(ZRTPCustomInfoCodes.ZRTPEngineInitFailure));
- } + }
                 }
                 // Case 2: user will toggle secure communication during the call
                 // (it's not set on at this point)
@@ -2263,7 +2263,7 @@
          formatsRegisteredOnce = true;
     }
- +
     static void registerCustomVideoCodecFormats(RTPManager rtpManager)
     {
         // if we have already registered custom formats and we are running JMF
@@ -2290,7 +2290,7 @@
      /**
      * Indicates that a change has occurred in the state of the source call.
- * + *
      * @param evt the <tt>CallChangeEvent</tt> instance containing the source
      * calls and its old and new state.
      */
@@ -2577,7 +2577,7 @@
     /**
      * This method is called when an event is generated by a
      * <code>Controller</code> that this listener is registered with.
- * + *
      * @param ce The event generated.
      */
     public synchronized void controllerUpdate(ControllerEvent ce)
@@ -2872,14 +2872,14 @@
      /**
      * Start multi-stream ZRTP sessions.
- * + *
      * After the ZRTP Master (DH) session reached secure state the SCCallback calls
      * this method to start the multi-stream ZRTP sessions.
- * + *
      * First get the multi-stream data from the ZRTP DH session. Then iterate over
      * all known connectors, set multi-stream mode data, and enable auto-start
      * mode (auto-sensing).
- * + *
      * @return Number of started ZRTP multi-stream mode sessions
      */
     public int startZrtpMultiStreams() {
@@ -2888,10 +2888,10 @@
          int counter = 0;
         byte[] multiStreamData = engine.getMultiStrParams();
- +
         Enumeration<TransformConnector> tcs = transConnectors.elements();
- while (tcs.hasMoreElements()) { + while (tcs.hasMoreElements()) {
             TransformConnector tc = tcs.nextElement();
             if (tc.equals(zrtpDHSession)) {
                 continue;
@@ -3109,7 +3109,7 @@
      * Gets the visual <code>Component</code> of a specific <code>Player</code>
      * if it has one and ignores the failure to access it if the specified
      * <code>Player</code> is unrealized.
- * + *
      * @param player the <code>Player</code> to get the visual
      * <code>Component</code> of if it has one
      * @return the visual <code>Component</code> of the specified
@@ -3147,7 +3147,7 @@
      * Notifies the <code>VideoListener</code>s registered with this
      * <code>CallSession</code> about a specific type of change in the
      * availability of a specific visual <code>Component</code> depicting video.
- * + *
      * @param type the type of change as defined by <code>VideoEvent</code> in
      * the availability of the specified visual
      * <code>Component</code> depciting video

Modified: trunk/src/net/java/sip/communicator/impl/media/MediaControl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/MediaControl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/media/MediaControl.java&p2=trunk/src/net/java/sip/communicator/impl/media/MediaControl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/media/MediaControl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/MediaControl.java 2009-01-07 23:49:48+0000
@@ -126,7 +126,7 @@
      *
      * @throws MediaException if initialization fails.
      */
- public void initialize( DeviceConfiguration deviceConfig, + public void initialize( DeviceConfiguration deviceConfig,
                             EncodingConfiguration encodingConfig)
         throws MediaException
     {
@@ -470,7 +470,7 @@
             transmittableAudioEncodings.size();
         if (transmittableAudioEncodingCount > 0)
         {
- supportedAudioEncodings = + supportedAudioEncodings =
                 encodingConfiguration.updateEncodings(transmittableAudioEncodings);
         }
         else
@@ -478,7 +478,7 @@
             //just leave supportedAudioEncodings as it was in the beginning
             //as it will be only receiving so it could say it supports
             //everything.
- supportedAudioEncodings = + supportedAudioEncodings =
                 encodingConfiguration.getSupportedAudioEncodings();
         }
@@ -486,7 +486,7 @@
             transmittableVideoEncodings.size();
         if (transmittableVideoEncodingCount > 0)
         {
- supportedVideoEncodings = + supportedVideoEncodings =
                 encodingConfiguration.updateEncodings(transmittableVideoEncodings);
         }
         else
@@ -494,7 +494,7 @@
             //just leave supportedVideoEncodings as it was in the beginning
             //as it will be only receiving so it could say it supports
             //everything.
- supportedVideoEncodings = + supportedVideoEncodings =
                 encodingConfiguration.getSupportedVideoEncodings();
         }
     }
@@ -576,14 +576,14 @@
     /**
      * Creates a processing data source using the <tt>encodingSets</tt> map to
      * determine the formats/encodings allowed for the various media types.
- * + *
      * @param encodingSets a hashtable mapping media types such as "audio" or
      * "video" to <tt>List</tt>a of encodings (ordered by preference)
      * accepted for the corresponding type.
- * + *
      * @return a processing data source set to generate flows in the encodings
      * specified by the encodingSets map.
- * + *
      * @throws MediaException if creating the data source fails for some reason.
      */
     public DataSource createDataSourceForEncodings(
@@ -851,13 +851,13 @@
      * Looks for the first encoding (among the requested encodings elements)
      * that is also present in the <tt>availableFormats</tt> array and returns
      * the index of the corresponding <tt>Format</tt>.
- * + *
      * @param availableFormats an array of JMF <tt>Format</tt>s that we're
      * currently able to transmit.
      * @param requestedEncodings a table mapping media types (e.g. audio or
      * video) to a list of encodings that our interlocutor has sent
      * in order of preference.
- * + *
      * @return the index of the format corresponding to the first encoding that
      * had a marching format in the <tt>availableFormats</tt> array.
      */
@@ -990,7 +990,7 @@
     /**
      * Selects the nearest size supported by the capture device, to make drivers
      * scale the images.
- * + *
      * @param videoDS the video <code>DataSource</code>
      */
     private void selectVideoSize(DataSource videoDS)

Modified: trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java&p2=trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java 2009-01-07 23:49:48+0000
@@ -97,8 +97,9 @@
      * @param state one of the Processor.XXXed sate vars
      * @return boolean true if the state has been reached and false otherwise
      */
- public synchronized boolean waitForState(Processor processor, int state) + public synchronized boolean waitForState(Processor processor, int state)
     {
+ System.out.println("d1");
         processor.addControllerListener(this);
         setFailed(false);

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java 2009-01-07 23:49:48+0000
@@ -16,7 +16,7 @@
  /**
  * A SIP implementation of the Call abstract class encapsulating SIP dialogs.
- * + *
  * @author Emil Ivov
  */
public class CallSipImpl
@@ -45,7 +45,7 @@
     /**
      * Crates a CallSipImpl instance belonging to <tt>sourceProvider</tt> and
      * initiated by <tt>CallCreator</tt>.
- * + *
      * @param sourceProvider the ProtocolProviderServiceSipImpl instance in the
      * context of which this call has been created.
      */
@@ -58,7 +58,7 @@
      * Adds <tt>callParticipant</tt> to the list of participants in this call.
      * If the call participant is already included in the call, the method has
      * no effect.
- * + *
      * @param callParticipant the new <tt>CallParticipant</tt>
      */
     public void addCallParticipant(CallParticipantSipImpl callParticipant)
@@ -77,7 +77,7 @@
      * Removes <tt>callParticipant</tt> from the list of participants in this
      * call. The method has no effect if there was no such participant in the
      * call.
- * + *
      * @param callParticipant the <tt>CallParticipant</tt> leaving the call;
      */
     public void removeCallParticipant(CallParticipantSipImpl callParticipant)
@@ -110,7 +110,7 @@
     /**
      * Sets the state of this call and fires a call change event notifying
      * registered listeners for the change.
- * + *
      * @param newState a reference to the <tt>CallState</tt> instance that the
      * call is to enter.
      */
@@ -129,7 +129,7 @@
      /**
      * Returns the state that this call is currently in.
- * + *
      * @return a reference to the <tt>CallState</tt> instance that the call is
      * currently in.
      */
@@ -140,7 +140,7 @@
      /**
      * Returns an iterator over all call participants.
- * + *
      * @return an Iterator over all participants currently involved in the call.
      */
     public Iterator<CallParticipant> getCallParticipants()
@@ -150,7 +150,7 @@
      /**
      * Returns the number of participants currently associated with this call.
- * + *
      * @return an <tt>int</tt> indicating the number of participants currently
      * associated with this call.
      */
@@ -162,7 +162,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- * + *
      * @param evt unused.
      */
     public void participantImageChanged(CallParticipantChangeEvent evt)
@@ -172,7 +172,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- * + *
      * @param evt unused.
      */
     public void participantAddressChanged(CallParticipantChangeEvent evt)
@@ -182,7 +182,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- * + *
      * @param evt unused.
      */
     public void participantTransportAddressChanged(
@@ -193,7 +193,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- * + *
      * @param evt unused.
      */
     public void participantDisplayNameChanged(CallParticipantChangeEvent evt)
@@ -202,7 +202,7 @@
      /**
      * Verifies whether the call participant has entered a state.
- * + *
      * @param evt The <tt>CallParticipantChangeEvent</tt> instance containing
      * the source event as well as its previous and its new status.
      */
@@ -216,7 +216,8 @@
             removeCallParticipant((CallParticipantSipImpl) evt
                 .getSourceCallParticipant());
         }
- else if ((newState == CallParticipantState.CONNECTED || newState == CallParticipantState.CONNECTING_WITH_EARLY_MEDIA))
+ else if ((newState == CallParticipantState.CONNECTED
+ || newState == CallParticipantState.CONNECTING_WITH_EARLY_MEDIA))
         {
             setCallState(CallState.CALL_IN_PROGRESS);
         }
@@ -225,7 +226,7 @@
     /**
      * Returns <tt>true</tt> if <tt>dialog</tt> matches the jain sip dialog
      * established with one of the participants in this call.
- * + *
      * @param dialog the dialog whose corresponding participant we're looking
      * for.
      * @return true if this call contains a call participant whose jain sip
@@ -239,7 +240,7 @@
     /**
      * Returns the call participant whose associated jain sip dialog matches
      * <tt>dialog</tt>.
- * + *
      * @param dialog the jain sip dialog whose corresponding participant we're
      * looking for.
      * @return the call participant whose jain sip dialog is the same as the
@@ -278,7 +279,7 @@
     /**
      * Sets the <tt>CallSession</tt> that the media service has created for this
      * call.
- * + *
      * @param callSession the <tt>CallSession</tt> that the media service has
      * created for this call.
      */
@@ -290,7 +291,7 @@
     /**
      * Sets the <tt>CallSession</tt> that the media service has created for this
      * call.
- * + *
      * @return the <tt>CallSession</tt> that the media service has created for
      * this call or null if no call session has been created so far.
      */

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java 2009-01-07 23:49:48+0000
@@ -2934,7 +2934,7 @@
     /**
      * Creates a new {@link Response#OK} response to a specific {@link Request}
      * which is to be sent as part of a specific {@link Dialog}.
- * + *
      * @param request the <code>Request</code> to create the OK response for
      * @param containingDialog the <code>Dialog</code> to send the response in
      * @return a new <code>Response.OK</code> response to the specified
@@ -2998,7 +2998,7 @@
      * Returns a string representation of this OperationSetBasicTelephony
      * instance including information that would permit to distinguish it among
      * other instances when reading a log file.
- * + *
      * @return a string representation of this operation set.
      */
     public String toString()
@@ -3132,7 +3132,7 @@
      /*
      * (non-Javadoc)
- * + *
      * @see
      * net.java.sip.communicator.service.protocol.OperationSetAdvancedTelephony
      * #transfer(net.java.sip.communicator.service.protocol.CallParticipant,
@@ -3184,7 +3184,7 @@
      /*
      * (non-Javadoc)
- * + *
      * @see
      * net.java.sip.communicator.service.protocol.OperationSetAdvancedTelephony
      * #transfer(net.java.sip.communicator.service.protocol.CallParticipant,

Modified: trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java&p2=trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java (original)
+++ trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java 2009-01-07 23:49:48+0000
@@ -16,7 +16,7 @@
  * Provides a default implementation for most of the
  * <code>CallParticipant</code> methods with the purpose of only leaving custom
  * protocol development to clients using the PhoneUI service.
- * + *
  * @author Emil Ivov
  */
public abstract class AbstractCallParticipant
@@ -226,7 +226,7 @@
      * Gets the time at which this <code>CallParticipant</code> transitioned
      * into a state (likely {@link CallParticipantState#CONNECTED}) marking the
      * start of the duration of the participation in a <code>Call</code>.
- * + *
      * @return the time at which this <code>CallParticipant</code> transitioned
      * into a state marking the start of the duration of the
      * participation in a <code>Call</code> or

Modified: trunk/src/net/java/sip/communicator/service/protocol/Call.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/Call.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/service/protocol/Call.java&p2=trunk/src/net/java/sip/communicator/service/protocol/Call.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/service/protocol/Call.java (original)
+++ trunk/src/net/java/sip/communicator/service/protocol/Call.java 2009-01-07 23:49:48+0000
@@ -48,13 +48,13 @@
      * securing algorithm used
      */
     private Hashtable<Object, SecurityGUIListener> securityGUIListeners;
- +
     /**
- * If this flag is set to true according to the account properties + * If this flag is set to true according to the account properties
      * related with the sourceProvider the associated CallSession will start
- * encrypted by default (where applicable) + * encrypted by default (where applicable)
      */
- private final boolean defaultEncryption; + private final boolean defaultEncryption;
      /**
      * Creates a new Call instance.
@@ -297,14 +297,14 @@
         else
             return securityGUIListeners.get(key);
     }
- +
     /**
      * Returns the default call encryption flag
- * + *
      * @return the default call encryption flag
      */
     public boolean isDefaultEncrypted()
     {
- return defaultEncryption;
- } + return defaultEncryption;
+ }
}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#2

Hey Lubo,

Lubomir Marinov wrote:

Hi Emil,

One of the two changes in ProcessorUtility.java is the following
addition in the waitForState method:

System.out.println("d1");

Was it really intended to be part of the commit?

But of course! That's the most essential part of our code! :wink:

Thanks for noticing. Removed now.

Cheers
Emil

···

Best regards,
Lubo

emcho@dev.java.net wrote:

Author: emcho
Date: 2009-01-07 23:49:48+0000
New Revision: 4883

Modified:
   trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
   trunk/src/net/java/sip/communicator/impl/media/MediaControl.java
   trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java
   trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
   trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
   trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java
   trunk/src/net/java/sip/communicator/service/protocol/Call.java

Log:
Cosmetics only (unfortunately since we still have the 2nd SIP call issue).

Modified: trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java&p2=trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/CallSessionImpl.java 2009-01-07 23:49:48+0000
@@ -238,7 +238,7 @@
                 8,
                 1,
                 -1,
- AudioFormat.SIGNED)
+ AudioFormat.SIGNED)
     };

     /**
@@ -256,10 +256,10 @@

     /**
      * Holds the "Master" ZRTP session.
- *
+ *
      * This session must be started first and must have negotiated the key material
      * before any other media session to the same client can be started. See the
- * ZRTP specification, topic multi-streaming mode.
+ * ZRTP specification, topic multi-streaming mode.
      */
     private TransformConnector zrtpDHSession = null;
     /**
@@ -1601,7 +1601,7 @@
                 {
                     am.setAttribute("rtpmap", "4 G723/8000");
                     am.setAttribute("fmtp", "4 annexa=no;bitrate=6.3");
- }
+ }
             }

             byte onHold = this.onHold;
@@ -1626,19 +1626,19 @@
                     , 1
                     , "RTP/AVP"
                     , supportedVideoEncodings);
-
+
             String h264Str = String.valueOf(Constants.H264_RTP_SDP);
- for (int i = 0; i < supportedVideoEncodings.length; i++)
+ for (int i = 0; i < supportedVideoEncodings.length; i++)
             {
                 if(supportedVideoEncodings[i].equals(h264Str))
                 {
- vm.setAttribute("rtpmap",
+ vm.setAttribute("rtpmap",
                         Constants.H264_RTP_SDP + " H264/90000");
- vm.setAttribute("fmtp",
+ vm.setAttribute("fmtp",
                         Constants.H264_RTP_SDP + " packetization-mode=1");
- }
+ }
             }
-
+
             byte onHold = this.onHold;

             if (!mediaServCallback.getDeviceConfiguration()
@@ -2061,8 +2061,8 @@

                 SCCallback callback = new SCCallback(this);
                 boolean zrtpAutoStart = false;
-
- // Decide if this will become the ZRTP Master session:
+
+ // Decide if this will become the ZRTP Master session:
                 // - Statement: audio media session will be started before video media session
                 // - if no other audio session was started before then this will become
                 // ZRTP Master session
@@ -2091,9 +2091,9 @@
                 engine.setUserCallback(callback);

                 // Case 1: user toggled secure communication prior to the call
- // call is encrypted by default due to the option set in
+ // call is encrypted by default due to the option set in
                 // the account registration wizard
- if (this.getCall().isDefaultEncrypted())
+ if (this.getCall().isDefaultEncrypted())
                 {
                     if (engine.initialize("GNUZRTP4J.zid", zrtpAutoStart))
                     {
@@ -2107,7 +2107,7 @@
                     {
                        engine.sendInfo(ZrtpCodes.MessageSeverity.Info,
                                 EnumSet.of(ZRTPCustomInfoCodes.ZRTPEngineInitFailure));
- }
+ }
                 }
                 // Case 2: user will toggle secure communication during the call
                 // (it's not set on at this point)
@@ -2263,7 +2263,7 @@

         formatsRegisteredOnce = true;
     }
-
+
     static void registerCustomVideoCodecFormats(RTPManager rtpManager)
     {
         // if we have already registered custom formats and we are running JMF
@@ -2290,7 +2290,7 @@

     /**
      * Indicates that a change has occurred in the state of the source call.
- *
+ *
      * @param evt the <tt>CallChangeEvent</tt> instance containing the source
      * calls and its old and new state.
      */
@@ -2577,7 +2577,7 @@
     /**
      * This method is called when an event is generated by a
      * <code>Controller</code> that this listener is registered with.
- *
+ *
      * @param ce The event generated.
      */
     public synchronized void controllerUpdate(ControllerEvent ce)
@@ -2872,14 +2872,14 @@

     /**
      * Start multi-stream ZRTP sessions.
- *
+ *
      * After the ZRTP Master (DH) session reached secure state the SCCallback calls
      * this method to start the multi-stream ZRTP sessions.
- *
+ *
      * First get the multi-stream data from the ZRTP DH session. Then iterate over
      * all known connectors, set multi-stream mode data, and enable auto-start
      * mode (auto-sensing).
- *
+ *
      * @return Number of started ZRTP multi-stream mode sessions
      */
     public int startZrtpMultiStreams() {
@@ -2888,10 +2888,10 @@

         int counter = 0;
         byte[] multiStreamData = engine.getMultiStrParams();
-
+
         Enumeration<TransformConnector> tcs = transConnectors.elements();

- while (tcs.hasMoreElements()) {
+ while (tcs.hasMoreElements()) {
             TransformConnector tc = tcs.nextElement();
             if (tc.equals(zrtpDHSession)) {
                 continue;
@@ -3109,7 +3109,7 @@
      * Gets the visual <code>Component</code> of a specific <code>Player</code>
      * if it has one and ignores the failure to access it if the specified
      * <code>Player</code> is unrealized.
- *
+ *
      * @param player the <code>Player</code> to get the visual
      * <code>Component</code> of if it has one
      * @return the visual <code>Component</code> of the specified
@@ -3147,7 +3147,7 @@
      * Notifies the <code>VideoListener</code>s registered with this
      * <code>CallSession</code> about a specific type of change in the
      * availability of a specific visual <code>Component</code> depicting video.
- *
+ *
      * @param type the type of change as defined by <code>VideoEvent</code> in
      * the availability of the specified visual
      * <code>Component</code> depciting video

Modified: trunk/src/net/java/sip/communicator/impl/media/MediaControl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/MediaControl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/media/MediaControl.java&p2=trunk/src/net/java/sip/communicator/impl/media/MediaControl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/media/MediaControl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/MediaControl.java 2009-01-07 23:49:48+0000
@@ -126,7 +126,7 @@
      *
      * @throws MediaException if initialization fails.
      */
- public void initialize( DeviceConfiguration deviceConfig,
+ public void initialize( DeviceConfiguration deviceConfig,
                             EncodingConfiguration encodingConfig)
         throws MediaException
     {
@@ -470,7 +470,7 @@
             transmittableAudioEncodings.size();
         if (transmittableAudioEncodingCount > 0)
         {
- supportedAudioEncodings =
+ supportedAudioEncodings =
                 encodingConfiguration.updateEncodings(transmittableAudioEncodings);
         }
         else
@@ -478,7 +478,7 @@
             //just leave supportedAudioEncodings as it was in the beginning
             //as it will be only receiving so it could say it supports
             //everything.
- supportedAudioEncodings =
+ supportedAudioEncodings =
                 encodingConfiguration.getSupportedAudioEncodings();
         }

@@ -486,7 +486,7 @@
             transmittableVideoEncodings.size();
         if (transmittableVideoEncodingCount > 0)
         {
- supportedVideoEncodings =
+ supportedVideoEncodings =
                 encodingConfiguration.updateEncodings(transmittableVideoEncodings);
         }
         else
@@ -494,7 +494,7 @@
             //just leave supportedVideoEncodings as it was in the beginning
             //as it will be only receiving so it could say it supports
             //everything.
- supportedVideoEncodings =
+ supportedVideoEncodings =
                 encodingConfiguration.getSupportedVideoEncodings();
         }
     }
@@ -576,14 +576,14 @@
     /**
      * Creates a processing data source using the <tt>encodingSets</tt> map to
      * determine the formats/encodings allowed for the various media types.
- *
+ *
      * @param encodingSets a hashtable mapping media types such as "audio" or
      * "video" to <tt>List</tt>a of encodings (ordered by preference)
      * accepted for the corresponding type.
- *
+ *
      * @return a processing data source set to generate flows in the encodings
      * specified by the encodingSets map.
- *
+ *
      * @throws MediaException if creating the data source fails for some reason.
      */
     public DataSource createDataSourceForEncodings(
@@ -851,13 +851,13 @@
      * Looks for the first encoding (among the requested encodings elements)
      * that is also present in the <tt>availableFormats</tt> array and returns
      * the index of the corresponding <tt>Format</tt>.
- *
+ *
      * @param availableFormats an array of JMF <tt>Format</tt>s that we're
      * currently able to transmit.
      * @param requestedEncodings a table mapping media types (e.g. audio or
      * video) to a list of encodings that our interlocutor has sent
      * in order of preference.
- *
+ *
      * @return the index of the format corresponding to the first encoding that
      * had a marching format in the <tt>availableFormats</tt> array.
      */
@@ -990,7 +990,7 @@
     /**
      * Selects the nearest size supported by the capture device, to make drivers
      * scale the images.
- *
+ *
      * @param videoDS the video <code>DataSource</code>
      */
     private void selectVideoSize(DataSource videoDS)

Modified: trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java&p2=trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/ProcessorUtility.java 2009-01-07 23:49:48+0000
@@ -97,8 +97,9 @@
      * @param state one of the Processor.XXXed sate vars
      * @return boolean true if the state has been reached and false otherwise
      */
- public synchronized boolean waitForState(Processor processor, int state)
+ public synchronized boolean waitForState(Processor processor, int state)
     {
+ System.out.println("d1");
         processor.addControllerListener(this);
         setFailed(false);

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java 2009-01-07 23:49:48+0000
@@ -16,7 +16,7 @@

/**
  * A SIP implementation of the Call abstract class encapsulating SIP dialogs.
- *
+ *
  * @author Emil Ivov
  */
public class CallSipImpl
@@ -45,7 +45,7 @@
     /**
      * Crates a CallSipImpl instance belonging to <tt>sourceProvider</tt> and
      * initiated by <tt>CallCreator</tt>.
- *
+ *
      * @param sourceProvider the ProtocolProviderServiceSipImpl instance in the
      * context of which this call has been created.
      */
@@ -58,7 +58,7 @@
      * Adds <tt>callParticipant</tt> to the list of participants in this call.
      * If the call participant is already included in the call, the method has
      * no effect.
- *
+ *
      * @param callParticipant the new <tt>CallParticipant</tt>
      */
     public void addCallParticipant(CallParticipantSipImpl callParticipant)
@@ -77,7 +77,7 @@
      * Removes <tt>callParticipant</tt> from the list of participants in this
      * call. The method has no effect if there was no such participant in the
      * call.
- *
+ *
      * @param callParticipant the <tt>CallParticipant</tt> leaving the call;
      */
     public void removeCallParticipant(CallParticipantSipImpl callParticipant)
@@ -110,7 +110,7 @@
     /**
      * Sets the state of this call and fires a call change event notifying
      * registered listeners for the change.
- *
+ *
      * @param newState a reference to the <tt>CallState</tt> instance that the
      * call is to enter.
      */
@@ -129,7 +129,7 @@

     /**
      * Returns the state that this call is currently in.
- *
+ *
      * @return a reference to the <tt>CallState</tt> instance that the call is
      * currently in.
      */
@@ -140,7 +140,7 @@

     /**
      * Returns an iterator over all call participants.
- *
+ *
      * @return an Iterator over all participants currently involved in the call.
      */
     public Iterator<CallParticipant> getCallParticipants()
@@ -150,7 +150,7 @@

     /**
      * Returns the number of participants currently associated with this call.
- *
+ *
      * @return an <tt>int</tt> indicating the number of participants currently
      * associated with this call.
      */
@@ -162,7 +162,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- *
+ *
      * @param evt unused.
      */
     public void participantImageChanged(CallParticipantChangeEvent evt)
@@ -172,7 +172,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- *
+ *
      * @param evt unused.
      */
     public void participantAddressChanged(CallParticipantChangeEvent evt)
@@ -182,7 +182,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- *
+ *
      * @param evt unused.
      */
     public void participantTransportAddressChanged(
@@ -193,7 +193,7 @@
     /**
      * Dummy implementation of a method (inherited from CallParticipantListener)
      * that we don't need.
- *
+ *
      * @param evt unused.
      */
     public void participantDisplayNameChanged(CallParticipantChangeEvent evt)
@@ -202,7 +202,7 @@

     /**
      * Verifies whether the call participant has entered a state.
- *
+ *
      * @param evt The <tt>CallParticipantChangeEvent</tt> instance containing
      * the source event as well as its previous and its new status.
      */
@@ -216,7 +216,8 @@
             removeCallParticipant((CallParticipantSipImpl) evt
                 .getSourceCallParticipant());
         }
- else if ((newState == CallParticipantState.CONNECTED || newState == CallParticipantState.CONNECTING_WITH_EARLY_MEDIA))
+ else if ((newState == CallParticipantState.CONNECTED
+ || newState == CallParticipantState.CONNECTING_WITH_EARLY_MEDIA))
         {
             setCallState(CallState.CALL_IN_PROGRESS);
         }
@@ -225,7 +226,7 @@
     /**
      * Returns <tt>true</tt> if <tt>dialog</tt> matches the jain sip dialog
      * established with one of the participants in this call.
- *
+ *
      * @param dialog the dialog whose corresponding participant we're looking
      * for.
      * @return true if this call contains a call participant whose jain sip
@@ -239,7 +240,7 @@
     /**
      * Returns the call participant whose associated jain sip dialog matches
      * <tt>dialog</tt>.
- *
+ *
      * @param dialog the jain sip dialog whose corresponding participant we're
      * looking for.
      * @return the call participant whose jain sip dialog is the same as the
@@ -278,7 +279,7 @@
     /**
      * Sets the <tt>CallSession</tt> that the media service has created for this
      * call.
- *
+ *
      * @param callSession the <tt>CallSession</tt> that the media service has
      * created for this call.
      */
@@ -290,7 +291,7 @@
     /**
      * Sets the <tt>CallSession</tt> that the media service has created for this
      * call.
- *
+ *
      * @return the <tt>CallSession</tt> that the media service has created for
      * this call or null if no call session has been created so far.
      */

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java 2009-01-07 23:49:48+0000
@@ -2934,7 +2934,7 @@
     /**
      * Creates a new {@link Response#OK} response to a specific {@link Request}
      * which is to be sent as part of a specific {@link Dialog}.
- *
+ *
      * @param request the <code>Request</code> to create the OK response for
      * @param containingDialog the <code>Dialog</code> to send the response in
      * @return a new <code>Response.OK</code> response to the specified
@@ -2998,7 +2998,7 @@
      * Returns a string representation of this OperationSetBasicTelephony
      * instance including information that would permit to distinguish it among
      * other instances when reading a log file.
- *
+ *
      * @return a string representation of this operation set.
      */
     public String toString()
@@ -3132,7 +3132,7 @@

     /*
      * (non-Javadoc)
- *
+ *
      * @see
      * net.java.sip.communicator.service.protocol.OperationSetAdvancedTelephony
      * #transfer(net.java.sip.communicator.service.protocol.CallParticipant,
@@ -3184,7 +3184,7 @@

     /*
      * (non-Javadoc)
- *
+ *
      * @see
      * net.java.sip.communicator.service.protocol.OperationSetAdvancedTelephony
      * #transfer(net.java.sip.communicator.service.protocol.CallParticipant,

Modified: trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java&p2=trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java (original)
+++ trunk/src/net/java/sip/communicator/service/protocol/AbstractCallParticipant.java 2009-01-07 23:49:48+0000
@@ -16,7 +16,7 @@
  * Provides a default implementation for most of the
  * <code>CallParticipant</code> methods with the purpose of only leaving custom
  * protocol development to clients using the PhoneUI service.
- *
+ *
  * @author Emil Ivov
  */
public abstract class AbstractCallParticipant
@@ -226,7 +226,7 @@
      * Gets the time at which this <code>CallParticipant</code> transitioned
      * into a state (likely {@link CallParticipantState#CONNECTED}) marking the
      * start of the duration of the participation in a <code>Call</code>.
- *
+ *
      * @return the time at which this <code>CallParticipant</code> transitioned
      * into a state marking the start of the duration of the
      * participation in a <code>Call</code> or

Modified: trunk/src/net/java/sip/communicator/service/protocol/Call.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/service/protocol/Call.java?view=diff&rev=4883&p1=trunk/src/net/java/sip/communicator/service/protocol/Call.java&p2=trunk/src/net/java/sip/communicator/service/protocol/Call.java&r1=4882&r2=4883

--- trunk/src/net/java/sip/communicator/service/protocol/Call.java (original)
+++ trunk/src/net/java/sip/communicator/service/protocol/Call.java 2009-01-07 23:49:48+0000
@@ -48,13 +48,13 @@
      * securing algorithm used
      */
     private Hashtable<Object, SecurityGUIListener> securityGUIListeners;
-
+
     /**
- * If this flag is set to true according to the account properties
+ * If this flag is set to true according to the account properties
      * related with the sourceProvider the associated CallSession will start
- * encrypted by default (where applicable)
+ * encrypted by default (where applicable)
      */
- private final boolean defaultEncryption;
+ private final boolean defaultEncryption;

     /**
      * Creates a new Call instance.
@@ -297,14 +297,14 @@
         else
             return securityGUIListeners.get(key);
     }
-
+
     /**
      * Returns the default call encryption flag
- *
+ *
      * @return the default call encryption flag
      */
     public boolean isDefaultEncrypted()
     {
- return defaultEncryption;
- }
+ return defaultEncryption;
+ }
}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net