summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-27 19:21:17 +0200
committerSven Gothel <[email protected]>2013-08-27 19:21:17 +0200
commit554ec0576432194f050191bdf248a1462d542a6d (patch)
treec8f096f0cca0c07ae23d9d2cd81f91bd9334210f /make
parent0de489019085246abb437454e9ac8fd6fc238692 (diff)
GLMediaPlayer: Add camera input / FFMPEG: Fix 'av_packet' leak and add missing symbol 'av_realloc'.
- Add camera input - Use URI w/ scheme 'camera' to determine camera input is desired, use URI host as camera id. E.g. 'camera://0' for 1st camera. - AndroidGLMediaPlayerAPI14: Via 'Camera' - FFMPEG*: Via libavdevice, device name and input format - TODO: Add controls to manipulate camera if available - FFMPEG* - Add symbols - avcodec_register_all - av_realloc (was missing) - avdevice_register_all - Load libavdevice (opt) - Camera: - Use <ID> (windows) and /dev/video<ID> other OS - simply find the input format in native code - Support YUYV422 (used in video4linux2, etc.) - Stuff 2x 16bpp (YUYV) into one RGBA pixel! - Add texture format for 16bpp - Add texture lookup shader - Fix av_packet leak in readNextImpl(..) - Restore orig pointer and size values, we may have moved along within packet. Then call av_free_packet(). - Use null AudioSink if audio-id is NONE
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml1
-rw-r--r--make/resources/android/AndroidManifest-jogl.xml3
-rw-r--r--make/resources/android/AndroidManifest-test.xml31
-rw-r--r--make/resources/android/res-test/values/strings.xml4
-rw-r--r--make/scripts/tests.sh6
5 files changed, 35 insertions, 10 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index b384aebc2..ee40c7e10 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1479,6 +1479,7 @@
<outofdate>
<sourcefiles>
<fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
+ <fileset dir="${project.root}" includes="${rootrel.src.c.libav}/jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c"/>
</sourcefiles>
<targetfiles>
<fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/>
diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml
index 1c08cc484..c07ee041b 100644
--- a/make/resources/android/AndroidManifest-jogl.xml
+++ b/make/resources/android/AndroidManifest-jogl.xml
@@ -4,7 +4,8 @@
package="javax.media.opengl">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
- <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+ <uses-feature android:name="android.hardware.camera" android:required="false" />
+ <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<uses-library android:name="com.jogamp.common" android:required="true" />
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml
index 5357d0a18..d57913638 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-test.xml
@@ -4,7 +4,8 @@
package="com.jogamp.opengl.test">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
- <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+ <uses-feature android:name="android.hardware.camera" android:required="false" />
+ <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<uses-library android:name="com.jogamp.common" android:required="true" />
<uses-library android:name="javax.media.opengl" android:required="true" />
@@ -120,8 +121,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00a"
- android:label="@string/activity_moviesimple0a_name"
+ <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b"
+ android:label="@string/activity_moviesimple0b_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
>
@@ -130,8 +131,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b"
- android:label="@string/activity_moviesimple0b_name"
+ <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00c"
+ android:label="@string/activity_moviesimple0c_name"
android:description="@string/activity_moviesimple_descr"
android:theme="@android:style/Theme.NoDisplay"
>
@@ -180,6 +181,26 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1a"
+ android:label="@string/activity_moviecube1a_name"
+ android:description="@string/activity_moviecube_descr"
+ android:theme="@android:style/Theme.NoDisplay"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1b"
+ android:label="@string/activity_moviecube1b_name"
+ android:description="@string/activity_moviecube_descr"
+ android:theme="@android:style/Theme.NoDisplay"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
</application>
</manifest>
diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml
index 0b7bd2d51..072cf47e6 100644
--- a/make/resources/android/res-test/values/strings.xml
+++ b/make/resources/android/res-test/values/strings.xml
@@ -23,12 +23,14 @@
<string name="activity_graphui2p_descr">GraphUI 2-pass</string>
<string name="activity_elektro_name">Elektro</string>
<string name="activity_elektro_descr">Elektro</string>
- <string name="activity_moviesimple0a_name">MovieSimple0a</string>
<string name="activity_moviesimple0b_name">MovieSimple0b</string>
+ <string name="activity_moviesimple0c_name">CamSimple0</string>
<string name="activity_moviesimple1a_name">MovieSimple1a</string>
<string name="activity_moviesimple1b_name">MovieSimple1b</string>
<string name="activity_moviesimple2_name">MovieSimple2</string>
<string name="activity_moviesimple_descr">MovieSimple</string>
<string name="activity_moviecube0_name">MovieCube0</string>
+ <string name="activity_moviecube1a_name">CamCube0</string>
+ <string name="activity_moviecube1b_name">CamCube1</string>
<string name="activity_moviecube_descr">MovieCube</string>
</resources>
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index c7207bbcf..2be4d76b2 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -133,7 +133,7 @@ function jrun() {
#D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer"
#D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.AudioSink"
#D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native"
- #D_ARGS="-Djogl.debug.GLMediaPlayer"
+ D_ARGS="-Djogl.debug.GLMediaPlayer"
#D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer"
#D_ARGS="-Djogl.debug.GLMediaPlayer.Native"
#D_ARGS="-Djogl.debug.AudioSink"
@@ -319,8 +319,8 @@ function testawtswt() {
# av demos
#
#testnoawt jogamp.opengl.openal.av.ALDummyUsage $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
-testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
#
# core/newt (testnoawt and testawt)