sout_EncoderCreate: create an encoder module

Perhaps we should turn it into ...New() and do more than just allocate
the object.

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index d441a06e9f8cd5a4d74a52d74eec75f0b6420963..f74fe9fd95f4301799af07bf687eec97b9a6923d 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -238,6 +238,13 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo
     return s->pf_send( s, id, b );
 }
 
+/****************************************************************************
+ * Encoder
+ ****************************************************************************/
+
+VLC_EXPORT( encoder_t *, sout_EncoderCreate, ( vlc_object_t *obj ) );
+#define sout_EncoderCreate(o) sout_EncoderCreate(VLC_OBJECT(o))
+
 /****************************************************************************
  * Announce handler
  ****************************************************************************/

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 90dc2819360ee7d4736218e0c0ba88069d5696e0..276e0d5e56468079fc70707537d20270ddf08368 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -711,7 +711,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     id->p_decoder->b_pace_control = true;
 
     /* Create encoder object */
-    id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+    id->p_encoder = sout_EncoderCreate( p_stream );
     if( !id->p_encoder )
         goto error;
     vlc_object_attach( id->p_encoder, p_stream );

diff --git a/src/misc/image.c b/src/misc/image.c
index acee3b8ce3593e6e9670b98c88b094450b4cdff5..2b45d25c32af5f4885f1eebe923092e83ad8eed5 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -45,6 +45,7 @@
 #include <vlc_image.h>
 #include <vlc_stream.h>
 #include <vlc_charset.h>
+#include <vlc_sout.h>
 #include <libvlc.h>
 
 static picture_t *ImageRead( image_handler_t *, block_t *,
@@ -656,7 +657,7 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in,
 {
     encoder_t *p_enc;
 
-    p_enc = vlc_object_create( p_this, VLC_OBJECT_ENCODER );
+    p_enc = sout_EncoderCreate( p_this );
     if( p_enc == NULL )
         return NULL;
 

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 3f81d264381c05b4c2f66d0970329169076508ab..5777fbd44c8ca4be9013bcdfa269fde28f5f8eb5 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -43,6 +43,7 @@
 
 #include <vlc_meta.h>
 #include <vlc_block.h>
+#include <vlc_codec.h>
 
 #include "input/input_interface.h"
 
@@ -874,3 +875,11 @@ rtp:
     mrl_Clean( &mrl );
     return psz_chain;
 }
+
+#undef sout_EncoderCreate
+encoder_t *sout_EncoderCreate( vlc_object_t *p_this )
+{
+    static const char type[] = "encoder";
+    return vlc_custom_create( p_this, sizeof( encoder_t ), VLC_OBJECT_GENERIC,
+                              type );
+}