summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java9
-rw-r--r--src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java
index 7f57138a7..1fb0608fb 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java
@@ -197,10 +197,14 @@ public interface GLMediaPlayer extends TextureSequence {
* {@link URI#getScheme() URI scheme} name {@value} for camera input. E.g. <code>camera://0</code>
* for the 1st camera device.
* <p>
- * The {@link URI#getRawPath() URI path} is being used to identify the camera,
+ * The {@link URI#getRawPath() URI path} is being used to identify the camera (<i>ID</i>),
* where the root fwd-slash is being cut-off.
* </p>
* <p>
+ * The <i>ID</i> is usually an integer value indexing the camera
+ * ranging from [0..<i>max-number</i>].
+ * </p>
+ * <p>
* The {@link URI#getRawQuery() URI query} is used to pass options to the camera.
* </p>
* <pre>
@@ -359,11 +363,10 @@ public interface GLMediaPlayer extends TextureSequence {
*
* @param gl current GL object. Maybe <code>null</code>, for audio only.
* @throws IllegalStateException if not invoked in {@link State#Initialized}.
- * @throws IllegalArgumentException if arguments are invalid
* @throws StreamException forwarded from the off-thread stream initialization
* @throws GLException in case of difficulties to initialize the GL resources
*/
- public void initGL(GL gl) throws IllegalStateException, IllegalArgumentException, StreamException, GLException;
+ public void initGL(GL gl) throws IllegalStateException, StreamException, GLException;
/**
* If implementation uses a {@link AudioSink}, it's instance will be returned.
diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
index 269500399..2737a0b6a 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
@@ -134,7 +134,7 @@ import jogamp.opengl.util.av.impl.FFMPEGNatives.SampleFormat;
* <li>GNU/Linux: ffmpeg or libav are deployed in most distributions.</li>
* <li>Windows:
* <ul>
- * <li>http://ffmpeg.zeranoe.com/builds/ (ffmpeg)</li>
+ * <li>http://ffmpeg.zeranoe.com/builds/ (ffmpeg) <i>recommended, works w/ dshow</i></li>
* <li>http://win32.libav.org/releases/ (libav)</li>
* </ul></li>
* <li>MacOSX: http://ffmpegmac.net/</li>