Changeset fc16feb13f52733cfe8c1b1219b519158a4c19c3

Timestamp:

10/02/07 19:26:35 (11 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1191345995 +0000

git-parent:

[e3e9c13799fc03656fe36f9646b77030aff2626c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1191345995 +0000

Message:

• Heavily simplify the MPJPEG mux (closes #1188); please test.
  
• Remove configurable boundary that had never been working anyway (did not match the original value from MUX_GET_MIME)
  

Files:

• modules/mux/mpjpeg.c (modified) (9 diffs)

modules/mux/mpjpeg.c

@@ -31 +31 @@
-#include <vlc_codecs.h>
-
-#define SEPARATOR_TEXT N_( "Multipart separator string" )
-#define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \
-                               "specific string to separate its content " \
-                               "pieces. You can select this string. " \
-                               "Default is --myboundary" )
-
-
-#define CONTENT_TYPE "Content-Type: image/jpeg"
-/*****************************************************************************
- * Module descriptor
@@ -51 +43 @@
-    set_description( _("Multipart JPEG muxer") );
-    set_capability( "sout mux", 5 );
-
-
+
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
@@ -62 +53 @@
- * Exported prototypes
- *****************************************************************************/
-static const char *ppsz_sout_options[] = { "separator", NULL };
-
-static int Control  ( sout_mux_t *, int, va_list );
-static int AddStream( sout_mux_t *, sout_input_t * );
@@ -69 +58 @@
-static int Mux      ( sout_mux_t * );
-
-
-
-
-
-
+
+
-
-/*****************************************************************************
@@ -81 +67 @@
-{
-    sout_mux_t *p_mux = (sout_mux_t*)p_this;
-    sout_mux_sys_t  *p_sys;
-    char *psz_separator_block, *psz_separator;
-
-    msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
-    psz_separator = var_GetNonEmptyString( p_mux, SOUT_CFG_PREFIX"separator" );
-    if( psz_separator == NULL )
-    {
-        msg_Err( p_this, "missing required multipart separator" );
-        return VLC_EGENERIC;
-    }
-
-    config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options,
-                       p_mux->p_cfg );
-
-    p_sys = p_mux->p_sys = malloc( sizeof(sout_mux_sys_t) );
-    if( p_sys == NULL )
-        return VLC_ENOMEM;
-    p_sys->b_send_headers = VLC_TRUE;
-
-    if( asprintf( &psz_separator_block, "\r\n%s\r\n%s\r\n", psz_separator,
-                  CONTENT_TYPE ) == -1 )
-        psz_separator_block = NULL;
-    free( psz_separator_block );
-
-    if( psz_separator_block == NULL )
-    {
-        free( p_sys );
-        return VLC_ENOMEM;
-    }
-
-    p_sys->p_separator = block_New( p_mux, strlen( psz_separator_block ) );
-    strcpy( (char *)p_sys->p_separator->p_buffer, psz_separator_block );
-
-    p_mux->pf_control   = Control;
@@ -118 +74 @@
-    p_mux->pf_delstream = DelStream;
-    p_mux->pf_mux       = Mux;
+    p_mux->p_sys        = NULL;
-
-    return VLC_SUCCESS;
@@ -128 +85 @@
-static void Close( vlc_object_t * p_this )
-{
-
-
-
-
-
-
+
+
+
-}
-
@@ -155 +109 @@
-       case MUX_GET_MIME:
-           ppsz = (char**)va_arg( args, char ** );
-This Random String"
+"BOUNDARY
-           return VLC_SUCCESS;
-
@@ -195 +149 @@
-{
-    block_fifo_t *p_fifo;
-    sout_mux_sys_t *p_sys = p_mux->p_sys;
-    int i_count;
-    /* Content-Length:.......\r\n */
-    char psz_content_length[25];
-
-    if( p_sys->b_send_headers )
-    {
-        block_t *p_header;
-        char *psz_separator = var_CreateGetString( p_mux,
-                                             SOUT_CFG_PREFIX "separator" );
-        char *psz_separator_block = (char *)malloc( strlen( psz_separator ) +
-                                              2 + strlen( CONTENT_TYPE ) );
-
-        sprintf( psz_separator_block, "%s\r\n%s\r\n", psz_separator,
-                                      CONTENT_TYPE );
-
-        p_header = block_New( p_mux, strlen( psz_separator_block ) );
-        memcpy( p_header->p_buffer, psz_separator_block ,
-                                    strlen( psz_separator_block ) );
-        p_header->i_flags |= BLOCK_FLAG_HEADER;
-        sout_AccessOutWrite( p_mux->p_access, p_header );
-        p_sys->b_send_headers = VLC_FALSE;
-        if( psz_separator_block ) free( psz_separator_block );
-    }
-
-    if( !p_mux->i_nb_inputs ) return VLC_SUCCESS;
-
-    p_fifo = p_mux->pp_inputs[0]->p_fifo;
-
-i_count
+
+block_FifoCount( p_fifo )
-    {
-
+
+
+
+
+
-        block_t *p_data = block_FifoGet( p_fifo );
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        sout_AccessOutWrite( p_mux->p_access, p_data );
-
-        i_count--;
-    }
-