Changeset e3c6886780a9759aaabea7c138a3fc49fd040628

Timestamp:

25/04/04 18:35:39 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1082910939 +0000

git-parent:

[a6d67949e98b25f010d0fff2c318f07eb544466f]

git-author:

Gildas Bazin <gbazin@videolan.org> 1082910939 +0000

Message:

* modules/stream_out/transcode.c:

+ new options to allow forcing an encoder and passing options to it.

(aenc=foo{optionbar=bar,etc...},venc=foo{optionbar=bar,etc...} where foo is the encoder plugin name).

+ got rid of aopts/vopts which is not needed anymore ;)

Files:

• modules/stream_out/transcode.c (modified) (18 diffs)

modules/stream_out/transcode.c

@@ -49 +49 @@
- * Module descriptor
- *****************************************************************************/
+#define VENC_TEXT N_("Video encoder")
+#define VENC_LONGTEXT N_( \
+    "Allows you to specify the video encoder to use and its associated " \
+    "options." )
-#define VCODEC_TEXT N_("Destination video codec")
-#define VCODEC_LONGTEXT N_( \
-pecify the destination video codec used for the streaming "
-
+specify the destination video codec used for the " 
+streaming 
-#define VB_TEXT N_("Video bitrate")
-#define VB_LONGTEXT N_( \
@@ -83 +87 @@
-    "Allows you to specify the right coordinate for the video cropping." )
-
+#define AENC_TEXT N_("Audio encoder")
+#define AENC_LONGTEXT N_( \
+    "Allows you to specify the audio encoder to use and its associated " \
+    "options." )
-#define ACODEC_TEXT N_("Destination audio codec")
-#define ACODEC_LONGTEXT N_( \
@@ -115 +123 @@
-    set_callbacks( Open, Close );
-
+    add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
+                VENC_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
-                VCODEC_LONGTEXT, VLC_FALSE );
@@ -137 +147 @@
-                 CROPRIGHT_LONGTEXT, VLC_TRUE );
-
+    add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
+                AENC_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
-                ACODEC_LONGTEXT, VLC_FALSE );
@@ -150 +162 @@
-vlc_module_end();
-
+static const char *ppsz_sout_options[] = {
+    "venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
+    "scale", "width", "height", "deinterlace", "threads",
+    "aenc", "acodec", "ab", "samplerate", "channels", NULL
+};
+
-/*****************************************************************************
- * Exported prototypes
@@ -180 +198 @@
-};
-
-static const char *ppsz_sout_options[] = {
-    "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
-    "scale", "width", "height", "deinterlace", "threads",
-    "acodec", "ab", "samplerate", "channels", NULL
-};
-
-#define PICTURE_RING_SIZE 64
-
@@ -201 +213 @@
-
-    vlc_fourcc_t    i_acodec;   /* codec audio (0 if not transcode) */
+    char            *psz_aenc;
-    sout_cfg_t      *p_audio_cfg;
-    int             i_sample_rate;
@@ -207 +220 @@
-
-    vlc_fourcc_t    i_vcodec;   /*    "   video  " "   "      " */
+    char            *psz_venc;
-    sout_cfg_t      *p_video_cfg;
-    int             i_vbitrate;
@@ -235 +249 @@
-    sout_stream_sys_t *p_sys;
-    vlc_value_t       val;
-    char              *psz_opts;
-
-    p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
@@ -250 +263 @@
-    p_sys->i_output_pts = 0;
-
-    psz_opts = sout_cfg_find_value( p_stream->p_cfg, "aopts" );
-    p_sys->p_audio_cfg = NULL;
-    if( psz_opts && *psz_opts )
-    {
-        char *psz_name, *psz_next, *psz_tmp;
-        asprintf( &psz_tmp, "aopts%s", psz_opts );
-        psz_next = sout_cfg_parser( &psz_name, &p_sys->p_audio_cfg, psz_tmp );
-        if( psz_next ) free( psz_next );
-        free( psz_tmp );
-    }
-
-    psz_opts = sout_cfg_find_value( p_stream->p_cfg, "vopts" );
-    p_sys->p_video_cfg = NULL;
-    if( psz_opts && *psz_opts )
-    {
-        char *psz_name, *psz_next, *psz_tmp;
-        asprintf( &psz_tmp, "vopts%s", psz_opts );
-        psz_next = sout_cfg_parser( &psz_name, &p_sys->p_video_cfg, psz_tmp );
-        if( psz_next ) free( psz_next );
-        free( psz_tmp );
-    }
-
-    sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
-                   p_stream->p_cfg );
-
-    /* Audio transcoding parameters */
+    var_Get( p_stream, SOUT_CFG_PREFIX "aenc", &val );
+    p_sys->psz_aenc = NULL;
+    p_sys->p_audio_cfg = NULL;
+    if( val.psz_string && *val.psz_string )
+    {
+        char *psz_next;
+        psz_next = sout_cfg_parser( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
+                    val.psz_string );
+        if( psz_next ) free( psz_next );
+    }
+    if( val.psz_string ) free( val.psz_string );
+
-    var_Get( p_stream, SOUT_CFG_PREFIX "acodec", &val );
-    p_sys->i_acodec = 0;
@@ -304 +307 @@
-
-    /* Video transcoding parameters */
+    var_Get( p_stream, SOUT_CFG_PREFIX "venc", &val );
+    p_sys->psz_venc = NULL;
+    p_sys->p_video_cfg = NULL;
+    if( val.psz_string && *val.psz_string )
+    {
+        char *psz_next;
+        psz_next = sout_cfg_parser( &p_sys->psz_venc, &p_sys->p_video_cfg,
+                    val.psz_string );
+        if( psz_next ) free( psz_next );
+    }
+    if( val.psz_string ) free( val.psz_string );
+
-    var_Get( p_stream, SOUT_CFG_PREFIX "vcodec", &val );
-    p_sys->i_vcodec = 0;
@@ -382 +397 @@
-        p_sys->p_audio_cfg = p_next;
-    }
+    if( p_sys->psz_aenc ) free( p_sys->psz_aenc );
-
-    while( p_sys->p_video_cfg != NULL )
@@ -395 +411 @@
-        p_sys->p_video_cfg = p_next;
-    }
+    if( p_sys->psz_venc ) free( p_sys->psz_venc );
-
-    vlc_object_destroy( p_sys );
@@ -521 +538 @@
-    else
-    {
-
+
+
-        id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
-        id->b_transcode = VLC_FALSE;
@@ -800 +818 @@
-
-    /* Sanity check for audio channels */
-
+
+
-
-    /* find encoder */
@@ -824 +843 @@
-
-    id->p_encoder->p_module =
-
+
+
-    if( !id->p_encoder->p_module )
-    {
+        vlc_object_detach( id->p_encoder );
-        vlc_object_destroy( id->p_encoder );
-        msg_Err( p_stream, "cannot open encoder" );
@@ -1293 +1314 @@
-
-    id->p_encoder->p_module =
-NULL, 0
+p_sys->psz_venc, VLC_TRUE
-
-    if( !id->p_encoder->p_module )
-    {
+        vlc_object_detach( id->p_encoder );
-        vlc_object_destroy( id->p_encoder );
-        msg_Err( p_stream, "cannot find encoder" );
@@ -1497 +1519 @@
-
-            id->p_encoder->p_module =
-
+
+
-            if( !id->p_encoder->p_module )
-            {