atsuo****@users*****
atsuo****@users*****
2010年 4月 21日 (水) 10:27:37 JST
ForkThis is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to "nyartoolkit-and" repository
containing the "nyartoolkit-and" project.
The branch, android-1.6 has been updated
via 76cfeb091aa37c9d326e70ec5ddc643e998af6e2 (commit)
via d37e13b75a6756eeaa2675eac0272d321f610b40 (commit)
from bc18b235a86e34730373c9331859b4aef8385dbe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 76cfeb091aa37c9d326e70ec5ddc643e998af6e2
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date: Wed Apr 21 10:29:52 2010 +0900
Move camera preview format convert function to JNI.
YUV420SP to ARGB/RGB24.
Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>
commit d37e13b75a6756eeaa2675eac0272d321f610b40
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date: Wed Apr 21 10:17:41 2010 +0900
Move android_group/artoolkit to androidgroup/nyartoolkit
Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>
-----------------------------------------------------------------------
Summary of changes:
AndroidManifest.xml | 2 +-
.../artoolkit => androidgroup/nyartoolkit}/R.java | 2 +-
jni/Android.mk | 15 ++
jni/yuv420sp2rgb/yuv420sp2rgb.c | 219 ++++++++++++++++++++
libs/armeabi/libyuv420sp2rgb.so | Bin 0 -> 14306 bytes
res/layout/camera.xml | 2 +-
res/layout/devonecamera.xml | 2 +-
res/layout/ht03acamera.xml | 2 +-
res/layout/n1camera.xml | 2 +-
res/layout/uvccamera.xml | 2 +-
res/values/strings.xml | 2 +-
.../nyartoolkit}/ARToolkitDrawer.java | 142 +++++++------
.../nyartoolkit}/Cube.java | 2 +-
.../nyartoolkit}/GLLib/ColorABGR.java | 2 +-
.../nyartoolkit}/GLLib/ColorFloat.java | 2 +-
.../nyartoolkit}/GLLib/ColorHSV.java | 2 +-
.../nyartoolkit}/GLLib/ColorHSVDialog.java | 2 +-
.../nyartoolkit}/ModelRenderer.java | 10 +-
.../nyartoolkit}/NyARToolkitAndroidActivity.java | 37 ++--
.../nyartoolkit}/hardware/CameraIF.java | 2 +-
.../nyartoolkit}/hardware/Dev1Camera.java | 6 +-
.../nyartoolkit}/hardware/HT03ACamera.java | 6 +-
.../nyartoolkit}/hardware/N1Camera.java | 6 +-
.../nyartoolkit}/hardware/SocketCamera.java | 2 +-
.../nyartoolkit}/hardware/StaticCamera.java | 2 +-
.../nyartoolkit}/hardware/UVCCamera.java | 8 +-
.../nyartoolkit}/model/ARModel.java | 2 +-
.../nyartoolkit}/model/VoicePlayer.java | 2 +-
.../nyartoolkit}/view/GLBg.java | 2 +-
.../nyartoolkit}/view/GLSurfaceView.java | 2 +-
30 files changed, 365 insertions(+), 124 deletions(-)
rename gen/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/R.java (95%)
create mode 100644 jni/Android.mk
create mode 100644 jni/yuv420sp2rgb/yuv420sp2rgb.c
create mode 100644 libs/armeabi/libyuv420sp2rgb.so
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/ARToolkitDrawer.java (60%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/Cube.java (98%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/GLLib/ColorABGR.java (89%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/GLLib/ColorFloat.java (90%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/GLLib/ColorHSV.java (93%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/GLLib/ColorHSVDialog.java (96%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/ModelRenderer.java (94%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/NyARToolkitAndroidActivity.java (92%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/CameraIF.java (93%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/Dev1Camera.java (99%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/HT03ACamera.java (98%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/N1Camera.java (98%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/SocketCamera.java (94%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/StaticCamera.java (98%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/hardware/UVCCamera.java (98%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/model/ARModel.java (82%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/model/VoicePlayer.java (96%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/view/GLBg.java (95%)
rename src/jp/{android_group/artoolkit => androidgroup/nyartoolkit}/view/GLSurfaceView.java (99%)
hooks/post-receive
--
nyartoolkit-and (nyartoolkit-and)