@@ -302,15 +302,10 @@ private void draw(boolean forced) {
302302
303303 @ Override
304304 public void addMediaCodecSurface (Surface surface ) {
305- ExecutorService executor = this .executor ;
306- if (executor == null ) return ;
307- ExtensionsKt .secureSubmit (executor , () -> {
308- if (surfaceManager .isReady ()) {
309- surfaceManagerEncoder .release ();
310- surfaceManagerEncoder .eglSetup (surface , surfaceManager );
311- }
312- return null ;
313- });
305+ if (surfaceManager .isReady ()) {
306+ surfaceManagerEncoder .release ();
307+ surfaceManagerEncoder .eglSetup (surface , surfaceManager );
308+ }
314309 }
315310
316311 @ Override
@@ -321,41 +316,31 @@ public void removeMediaCodecSurface() {
321316
322317 @ Override
323318 public void addMediaCodecRecordSurface (Surface surface ) {
324- ExecutorService executor = this .executor ;
325- if (executor == null ) return ;
326- ExtensionsKt .secureSubmit (executor , () -> {
327- if (surfaceManager .isReady ()) {
328- surfaceManagerEncoderRecord .release ();
329- surfaceManagerEncoderRecord .eglSetup (surface , surfaceManager );
330- }
331- return null ;
332- });
319+ if (surfaceManager .isReady ()) {
320+ surfaceManagerEncoderRecord .release ();
321+ surfaceManagerEncoderRecord .eglSetup (surface , surfaceManager );
322+ }
333323 }
334324
335325 @ Override
336326 public void removeMediaCodecRecordSurface () {
337327 threadQueue .clear ();
338- ExecutorService executor = this .executor ;
339- if (executor == null ) return ;
340- ExtensionsKt .secureSubmit (executor , () -> {
341- surfaceManagerEncoderRecord .release ();
342- return null ;
343- });
328+ surfaceManagerEncoderRecord .release ();
344329 }
345330
346331 @ Override
347332 public void start () {
348333 threadQueue .clear ();
349334 executor = ExtensionsKt .newSingleThreadExecutor (threadQueue );
335+ surfaceManager .release ();
336+ surfaceManager .eglSetup (getHolder ().getSurface ());
337+ surfaceManagerPhoto .release ();
338+ surfaceManagerPhoto .eglSetup (encoderWidth , encoderHeight , surfaceManager );
339+ running .set (true );
350340 ExecutorService executor = this .executor ;
351341 ExtensionsKt .secureSubmit (executor , () -> {
352- surfaceManager .release ();
353- surfaceManager .eglSetup (getHolder ().getSurface ());
354342 surfaceManager .makeCurrent ();
355343 mainRender .initGl (getContext (), encoderWidth , encoderHeight , encoderWidth , encoderHeight );
356- surfaceManagerPhoto .release ();
357- surfaceManagerPhoto .eglSetup (encoderWidth , encoderHeight , surfaceManager );
358- running .set (true );
359344 mainRender .getSurfaceTexture ().setOnFrameAvailableListener (this );
360345 forceRenderer .start (() -> {
361346 ExecutorService ex = this .executor ;
@@ -388,7 +373,6 @@ public void stop() {
388373 surfaceManagerEncoderRecord .release ();
389374 surfaceManager .release ();
390375 mainRender .release ();
391-
392376 }
393377
394378 @ Override
0 commit comments