| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
? make/GnuCTreeParserTokenTypes.txt
? make/STDCTokenTypes.txt
? make/make.jogl.all.linux-x86.log
? make/make.jogl.cdcfp.linux-x86.log
? make/make.jogl.doc.all.log
Index: make/build.xml
===================================================================
RCS file: /cvs/jogl/make/build.xml,v
retrieving revision 1.141.2.55
diff -r1.141.2.55 build.xml
356a357
> <property name="rootrel.src.c.openmax" value="src/native/openmax" />
1453a1455
> <includepath path="stub_includes/openmax" if="useOpenMAX"/>
Index: make/make.jogl.cdcfp.linux-x86.sh
===================================================================
RCS file: /cvs/jogl/make/Attic/make.jogl.cdcfp.linux-x86.sh,v
retrieving revision 1.1.2.5
diff -r1.1.2.5 make.jogl.cdcfp.linux-x86.sh
10c10
< # -Djava.generate.skip=true
---
> # -Djava.generate.skip=true \
20a21
> -Djava.generate.skip=true \
Index: src/classes/com/sun/javafx/media/video/openmax/OMXMoviePlayerImpl.java
===================================================================
RCS file: /cvs/jogl/src/classes/com/sun/javafx/media/video/openmax/Attic/OMXMoviePlayerImpl.java,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 OMXMoviePlayerImpl.java
354a355
> gl.glDisable(gl.GL_TEXTURE_2D);
Index: src/classes/javax/media/opengl/GLArrayDataWrapper.java
===================================================================
RCS file: /cvs/jogl/src/classes/javax/media/opengl/Attic/GLArrayDataWrapper.java,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 GLArrayDataWrapper.java
165a166
> this.normalized = normalized;
Index: src/native/newt/KDWindow.c
===================================================================
RCS file: /cvs/jogl/src/native/newt/Attic/KDWindow.c,v
retrieving revision 1.1.2.4
diff -r1.1.2.4 KDWindow.c
66c66
< #define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__)
---
> #define DBG_PRINT(...) fprintf(stdout, __VA_ARGS__)
73,74c73,74
< #define STDOUT_FILE "\\Storage Card\\jogl_demos\\stdout.txt"
< #define STDERR_FILE "\\Storage Card\\jogl_demos\\stderr.txt"
---
> #define STDOUT_FILE "\\Storage Card\\stdout.txt"
> #define STDERR_FILE "\\Storage Card\\stderr.txt"
Index: src/native/openmax/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c
===================================================================
RCS file: /cvs/jogl/src/native/openmax/Attic/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c
74c74
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1createInstance
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1createInstance
87c87
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setStream
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setStream
105c105
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1updateStreamInfo
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1updateStreamInfo
117c117
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setEGLImageTexture2D
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setEGLImageTexture2D
129c129
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1activateInstance
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1activateInstance
142c142
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
146c146
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1play
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1play
149c149
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1play\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1play\n");
161c161
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
165c165
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1stop
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1stop
174c174
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
178c178
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setVolume
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setVolume
185c185
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
189c189
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getCurrentPosition
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getCurrentPosition
198c198
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
202c202
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getCurrentLoaded
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getCurrentLoaded
210c210
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getDuration
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getDuration
218c218
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
222c222
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1step
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1step
225c225
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1step\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1step\n");
232c232
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
236c236
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setRate
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setRate
239c239
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setRate\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setRate\n");
244c244
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
248c248
< JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setCurrentPosition
---
> JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setCurrentPosition
251c251
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setRate\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setRate\n");
257c257
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
261c261
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1lock
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1lock
264c264
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1lock\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1lock\n");
269c269
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
273c273
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1unlock
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1unlock
276c276
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1unlock\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1unlock\n");
281c281
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
285c285
< JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getTextureID
---
> JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getTextureID
288c288
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getTextureID\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getTextureID\n");
299c299
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
303c303
< JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getWidth
---
> JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getWidth
306c306
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getWidth\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getWidth\n");
318c318
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
322c322
< JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getHeight
---
> JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getHeight
325c325
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getHeight\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getHeight\n");
337c337
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
341c341
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1task
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1task
348c348
< * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl
---
> * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl
352c352
< JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1destroyInstance
---
> JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1destroyInstance
355c355
< //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1destroy\n");
---
> //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1destroy\n");
Index: src/native/openmax/omx_tool.c
===================================================================
RCS file: /cvs/jogl/src/native/openmax/Attic/omx_tool.c,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 omx_tool.c
3a4,25
> #define VERBOSE_ON 1
> #define VERBOSE2_ON 1
>
> #ifdef VERBOSE_ON
> #define DBG_PRINT(...) fprintf(stdout, __VA_ARGS__)
> #else
> #define DBG_PRINT(...)
> #endif
>
> #if defined(VERBOSE_ON) && defined(VERBOSE2_ON)
> #define DBG_PRINT2(...) fprintf(stdout, __VA_ARGS__)
> #else
> #define DBG_PRINT2(...)
> #endif
>
> #ifdef VERBOSE_ON
> #ifdef _WIN32_WCE
> #define STDOUT_FILE "\\Storage Card\\stdout.txt"
> #define STDERR_FILE "\\Storage Card\\stderr.txt"
> #endif
> #endif
>
29c51
< fprintf(stderr, "RuntimeException: %s\n", buffer); fflush(stderr);
---
> DBG_PRINT( "RuntimeException: %s\n", buffer);
86a109,116
>
> #ifdef VERBOSE_ON
> #ifdef _WIN32_WCE
> _wfreopen(TEXT(STDOUT_FILE),L"w",stdout);
> _wfreopen(TEXT(STDERR_FILE),L"w",stderr);
> #endif
> #endif
>
104d133
< _hasEGLSync = 0; // JAU
111c140
< printf("INVALIDATE\n"); fflush(stdout);
---
> DBG_PRINT("INVALIDATE\n");
140c169
< printf("event complete: cmd 0x%X, s:0x%X, component: %p - %s\n", (unsigned)nData1, (unsigned)nData2, hComponent, name);
---
> DBG_PRINT("event complete: cmd 0x%X, s:0x%X, component: %p - %s\n", (unsigned)nData1, (unsigned)nData2, hComponent, name);
144c173
< printf("\t state -> StateLoaded\n");
---
> DBG_PRINT("\t state -> StateLoaded\n");
151c180
< printf("\t flush\n");
---
> DBG_PRINT("\t flush\n");
159c188
< printf("event buffer EOS: component: %p - %s\n", hComponent, name);
---
> DBG_PRINT("event buffer EOS: component: %p - %s\n", hComponent, name);
162c191
< printf("\t end component - FIN\n");
---
> DBG_PRINT("\t end component - FIN\n");
171c200
< printf("event error: 0x%X IncorrectTransition, component: %p - %s\n", (unsigned int) nData1, hComponent, name);
---
> DBG_PRINT("event error: 0x%X IncorrectTransition, component: %p - %s\n", (unsigned int) nData1, hComponent, name);
177c206
< printf("event error: Same State 0x%X, component: %p - %s\n", (unsigned int) nData2, hComponent, name);
---
> DBG_PRINT("event error: Same State 0x%X, component: %p - %s\n", (unsigned int) nData2, hComponent, name);
181c210
< printf("event error: 0x%X, component: %p - %s\n", (unsigned int) nData1, hComponent, name);
---
> DBG_PRINT("event error: 0x%X, component: %p - %s\n", (unsigned int) nData1, hComponent, name);
214c243
< fprintf(stdout, "FillBufferDone avail %d\n", pOMXAV->available); fflush(stdout);
---
> DBG_PRINT("FillBufferDone avail %d\n", pOMXAV->available);
232c261
< fprintf(stdout, "WaitForState p1 c:%p s1:0x%X s2:0x%X\n", hComponent, eTestState, eTestState2); fflush(stdout); // JAU
---
> DBG_PRINT( "WaitForState p1 c:%p s1:0x%X s2:0x%X\n", hComponent, eTestState, eTestState2);
234c263
< fprintf(stdout, "WaitForState p2 s:0x%X e:0x%X\n", eState, eError); fflush(stdout); // JAU
---
> DBG_PRINT( "WaitForState p2 s:0x%X e:0x%X\n", eState, eError);
245c274
< fprintf(stdout, "WaitForState p3 s:0x%X e:0x%X\n", eState, eError); fflush(stdout); // JAU
---
> DBG_PRINT( "WaitForState p3 s:0x%X e:0x%X\n", eState, eError);
320c349
< fprintf(stdout, "OMXToolBasicAV_WaitForState %p s:%d\n", pOMXAV, state); fflush(stdout); // JAU
---
> DBG_PRINT( "OMXToolBasicAV_WaitForState %p s:%d\n", pOMXAV, state);
322c351
< fprintf(stdout, "OMXToolBasicAV_WaitForState p1\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "OMXToolBasicAV_WaitForState p1\n");
328c357
< fprintf(stdout, "OMXToolBasicAV_WaitForState p4 %d c:%p\n", i, pOMXAV->comp[i]); fflush(stdout); // JAU
---
> DBG_PRINT( "OMXToolBasicAV_WaitForState p4 %d c:%p\n", i, pOMXAV->comp[i]);
332c361
< fprintf(stdout, "OMXToolBasicAV_WaitForState Failed (Wait) %d c:%p - %s, s:0x%X\n",
---
> DBG_PRINT( "OMXToolBasicAV_WaitForState Failed (Wait) %d c:%p - %s, s:0x%X\n",
334d362
< fflush(stdout); // JAU
348,349c376,377
< fprintf(stdout, "RequestState p2 c:%p, e:0x%X, s:0x%X\n",
< hComponent, eError, eState); fflush(stdout); // JAU
---
> DBG_PRINT( "RequestState p2 c:%p, e:0x%X, s:0x%X\n",
> hComponent, eError, eState);
353,354c381,382
< fprintf(stdout, "RequestState p3 c:%p e:0x%X s: 0x%X -> 0x%X\n",
< hComponent, eError, eState, state); fflush(stdout); // JAU
---
> DBG_PRINT( "RequestState p3 c:%p e:0x%X s: 0x%X -> 0x%X\n",
> hComponent, eError, eState, state);
367c395
< fprintf(stdout, "OMXToolBasicAV_RequestState %p s:%d, w:%d\n", pOMXAV, state, wait); fflush(stdout); // JAU
---
> DBG_PRINT( "OMXToolBasicAV_RequestState %p s:%d, w:%d\n", pOMXAV, state, wait);
369c397
< fprintf(stdout, "OMXToolBasicAV_RequestState p1\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "OMXToolBasicAV_RequestState p1\n");
420c448
< fprintf(stderr, "Destroy p1\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p1\n");
423c451
< fprintf(stderr, "Destroy p2\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p2\n");
429c457
< fprintf(stderr, "Destroy p3\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p3\n");
432c460
< fprintf(stderr, "Destroy p3\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p3\n");
435c463
< fprintf(stderr, "Destroy p4\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p4\n");
443c471
< fprintf(stderr, "Destroy p5\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p5\n");
452c480
< fprintf(stderr, "Destroy p6\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p6\n");
457c485
< fprintf(stderr, "Destroy p7\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p7\n");
459c487
< fprintf(stderr, "Destroy p8\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy p8\n");
464c492
< fprintf(stderr, "Destroy DONE\n"); fflush(stderr);
---
> DBG_PRINT( "Destroy DONE\n");
592c620
< fprintf(stdout, "Play 3.2\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 3.2\n");
705c733
< fprintf(stdout, "Attach VR %p c:%p\n", pOMXAV, pOMXAV->comp[OMXAV_H_VSCHEDULER]); fflush(stdout); // JAU
---
> DBG_PRINT( "Attach VR %p c:%p\n", pOMXAV, pOMXAV->comp[OMXAV_H_VSCHEDULER]);
708c736
< fprintf(stdout, "UseEGLImg port enable/tunneling %p\n", pOMXAV);
---
> DBG_PRINT( "UseEGLImg port enable/tunneling %p\n", pOMXAV);
721c749
< fprintf(stdout, "UseEGLImg %p #%d t:%d i:%p s:%p p1\n", pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync); fflush(stdout); // JAU
---
> DBG_PRINT( "UseEGLImg %p #%d t:%d i:%p s:%p p1\n", pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync);
735,736c763,764
< fprintf(stdout, "UseEGLImg %p #%d t:%d i:%p s:%p b:%p - p2\n",
< pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync, pBuf->omxBufferHeader); fflush(stdout); // JAU
---
> DBG_PRINT( "UseEGLImg %p #%d t:%d i:%p s:%p b:%p - p2\n",
> pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync, pBuf->omxBufferHeader);
739c767
< fprintf(stdout, "UseEGLImg %p #%d DONE\n", pOMXAV, i); fflush(stdout); // JAU
---
> DBG_PRINT( "UseEGLImg %p #%d DONE\n", pOMXAV, i);
752c780
< fprintf(stderr, "DetachVideoRenderer p0\n"); fflush(stderr);
---
> DBG_PRINT( "DetachVideoRenderer p0\n");
754c782
< fprintf(stderr, "DetachVideoRenderer DONE (already state loaded)\n"); fflush(stderr);
---
> DBG_PRINT( "DetachVideoRenderer DONE (already state loaded)\n");
759c787
< fprintf(stderr, "DetachVideoRenderer p1\n"); fflush(stderr);
---
> DBG_PRINT( "DetachVideoRenderer p1\n");
764c792
< fprintf(stderr, "DetachVideoRenderer p2\n"); fflush(stderr);
---
> DBG_PRINT( "DetachVideoRenderer p2\n");
780c808
< fprintf(stderr, "DetachVideoRenderer p3\n"); fflush(stderr);
---
> DBG_PRINT( "DetachVideoRenderer p3\n");
784c812
< fprintf(stderr, "DetachVideoRenderer DONE\n"); fflush(stderr);
---
> DBG_PRINT( "DetachVideoRenderer DONE\n");
795c823
< fprintf(stderr, "buffer number %d > MAX(%d)\n", vBufferNum, EGLIMAGE_MAX_BUFFERS);
---
> DBG_PRINT( "buffer number %d > MAX(%d)\n", vBufferNum, EGLIMAGE_MAX_BUFFERS);
800c828
< fprintf(stderr, "Init struct failed!\n");
---
> DBG_PRINT( "Init struct failed!\n");
830c858
< fprintf(stdout, "SetStream 1 %s ..\n", stream); fflush(stdout); // JAU
---
> DBG_PRINT( "SetStream 1 %s ..\n", stream);
840c868
< fprintf(stdout, "SetStream 3\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "SetStream 3\n");
852c880
< fprintf(stdout, "SetStream 4\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "SetStream 4\n");
905c933
< fprintf(stdout, "SetStream 5 ; audioPort %d, videoPort %d\n", pOMXAV->audioPort, pOMXAV->videoPort); fflush(stdout); // JAU
---
> DBG_PRINT( "SetStream 5 ; audioPort %d, videoPort %d\n", pOMXAV->audioPort, pOMXAV->videoPort);
909c937
< fprintf(stdout, "Configuring comp[OMXAV_H_CLOCK]\n");
---
> DBG_PRINT( "Configuring comp[OMXAV_H_CLOCK]\n");
925c953
< fprintf(stdout, "SetStream X\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "SetStream X\n");
941c969
< fprintf(stdout, "SetEGLImg %p #%d/%d t:%d i:%p s:%p..\n", pOMXAV, i, pOMXAV->vBufferNum, tex, image, sync); fflush(stdout); // JAU
---
> DBG_PRINT( "SetEGLImg %p #%d/%d t:%d i:%p s:%p..\n", pOMXAV, i, pOMXAV->vBufferNum, tex, image, sync);
961c989
< fprintf(stdout, "ActivateInstance 1\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "ActivateInstance 1\n");
1000c1028
< fprintf(stdout, "Setup tunneling\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Setup tunneling\n");
1005c1033
< fprintf(stdout, "Setup tunneling audio\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Setup tunneling audio\n");
1012c1040
< fprintf(stdout, "Setup tunneling video\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Setup tunneling video\n");
1017c1045
< fprintf(stdout, "ActivateInstance .. %p\n", pOMXAV); fflush(stdout);
---
> DBG_PRINT( "ActivateInstance .. %p\n", pOMXAV);
1031c1059
< fprintf(stdout, "ActivateInstance done %p\n", pOMXAV); fflush(stdout);
---
> DBG_PRINT( "ActivateInstance done %p\n", pOMXAV);
1090c1118
< fprintf(stderr, "Err: Play invalid"); fflush(stderr);
---
> fprintf(stderr, "Err: Play invalid");
1097c1125
< fprintf(stdout, "Play 1\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 1\n");
1099c1127
< fprintf(stdout, "Play 2\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 2\n");
1109c1137
< fprintf(stdout, "Play 3.0\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 3.0\n");
1112c1140
< fprintf(stdout, "Play 3.1\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 3.1\n");
1119c1147
< fprintf(stdout, "Play 3.2\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 3.2\n");
1125c1153
< fprintf(stdout, "Play 3.3\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 3.3\n");
1127c1155
< fprintf(stdout, "Play 4.0\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play 4.0\n");
1131c1159
< fprintf(stdout, "Play DONE\n"); fflush(stdout); // JAU
---
> DBG_PRINT( "Play DONE\n");
1299,1300c1327,1328
< // fprintf(stdout, "GetTexture A avail %d, filled %d, pos o:%d g:%d\n",
< // pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos); fflush(stdout);
---
> DBG_PRINT2("GetTexture A avail %d, filled %d, pos o:%d g:%d\n",
> pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos);
1310c1338
< // fprintf(stdout, "GetTexture p2.1 attr 0x%X\n", attr); fflush(stdout);
---
> DBG_PRINT2( "GetTexture p2.1 attr 0x%X\n", attr);
1314c1342
< // fprintf(stdout, "GetTexture p2.2\n", attr); fflush(stdout);
---
> DBG_PRINT2( "GetTexture p2.2\n");
1321c1349
< // fprintf(stdout, "GetTexture p2.3\n", attr); fflush(stdout);
---
> DBG_PRINT2( "GetTexture p2.3\n");
1328c1356
< // fprintf(stdout, "GetTexture p3.1\n"); fflush(stdout);
---
> DBG_PRINT2("GetTexture p3.1\n");
1338c1366
< // fprintf(stdout, "GetTexture p3.2\n"); fflush(stdout);
---
> DBG_PRINT2( "GetTexture p3.2\n");
1347,1348c1375,1376
< // fprintf(stdout, "GetTexture B avail %d, filled %d, pos o:%d g:%d t:%d\n",
< // pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos, texID); fflush(stdout);
---
> DBG_PRINT2( "GetTexture B avail %d, filled %d, pos o:%d g:%d t:%d\n",
> pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos, texID);
1368,1372d1395
< #ifdef _WIN32_WCE
< #define STDOUT_FILE "\\Storage Card\\stdout.txt"
< #define STDERR_FILE "\\Storage Card\\stderr.txt"
< #endif
<
1427,1431d1449
< #ifdef _WIN32_WCE
< _wfreopen(TEXT(STDOUT_FILE),L"w",stdout);
< _wfreopen(TEXT(STDERR_FILE),L"w",stderr);
< #endif
<
1538c1556
< printf("7\n"); fflush(stdout);
---
> printf("7\n");
1543c1561
< printf("8\n"); fflush(stdout);
---
> printf("8\n");
1548c1566
< printf("8.2\n"); fflush(stdout);
---
> printf("8.2\n");
1557c1575
< printf("Sleep %d\n", i); fflush(stdout);
---
> printf("Sleep %d\n", i);
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1811 232f8b59-042b-4e1e-8c03-345bb8c30851
|
