[sip-comm-dev] Re: svn commit: r4906 - trunk: lib/native/mac lib/os-specific/linux/installer-exclude lib/os-specific/mac/installer-exclude lib/os-specific/solaris/ins...


#1

This revision causes an exception (on my Windows setup) upon an
attempt to put a given call on hold and then doesn't allow that call
to be resumed:

     [java] java.lang.RuntimeException: CircularQueue failure:
     [java] head=3
     [java] tail=3
     [java] canRead=5
     [java] canWrite=0
     [java] lockedRead=0
     [java] lockedWrite=0
     [java] at com.sun.media.CircularBuffer.error(CircularBuffer.java:136)
     [java] at
com.sun.media.CircularBuffer.getEmptyBuffer(CircularBuffer.java:118)
     [java] at
com.sun.media.multiplexer.RawBufferMux$RawBufferSourceStream.process(RawBufferMux.java:785)
     [java] at
com.sun.media.multiplexer.RawSyncBufferMux.process(RawSyncBufferMux.java:192)
     [java] at
com.sun.media.BasicMuxModule.connectorPushed(BasicMuxModule.java:406)
     [java] at
com.sun.media.BasicOutputConnector.writeReport(BasicOutputConnector.java:120)
     [java] at
com.sun.media.BasicFilterModule.process(BasicFilterModule.java:408)
     [java] at
com.sun.media.BasicModule.connectorPushed(BasicModule.java:69)
     [java] at
com.sun.media.BasicOutputConnector.writeReport(BasicOutputConnector.java:120)
     [java] at
com.sun.media.BasicFilterModule.process(BasicFilterModule.java:408)
     [java] at
com.sun.media.BasicModule.connectorPushed(BasicModule.java:69)
     [java] at
com.sun.media.BasicOutputConnector.writeReport(BasicOutputConnector.java:120)
     [java] at
com.sun.media.BasicFilterModule.process(BasicFilterModule.java:408)
     [java] at
com.sun.media.BasicModule.connectorPushed(BasicModule.java:69)
     [java] at
com.sun.media.BasicOutputConnector.writeReport(BasicOutputConnector.java:120)
     [java] at
com.sun.media.BasicFilterModule.process(BasicFilterModule.java:408)
     [java] at
com.sun.media.BasicModule.connectorPushed(BasicModule.java:69)
     [java] at
com.sun.media.BasicOutputConnector.writeReport(BasicOutputConnector.java:120)
     [java] at
com.sun.media.BasicFilterModule.process(BasicFilterModule.java:408)
     [java] at
com.sun.media.BasicModule.connectorPushed(BasicModule.java:69)
     [java] at
com.sun.media.BasicOutputConnector.writeReport(BasicOutputConnector.java:120)
     [java] at com.sun.media.SourceThread.process(SourceThread.java:144)
     [java] at com.sun.media.util.LoopThread.run(LoopThread.java:135)
     [java] 05:33:04.992 WARNING:
impl.media.ProcessorUtility.controllerUpdate().74
ControllerErrorEvent:
javax.media.ControllerErrorEvent[source=com.sun.media.processor.unknown.Handler@167a13d,message=Internal
module com.sun.media.BasicMuxModule@14beddd failed!]

···

On Mon, Jan 19, 2009 at 5:37 PM, <damencho@dev.java.net> wrote:

Author: damencho
Date: 2009-01-19 15:37:44+0000
New Revision: 4906

Modified:
  trunk/lib/native/mac/libavcodec.dylib
  trunk/lib/native/mac/libavformat.dylib
  trunk/lib/native/mac/libavutil.dylib
  trunk/lib/os-specific/linux/installer-exclude/jmf.jar
  trunk/lib/os-specific/mac/installer-exclude/jmf.jar
  trunk/lib/os-specific/solaris/installer-exclude/jmf.jar
  trunk/lib/os-specific/windows/installer-exclude/jmf.jar
  trunk/src/net/java/sip/communicator/impl/media/MediaControl.java
  trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java

Log:
1. Fixing closing camera after hangup.
2. Second video call.
3. New version of codec.

Modified: trunk/lib/native/mac/libavcodec.dylib
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/native/mac/libavcodec.dylib?view=diff&rev=4906&p1=trunk/lib/native/mac/libavcodec.dylib&p2=trunk/lib/native/mac/libavcodec.dylib&r1=4905&r2=4906

Binary files. No diff available.

Modified: trunk/lib/native/mac/libavformat.dylib
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/native/mac/libavformat.dylib?view=diff&rev=4906&p1=trunk/lib/native/mac/libavformat.dylib&p2=trunk/lib/native/mac/libavformat.dylib&r1=4905&r2=4906

Binary files. No diff available.

Modified: trunk/lib/native/mac/libavutil.dylib
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/native/mac/libavutil.dylib?view=diff&rev=4906&p1=trunk/lib/native/mac/libavutil.dylib&p2=trunk/lib/native/mac/libavutil.dylib&r1=4905&r2=4906

Binary files. No diff available.

Modified: trunk/lib/os-specific/linux/installer-exclude/jmf.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/os-specific/linux/installer-exclude/jmf.jar?view=diff&rev=4906&p1=trunk/lib/os-specific/linux/installer-exclude/jmf.jar&p2=trunk/lib/os-specific/linux/installer-exclude/jmf.jar&r1=4905&r2=4906

Binary files. No diff available.

Modified: trunk/lib/os-specific/mac/installer-exclude/jmf.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/os-specific/mac/installer-exclude/jmf.jar?view=diff&rev=4906&p1=trunk/lib/os-specific/mac/installer-exclude/jmf.jar&p2=trunk/lib/os-specific/mac/installer-exclude/jmf.jar&r1=4905&r2=4906

Binary files. No diff available.

Modified: trunk/lib/os-specific/solaris/installer-exclude/jmf.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/os-specific/solaris/installer-exclude/jmf.jar?view=diff&rev=4906&p1=trunk/lib/os-specific/solaris/installer-exclude/jmf.jar&p2=trunk/lib/os-specific/solaris/installer-exclude/jmf.jar&r1=4905&r2=4906

Binary files. No diff available.

Modified: trunk/lib/os-specific/windows/installer-exclude/jmf.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/lib/os-specific/windows/installer-exclude/jmf.jar?view=diff&rev=4906&p1=trunk/lib/os-specific/windows/installer-exclude/jmf.jar&p2=trunk/lib/os-specific/windows/installer-exclude/jmf.jar&r1=4905&r2=4906

Binary files. No diff available.

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=4906&p1=trunk/src/net/java/sip/communicator/impl/media/MediaControl.java&p2=trunk/src/net/java/sip/communicator/impl/media/MediaControl.java&r1=4905&r2=4906

--- trunk/src/net/java/sip/communicator/impl/media/MediaControl.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/MediaControl.java 2009-01-19 15:37:44+0000
@@ -103,6 +103,7 @@
     */
    public MediaControl()
    {
+ //com.sun.media.util.Registry.set("allowLogging", Boolean.TRUE);
    }

    /**
@@ -948,12 +949,12 @@

        if( sourceProcessor.getState() == Processor.Started )
        {
+ avDataSource.disconnect();
            sourceProcessor.stop();

- avDataSource.disconnect();
            try
            {
- initProcessor(avDataSource);
+ initCaptureDevices();
            }
            catch (Exception e)
            {

Modified: trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java?view=diff&rev=4906&p1=trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java&p2=trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java&r1=4905&r2=4906

--- trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java (original)
+++ trunk/src/net/java/sip/communicator/impl/media/codec/video/h264/NativeEncoder.java 2009-01-19 15:37:44+0000
@@ -221,7 +221,7 @@
            return BUFFER_PROCESSED_OK;
        }

- synchronized (AVCODEC)
+ synchronized (this)
        {
            // copy data to avpicture
            rawFrameBuffer.write(0,
@@ -349,7 +349,7 @@
        if (opened)
        {
            opened = false;
- synchronized (AVCODEC)
+ synchronized (this)
            {
                AVCODEC.avcodec_close(avcontext);

---------------------------------------------------------------------
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