Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
9 years ago
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
9 years ago
Andrey Pavlenko
23fea91e84
minor fixes
9 years ago
Andrey Pavlenko
15db8243ef
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
9 years ago
Philipp Hasper
05846438e3
Typo in CameraBridgeViewBase.java
...
Corrected typo and unused imports
9 years ago
Alexander Alekhin
eb2e061e3f
fix Android camera datarace (mCameraFrameReady)
9 years ago
Andrey Pavlenko
8e088d38a5
draft implementation of alternative CameraBridge via GLES
...
a simple sample will look like:
```java
public class MainActivity extends Activity implements CameraGLSurfaceView.CameraTextureListener {
CameraGLSurfaceView mView;
ByteBuffer buf;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
mView = new CameraGLSurfaceView(this, null);
mView.setCameraTextureListener(this);
setContentView(mView);
buf = ByteBuffer.allocateDirect(1920*1080*4);
}
@Override
protected void onPause() {
mView.onPause();
super.onPause();
}
@Override
protected void onResume() {
super.onResume();
mView.onResume();
}
@Override
public void onCameraViewStarted(int width, int height) {
// TODO Auto-generated method stub
}
@Override
public void onCameraViewStopped() {
// TODO Auto-generated method stub
}
@Override
public boolean onCameraFrame(int texIn, int texOut, int width, int height) {
Log.i("MAIN", "onCameraFrame");
int w=width, h=height;
/*
// option 1:
// just return 'false' to display texIn on screen
retutn false;
*/
/*
// option 2:
// fast copy texIn to texOut
GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
GLES20.glCopyTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, 0, 0, w, h, 0);
return true;
*/
// option 3:
// read, modify and write back pixels
GLES20.glReadPixels(0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
buf.rewind();
// red line
for(int i=0; i<h; i++) {
buf.position(w*4*i+i*4);
buf.put((byte) -1);
buf.position(w*4*i+i*4+4);
buf.put((byte) -1);
}
buf.rewind();
GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
return true;
}
}
```
9 years ago
berak
a11ff876d4
enable VideoWriter class for java
...
fixing fourcc
9 years ago
Alexander Alekhin
bbff288447
fix build with python3 only
9 years ago
Evgeny Talanin
9a3dccab20
Increase Android Manager version
9 years ago
Maksim Shabunin
83b2621de4
Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms
10 years ago
Maksim Shabunin
33ab9ea188
AndroidMgr: fixed typos and package name
10 years ago
Maksim Shabunin
caffbaafbe
Updated Manager for Android
10 years ago
Andrey Pavlenko
72ec9c159e
releasing native memory of temp `Mat` objects in generated Java code
10 years ago
Andrey Pavlenko
5b00d9da49
releasing native memory in Java converters
10 years ago
Andrey Pavlenko
c1c03e16f4
releasing native memory of temp `Mat` objects in generated Java code
10 years ago
Andrey Pavlenko
6006790c18
releasing native memory in Java converters
10 years ago
aletheios
6a50a51b4e
Bugfix #3705 : params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
10 years ago
Andrey Pavlenko
ab8afc3bcc
Revert of "Merge pull request #4006 from sgjava:opencv-steve" (reverted from commit 4743184078
)
10 years ago
Andrey Pavlenko
d67d32af48
Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770
)
10 years ago
sgjava
fe0ce9282a
Changed delete() modifier to public from protected
10 years ago
sgjava
0f53526598
Added VideoWriter and changed finalize to delete
10 years ago
Simon Heinen
6decc2596d
squashed #3729
...
Update android+AsyncServiceHelper.java
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Update android+AsyncServiceHelper.java
small formatting fixes
10 years ago
Maksim Shabunin
a362aca783
Rename manager package to OpenCV3 Manager
10 years ago
Maksim Shabunin
316d76bdb6
Rename OpenCV Engine to org.opencv.engine3 for release candidate
10 years ago
Simon Heinen
d2dc7f4c27
Update android+AsyncServiceHelper.java
...
small formatting fixes
10 years ago
Simon Heinen
0df9dc8fb9
Update android+AsyncServiceHelper.java
...
changed tabs in last commit to spaces
10 years ago
Prof. Dr. Rudolf Haussmann
a9d4e05346
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: highgui/include/opencv2/highgui/highgui_c.h
modified: highgui/src/cap_dshow.cpp
modified: java/generator/gen_java.py
The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.
10 years ago
Prof. Dr. Rudolf Haussmann
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
10 years ago
Maksim Shabunin
231685133e
OpenCV Manager: support 3.0.0 library
10 years ago
Prof. Dr. Rudolf Haussmann
9f1eb70dbc
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/java/generator/gen_java.py
modified: modules/videoio/include/opencv2/videoio.hpp
modified: modules/videoio/include/opencv2/videoio/videoio_c.h
modified: modules/videoio/src/cap_dshow.cpp
modified: modules/videoio/src/cap_pvapi.cpp
Following changes have been made:
1. Some minor bugs have been removed.
2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
this option does not make sense and causes an error if a color camera is used.
3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
to activate the different pixel formats (color modes) of an AVT camera.
4. Since there were two identical defines
CAP_PROP_MONOCROME = 19
CAP_PROP_MONOCHROME = 19
which were also used in the other module DSHOW, the first one with an orthographic
error has been removed in favor of the second one.
10 years ago
Maksim Shabunin
457123027e
Modified java wrapping mechanism
10 years ago
Alexander Alekhin
52effe9e72
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
10 years ago
Alexander Smorkalov
96e5300fdd
OpenCV and OpenCV Manager version++
10 years ago
Simon Heinen
5d97dd0ea5
Update android+AsyncServiceHelper.java
10 years ago
Alexander Alekhin
dc21a0a6b5
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
10 years ago
Maksim Shabunin
bebf6c47c6
Removed Sphinx generation commands from cmake scripts
10 years ago
StevenPuttemans
f151b1d277
fix wrong property name and corresponding documentation
10 years ago
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
10 years ago
Maksim Shabunin
c5a1650ac0
Refactoring in gen_java.py script
10 years ago
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
10 years ago
Vadim Pisarevsky
9c9ecc22e2
fixed opencv_java build
10 years ago
Vadim Pisarevsky
c422bdc3f8
fixed some more compile errors and test failures
10 years ago
Vadim Pisarevsky
61cddd8b63
fixed opencv_java build
10 years ago
Matthew Conway
92efe4534b
update gen_javadoc prints to python3 syntax fixed #3768
10 years ago
Alexander Smorkalov
a0431acb37
OpenCV Manager version++.
10 years ago
Maksim Shabunin
0d7b44db50
Java wrappers now support nested namespaces and classes
...
- wrapper support python3
- added wrapper log
- generating full name for nested namespaces and classes
10 years ago
Maksim Shabunin
6337fd0650
Support of bioinspired contrib module wrapping
...
- added java wrapper
- disabled python wrapper
10 years ago
Maksim Shabunin
39874ef742
Fixed some failing java tests
...
- fixed lena.png extension
- fixed getTextSize wrapper
- added junit html report generation
10 years ago
Maksim Shabunin
b3bae170ed
Fixed java tests build
...
- disabled xfeature2d dependency for java wrappers
- fixed java wrappers build after cmake rerun
- disabled opencv_ml tests temporarily
- fixed Imgproc usage in java tests
10 years ago