codec: remove pf_encode callbacks and wrapper

They are now completely unused.

include/vlc_codec.h

@@ -264,10 +264,6 @@ struct encoder_t
     /* Properties of the output of the encoder */
     es_format_t         fmt_out;
 
-    block_t *           ( * pf_encode_video )( encoder_t *, picture_t * );
-    block_t *           ( * pf_encode_audio )( encoder_t *, block_t * );
-    block_t *           ( * pf_encode_sub )( encoder_t *, subpicture_t * );
-
     /* Common encoder options */
     int i_threads;               /* Number of threads to use during encoding */
     int i_iframes;               /* One I frame per i_iframes */

modules/stream_out/transcode/encoder/audio.c

@@ -56,9 +56,6 @@ static const int pi_channels_maps[9] =
      | AOUT_CHAN_LFE,
 };
 
-static block_t *WrappedEncodeAudio( encoder_t *encoder, block_t *audio )
-    { return encoder->pf_encode_audio(encoder, audio); }
-
 int transcode_encoder_audio_open( transcode_encoder_t *p_enc,
                                   const transcode_encoder_config_t *p_cfg )
 {
@@ -66,20 +63,14 @@ int transcode_encoder_audio_open( transcode_encoder_t *p_enc,
     p_enc->p_encoder->fmt_out.i_codec = p_cfg->i_codec;
     p_enc->p_encoder->ops = NULL;
 
-    static const struct vlc_encoder_operations wrapped_ops =
-    {
-        .encode_audio = WrappedEncodeAudio,
-    };
-
     p_enc->p_encoder->p_module = module_need( p_enc->p_encoder, "audio encoder",
                                               p_cfg->psz_name, true );
 
     if( p_enc->p_encoder->p_module )
     {
+        assert( p_enc->p_encoder->ops != NULL );
         p_enc->p_encoder->fmt_out.i_codec =
                 vlc_fourcc_GetCodec( AUDIO_ES, p_enc->p_encoder->fmt_out.i_codec );
-        if (p_enc->p_encoder->ops == NULL)
-            p_enc->p_encoder->ops = &wrapped_ops;
     }
 
     return ( p_enc->p_encoder->p_module ) ? VLC_SUCCESS: VLC_EGENERIC;

modules/stream_out/transcode/encoder/spu.c

@@ -35,9 +35,6 @@
 #include "encoder.h"
 #include "encoder_priv.h"
 
-static block_t *WrappedEncodeSub( encoder_t *encoder, subpicture_t *spu )
-    { return encoder->pf_encode_sub(encoder, spu); }
-
 int transcode_encoder_spu_open( transcode_encoder_t *p_enc,
                                 const transcode_encoder_config_t *p_cfg )
 {
@@ -45,19 +42,11 @@ int transcode_encoder_spu_open( transcode_encoder_t *p_enc,
     p_enc->p_encoder->ops = NULL;
     p_enc->p_encoder->fmt_out.i_codec = p_cfg->i_codec;
 
-    static const struct vlc_encoder_operations wrapped_ops =
-    {
-        .encode_sub = WrappedEncodeSub,
-    };
-
     p_enc->p_encoder->p_module = module_need( p_enc->p_encoder, "spu encoder",
                                               p_cfg->psz_name, true );
 
-    if (p_enc->p_encoder->p_module != NULL &&
-        p_enc->p_encoder->ops == NULL)
-    {
-        p_enc->p_encoder->ops = &wrapped_ops;
-    }
+    assert( p_enc->p_encoder->p_module == NULL ||
+            p_enc->p_encoder->ops != NULL);
 
     return ( p_enc->p_encoder->p_module ) ? VLC_SUCCESS: VLC_EGENERIC;
 }

modules/stream_out/transcode/encoder/video.c

@@ -447,9 +447,6 @@ void transcode_encoder_video_close( transcode_encoder_t *p_enc )
     p_enc->p_encoder->p_module = NULL;
 }
 
-static block_t *WrappedEncodeVideo(encoder_t *encoder, picture_t *pic)
-    { return encoder->pf_encode_video(encoder, pic); }
-
 int transcode_encoder_video_open( transcode_encoder_t *p_enc,
                                    const transcode_encoder_config_t *p_cfg )
 {
@@ -462,13 +459,7 @@ int transcode_encoder_video_open( transcode_encoder_t *p_enc,
     if( !p_enc->p_encoder->p_module )
         return VLC_EGENERIC;
 
-    static const struct vlc_encoder_operations wrapped_ops =
-    {
-        .encode_video = WrappedEncodeVideo,
-    };
-
-    if (p_enc->p_encoder->ops == NULL)
-        p_enc->p_encoder->ops = &wrapped_ops;
+    assert( p_enc->p_encoder->ops != NULL );
 
     p_enc->p_encoder->fmt_in.video.i_chroma = p_enc->p_encoder->fmt_in.i_codec;
 

src/misc/image.c

@@ -704,9 +704,6 @@ static decoder_t *CreateDecoder( image_handler_t *p_image, const es_format_t *fm
     return p_dec;
 }
 
-static block_t *WrapperEncodeVideo( encoder_t *enc, picture_t *pic )
-    { return enc->pf_encode_video(enc, pic); }
-
 
 static encoder_t *CreateEncoder( vlc_object_t *p_this, const video_format_t *fmt_in,
                                  const video_format_t *fmt_out )
@@ -756,16 +753,9 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, const video_format_t *fmt
         vlc_encoder_Destroy( p_enc );
         return NULL;
     }
+    assert( p_enc->ops != NULL );
     p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec;
 
-    static const struct vlc_encoder_operations wrapper_ops =
-    {
-        .encode_video = WrapperEncodeVideo,
-    };
-
-    if (p_enc->ops == NULL)
-        p_enc->ops = &wrapper_ops;
-
     return p_enc;
 }