Changeset 0d0dffabce3a6d428e8a0dfbfb585ddcef543f7b

Timestamp:

06/29/03 22:58:16 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[e2a71ad58c5a2c688ff6db265ed3b289452da126]

git-author:

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

Message:

* configure.ac, modules/mux/ogg.c, modules/stream_out/transcode.c: vorbis transcoding support (the transcoder still doesn't support vorbis decoding though, so no vorbis -> else transcoding)

Files:

• configure.ac (modified) (2 diffs)
• modules/mux/ogg.c (modified) (2 diffs)
• modules/stream_out/transcode.c (modified) (24 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-6 2003/06/28 14:31:40 sam
+7 2003/06/29 20:58:16 gbazin
-
-AC_INIT(vlc,0.6.0)
@@ -1535 +1535 @@
-  dnl XXX: we don't link with -lavcodec blah blah blah
-  dnl AX_ADD_LDFLAGS([encoder_ffmpeg],[${LDFLAGS_ffmpeg}])
+
+  AC_CHECK_HEADERS(vorbis/vorbisenc.h vorbis/codec.h,
+    AX_ADD_LDFLAGS([stream_out_transcode],[-lvorbisenc -lvorbis -logg]) )
-fi
-

modules/mux/ogg.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-6 2003/06/23 23:51:31
+7 2003/06/29 20:58:16
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -650 +650 @@
-            p_stream->i_length = 0;
-
-            msg_Dbg( p_mux, "writing data..." );
-            sout_AccessOutWrite( p_mux->p_access, p_og );
-

modules/stream_out/transcode.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-8 2003/06/25 21:47:05 fenrir
+9 2003/06/29 20:58:16 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -39 +39 @@
-#endif
-
+/* vorbis header */
+#ifdef HAVE_VORBIS_VORBISENC_H
+#   include <vorbis/vorbisenc.h>
+#endif
+
-/*****************************************************************************
- * Exported prototypes
@@ -301 +306 @@
-
-    ImgReSampleContext *p_vresample;
+
+#ifdef HAVE_VORBIS_VORBISENC_H
+
+    /* Vorbis part */
+    vorbis_info      *p_vi;
+    vorbis_dsp_state *p_vd;
+    vorbis_block     *p_vb;
+    vorbis_comment   *p_vc;
+    int              i_last_block_size;
+    int              i_samples_delay;
+    vlc_bool_t       b_headers_sent;
+#endif
-};
-
-
-      
+
-{
-    sout_stream_sys_t   *p_sys = p_stream->p_sys;
@@ -413 +430 @@
-}
-
-
+
+
-{
-    sout_stream_sys_t   *p_sys = p_stream->p_sys;
@@ -463 +481 @@
-    { VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 },
-    { VLC_FOURCC( 'w', 'm', 'a', '2' ), CODEC_ID_WMAV2 },
+    { VLC_FOURCC( 'v', 'o', 'r', 'b' ), CODEC_ID_VORBIS },
-
-    /* video */
@@ -526 +545 @@
-}
-
-
+
+
-{
-    int i_ff_codec;
@@ -576 +596 @@
-
-    /* find encoder */
+    id->i_buffer_in      = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+    id->i_buffer_in_pos = 0;
+    id->p_buffer_in      = malloc( id->i_buffer_in );
+
+    id->i_buffer     = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+    id->i_buffer_pos = 0;
+    id->p_buffer     = malloc( id->i_buffer );
+
+    id->i_buffer_out     = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+    id->i_buffer_out_pos = 0;
+    id->p_buffer_out     = malloc( id->i_buffer_out );
+
+#ifdef HAVE_VORBIS_VORBISENC_H
+    if( id->f_dst.i_fourcc == VLC_FOURCC('v','o','r','b') )
+    {
+        id->p_vi = (vorbis_info *)malloc( sizeof(vorbis_info) );
+        id->p_vd = (vorbis_dsp_state *)malloc( sizeof(vorbis_dsp_state) );
+        id->p_vb = (vorbis_block *)malloc( sizeof(vorbis_block) );
+        id->p_vc = (vorbis_comment *)malloc( sizeof(vorbis_comment) );
+
+        vorbis_info_init( id->p_vi );
+
+        if( vorbis_encode_setup_managed( id->p_vi, id->f_dst.i_channels,
+              id->f_dst.i_sample_rate, -1, id->f_dst.i_bitrate, -1 ) ||
+            vorbis_encode_ctl( id->p_vi, OV_ECTL_RATEMANAGE_AVG, NULL ) ||
+             vorbis_encode_setup_init( id->p_vi ) ){}
+
+        /* add a comment */
+        vorbis_comment_init( id->p_vc);
+        vorbis_comment_add_tag( id->p_vc, "ENCODER", "VLC media player");
+
+        /* set up the analysis state and auxiliary encoding storage */
+        vorbis_analysis_init( id->p_vd, id->p_vi );
+        vorbis_block_init( id->p_vd, id->p_vb );
+
+        id->b_headers_sent = VLC_FALSE;
+        id->i_last_block_size = 0;
+        id->i_samples_delay = 0;
+
+        return VLC_SUCCESS;
+    }
+#endif
+
-    i_ff_codec = get_ff_codec( id->f_dst.i_fourcc );
-    if( i_ff_codec == 0 )
@@ -601 +664 @@
-    }
-
-
-    id->i_buffer_in      = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
-    id->i_buffer_in_pos = 0;
-    id->p_buffer_in      = malloc( id->i_buffer_in );
-
-    id->i_buffer     = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
-    id->i_buffer_pos = 0;
-    id->p_buffer     = malloc( id->i_buffer );
-
-    id->i_buffer_out     = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
-    id->i_buffer_out_pos = 0;
-    id->p_buffer_out     = malloc( id->i_buffer_out );
-
-    return VLC_SUCCESS;
-}
-
-
+
+
-{
-    if( id->ff_dec )
@@ -623 +674 @@
-        avcodec_close( id->ff_dec_c );
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    free( id->ff_dec_c );
-
+
+
-
-    free( id->p_buffer_in );
@@ -633 +701 @@
-}
-
-
-
+
+
+
+
-{
-    vlc_bool_t b_again = VLC_FALSE;
@@ -641 +711 @@
-
-    /* gather data into p_buffer_in */
+    if( id->f_dst.i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) )
+    id->i_dts = in->i_dts -
+                (mtime_t)1000000 * (mtime_t)id->i_samples_delay /
+                (mtime_t)id->f_dst.i_sample_rate;
+    else
-    id->i_dts = in->i_dts -
-                (mtime_t)1000000 *
@@ -646 +721 @@
-                (mtime_t)id->ff_enc_c->sample_rate;
-
-
+(int)
-    {
-        /* extend buffer_in */
@@ -653 +728 @@
-    }
-    memcpy( &id->p_buffer_in[id->i_buffer_in_pos],
-
-
+
-    id->i_buffer_in_pos += in->i_size;
-
-    do
-    {
-any
+uch
-        if( id->ff_dec )
-        {
@@ -670 +744 @@
-
-                i_used = avcodec_decode_audio( id->ff_dec_c,
-
-
-
-
+
+
+
+
+
+
-                id->i_buffer_pos += i_buffer_size;
-
@@ -711 +787 @@
-            {
-                int8_t *sin = (int8_t*)id->p_buffer_in;
-
+
+
-                i_used = i_samples;
-                while( i_samples > 0 )
@@ -722 +799 @@
-            {
-                int8_t *sin = (int8_t*)id->p_buffer_in;
-
+
+
-                i_used = i_samples;
-                while( i_samples > 0 )
@@ -732 +810 @@
-            else if( id->f_src.i_fourcc == VLC_FOURCC( 's', '1', '6', 'l' ) )
-            {
-
+
+
-#ifdef WORDS_BIGENDIAN
-                uint8_t *sin = (uint8_t*)id->p_buffer_in;
@@ -754 +833 @@
-            else if( id->f_src.i_fourcc == VLC_FOURCC( 's', '1', '6', 'b' ) )
-            {
-
+
+
-#ifdef WORDS_BIGENDIAN
-                memcpy( sout, id->p_buffer_in, i_samples * 2 );
@@ -784 +864 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for( ;; )
-        {
-
+
+
-            int i_out_size;
-            sout_buffer_t *p_out;
@@ -796 +975 @@
-            }
-
-
+
+
-            i_out_size = avcodec_encode_audio( id->ff_enc_c,
-                    
-                    
+
+
-
-            if( i_out_size <= 0 )
@@ -813 +993 @@
-            memcpy( p_out->p_buffer, id->p_buffer_out, i_out_size );
-            p_out->i_size = i_out_size;
-
+
+
+
+
-            /* FIXME */
-            p_out->i_dts = id->i_dts;
@@ -821 +1004 @@
-            id->i_dts += p_out->i_length;
-
-
+
+
+
-            sout_BufferChain( out, p_out );
-        }
@@ -834 +1019 @@
- * video
- */
-
+
+
-{
-    sout_stream_sys_t   *p_sys = p_stream->p_sys;
@@ -1197 +1383 @@
-    return VLC_SUCCESS;
-}
-