modules/stream_out/transcode/audio.c

@@ -201,7 +201,6 @@ int transcode_audio_init( sout_stream_t *p_stream, const es_format_t *p_fmt,
 void transcode_audio_clean( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     /* Close encoder */
-    transcode_encoder_close( id->encoder );
     transcode_encoder_delete( id->encoder );
 
     es_format_Clean( &id->decoder_out );

modules/stream_out/transcode/encoder/encoder.c

@@ -48,6 +48,7 @@ void transcode_encoder_delete( transcode_encoder_t *p_enc )
     {
         if( p_enc->p_encoder->fmt_in.i_cat == VIDEO_ES )
         {
+            transcode_encoder_video_stop( p_enc );
             block_ChainRelease( p_enc->p_buffers );
             picture_fifo_Delete( p_enc->pp_pics );
         }
@@ -182,16 +183,17 @@ void transcode_encoder_close( transcode_encoder_t *p_enc )
     if( !p_enc->p_encoder->p_module )
         return;
 
-    switch( p_enc->p_encoder->fmt_in.i_cat )
+    if( p_enc->p_encoder->fmt_in.i_cat == VIDEO_ES )
+        transcode_encoder_video_stop( p_enc );
+
+    if( p_enc->p_encoder->ops != NULL && p_enc->p_encoder->ops->close != NULL )
     {
-        case VIDEO_ES:
-            transcode_encoder_video_close( p_enc );
-            break;
-        default:
-            module_unneed( p_enc->p_encoder, p_enc->p_encoder->p_module );
-            break;
+        p_enc->p_encoder->ops->close( p_enc->p_encoder );
+        p_enc->p_encoder->ops = NULL;
     }
 
+    module_unneed( p_enc->p_encoder, p_enc->p_encoder->p_module );
+
     p_enc->p_encoder->p_module = NULL;
 }
 

modules/stream_out/transcode/encoder/encoder_priv.h

@@ -40,7 +40,7 @@ int transcode_encoder_video_open( transcode_encoder_t *p_enc,
 int transcode_encoder_spu_open( transcode_encoder_t *p_enc,
                                 const transcode_encoder_config_t *p_cfg );
 
-void transcode_encoder_video_close( transcode_encoder_t *p_enc );
+void transcode_encoder_video_stop( transcode_encoder_t *p_enc );
 
 block_t * transcode_encoder_video_encode( transcode_encoder_t *p_enc, picture_t *p_pic );
 block_t * transcode_encoder_audio_encode( transcode_encoder_t *p_enc, block_t *p_block );

modules/stream_out/transcode/encoder/video.c

@@ -375,7 +375,7 @@ int transcode_encoder_video_drain( transcode_encoder_t *p_enc, block_t **out )
     return VLC_SUCCESS;
 }
 
-void transcode_encoder_video_close( transcode_encoder_t *p_enc )
+void transcode_encoder_video_stop( transcode_encoder_t *p_enc )
 {
     if( p_enc->b_threaded && !p_enc->b_abort )
     {
@@ -385,10 +385,6 @@ void transcode_encoder_video_close( transcode_encoder_t *p_enc )
         vlc_mutex_unlock( &p_enc->lock_out );
         vlc_join( p_enc->thread, NULL );
     }
-
-    /* Close encoder */
-    module_unneed( p_enc->p_encoder, p_enc->p_encoder->p_module );
-    p_enc->p_encoder->p_module = NULL;
 }
 
 int transcode_encoder_video_open( transcode_encoder_t *p_enc,

modules/stream_out/transcode/spu.c

@@ -141,7 +141,6 @@ int transcode_spu_init( sout_stream_t *p_stream, const es_format_t *p_fmt,
         {
             msg_Err( p_stream, "cannot output transcoded stream %4.4s",
                                (char *) &id->p_enccfg->i_codec );
-            transcode_encoder_close( id->encoder );
             transcode_encoder_delete( id->encoder );
             module_unneed( id->p_decoder, id->p_decoder->p_module );
             id->p_decoder->p_module = NULL;
@@ -162,10 +161,7 @@ void transcode_spu_clean( sout_stream_t *p_stream, sout_stream_id_sys_t *id)
 
     /* Close encoder */
     if( id->encoder )
-    {
-        transcode_encoder_close( id->encoder );
         transcode_encoder_delete( id->encoder );
-    }
 }
 
 int transcode_spu_process( sout_stream_t *p_stream,

modules/stream_out/transcode/video.c

@@ -398,10 +398,7 @@ void transcode_video_clean( sout_stream_id_sys_t *id )
 {
     /* Close encoder, but only if one was opened. */
     if ( id->encoder )
-    {
-        transcode_encoder_close( id->encoder );
         transcode_encoder_delete( id->encoder );
-    }
 
     es_format_Clean( &id->decoder_out );