Fixes a problem in AVFrameFormat#intersects(Format) which could lead to loss of state/pixFmt.

src/net/java/sip/communicator/impl/neomedia/codec/video/AVFrameFormat.java

@@ -31,17 +31,18 @@ public class AVFrameFormat
     public static final String AVFRAME = "AVFrame";
 
     /**
-     * The native FFmpeg format represented by this instance.
+     * The native device-specific format represented by this instance. It's
+     * necessary in the cases of multiple device-specific formats corresponding
+     * to one and the same native FFmpeg format in which JMF is unable to
+     * differentiate them, yet the device needs to know its device-specific
+     * format.
      */
-    private int pixFmt;
+    private int devicePixFmt;
 
     /**
-     * Native format of the capture device. Because some native capture device
-     * formats can correspond to the same FFmpeg format, JMF's stream is unable
-     * to differentiate them. So having the native format here
-     * allow JMF stream to know it directly.
+     * The native FFmpeg format represented by this instance.
      */
-    private int devicePixFmt;
+    private int pixFmt;
 
     /**
      * Initializes a new <tt>AVFrameFormat</tt> instance with unspecified size,
@@ -75,8 +76,10 @@ public AVFrameFormat(int pixFmt, int devicePixFmt)
      * @param devicePixFmt the capture device colorspace to be represented by
      * the new instance
      */
-    public AVFrameFormat(Dimension size, float frameRate, int pixFmt,
-            int devicePixFmt)
+    public AVFrameFormat(
+            Dimension size,
+            float frameRate,
+            int pixFmt, int devicePixFmt)
     {
         super(AVFRAME, size, NOT_SPECIFIED, AVFrame.class, frameRate);
 
@@ -98,8 +101,7 @@ public Object clone()
             = new AVFrameFormat(
                     getSize(),
                     getFrameRate(),
-                    pixFmt,
-                    devicePixFmt);
+                    pixFmt, devicePixFmt);
 
         f.copy(this);
         return f;
@@ -184,11 +186,11 @@ public Format intersects(Format format)
 
         if (intersection == null)
             return null;
-        if (!(format instanceof AVFrameFormat))
-            return intersection;
 
-        ((AVFrameFormat) intersection).pixFmt
-            = (pixFmt == NOT_SPECIFIED)
+        AVFrameFormat avFrameFormatIntersection = (AVFrameFormat) intersection;
+
+        avFrameFormatIntersection.pixFmt
+            = ((pixFmt == NOT_SPECIFIED) && (format instanceof AVFrameFormat))
                 ? ((AVFrameFormat) format).pixFmt
                 : pixFmt;
         return intersection;