Update references to ffmpeg header files to match new directory structure. All ffmpe...

[vlc] / modules / codec / ffmpeg / encoder.c

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index b8a3cb0b4a29d2eb81719b361e021fe9c58a3d21..1d5c0c258bf225199e98048eac2ac50ea6b6b84b 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -28,6 +28,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
 #include <vlc_aout.h>
@@ -37,8 +41,8 @@
 
 /* ffmpeg header */
 #define HAVE_MMX 1
-#ifdef HAVE_FFMPEG_AVCODEC_H
-#   include <ffmpeg/avcodec.h>
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+#   include <libavcodec/avcodec.h>
 #else
 #   include <avcodec.h>
 #endif
@@ -159,7 +163,7 @@ static const uint16_t mpa_bitrate_tab[2][15] =
 static const uint16_t mpa_freq_tab[6] =
 { 44100, 48000, 32000, 22050, 24000, 16000 };
 
-static const int16_t mpeg4_default_intra_matrix[64] = {
+static const uint16_t mpeg4_default_intra_matrix[64] = {
   8, 17, 18, 19, 21, 23, 25, 27,
  17, 18, 19, 21, 23, 25, 27, 28,
  20, 21, 22, 23, 24, 26, 28, 30,
@@ -170,7 +174,7 @@ static const int16_t mpeg4_default_intra_matrix[64] = {
  27, 28, 30, 32, 35, 38, 41, 45,
 };
 
-static const int16_t mpeg4_default_non_intra_matrix[64] = {
+static const uint16_t mpeg4_default_non_intra_matrix[64] = {
  16, 17, 18, 19, 20, 21, 22, 23,
  17, 18, 19, 20, 21, 22, 23, 24,
  18, 19, 20, 21, 22, 23, 24, 25,
@@ -195,9 +199,6 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
     int i_codec_id, i_cat;
     const char *psz_namecodec;
     vlc_value_t val;
-    vlc_value_t lockval;
-
-    var_Get( p_enc->p_libvlc_global, "avcodec", &lockval );
 
     if( !E_(GetFfmpegCodec)( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
                              &psz_namecodec ) )
@@ -341,6 +342,8 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         else
             p_sys->i_hq = FF_MB_DECISION_RD;
     }
+    else
+        p_sys->i_hq = FF_MB_DECISION_RD;
     if( val.psz_string ) free( val.psz_string );
 
     var_Get( p_enc, ENC_CFG_PREFIX "qmin", &val );
@@ -439,6 +442,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         if ( p_sys->b_strict_rc )
         {
             p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
+            p_context->rc_min_rate = p_enc->fmt_out.i_bitrate;
             p_context->rc_buffer_size = p_sys->i_rc_buffer_size;
             /* This is from ffmpeg's ffmpeg.c : */
             p_context->rc_initial_buffer_occupancy
@@ -492,10 +496,25 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         if( p_sys->i_vtolerance > 0 )
             p_context->bit_rate_tolerance = p_sys->i_vtolerance;
 
+        /* usually if someone sets bitrate, he likes more to get that bitrate over quality 
+         * should help 'normal' user to get asked bitrate
+         */
+        if( p_enc->fmt_out.i_bitrate > 0 && p_sys->i_qmax == 0 && p_sys->i_qmin == 0 )
+        {
+            p_sys->i_qmax = 51;
+            p_sys->i_qmin = 3;
+        }
+
         if( p_sys->i_qmin > 0 )
+        {
             p_context->mb_qmin = p_context->qmin = p_sys->i_qmin;
+            p_context->mb_lmin = p_context->lmin = p_sys->i_qmin * FF_QP2LAMBDA;
+        }
         if( p_sys->i_qmax > 0 )
+        {
             p_context->mb_qmax = p_context->qmax = p_sys->i_qmax;
+            p_context->mb_lmax = p_context->lmax = p_sys->i_qmax * FF_QP2LAMBDA;
+        }
         p_context->max_qdiff = 3;
 
         p_context->mb_decision = p_sys->i_hq;
@@ -532,10 +551,11 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
     p_context->extradata = NULL;
     p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
+
     if( avcodec_open( p_context, p_codec ) )
     {
-        vlc_mutex_unlock( lockval.p_address );
+        vlc_mutex_unlock( lock );
         if( p_enc->fmt_in.i_cat == AUDIO_ES &&
              (p_context->channels > 2 || i_codec_id == CODEC_ID_MP2
                || i_codec_id == CODEC_ID_MP3) )
@@ -585,10 +605,10 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
             }
 
             p_context->codec = NULL;
-            vlc_mutex_lock( lockval.p_address );
+            vlc_mutex_lock( lock );
             if( avcodec_open( p_context, p_codec ) )
             {
-                vlc_mutex_unlock( lockval.p_address );
+                vlc_mutex_unlock( lock );
                 msg_Err( p_enc, "cannot open encoder" );
                 intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"),
                                 _("VLC could not open the encoder.") );
@@ -605,7 +625,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
     }
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( lock);
 
     p_enc->fmt_out.i_extra = p_context->extradata_size;
     if( p_enc->fmt_out.i_extra )
@@ -621,6 +641,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         p_sys->p_buffer_out = malloc( 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE );
         p_sys->i_frame_size = p_context->frame_size * 2 * p_context->channels;
         p_sys->p_buffer = malloc( p_sys->i_frame_size );
+        p_enc->fmt_out.audio.i_blockalign = p_context->block_align;
     }
 
     msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
@@ -754,9 +775,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
     frame.top_field_first = !!p_pict->b_top_field_first;
 
     /* Set the pts of the frame being encoded (segfaults with mpeg4!)*/
-    if( p_enc->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'v' ) ||
-        p_enc->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', '1', 'v' ) ||
-        p_enc->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', '2', 'v' ) )
+    if( p_enc->fmt_out.i_codec != VLC_FOURCC( 'm', 'p', '4', 'v' ) )
     {
         frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
 
@@ -1004,9 +1023,6 @@ void E_(CloseEncoder)( vlc_object_t *p_this )
 {
     encoder_t *p_enc = (encoder_t *)p_this;
     encoder_sys_t *p_sys = p_enc->p_sys;
-    vlc_value_t lockval;
-
-    var_Get( p_enc->p_libvlc_global, "avcodec", &lockval );
 
     if ( p_sys->b_inited && p_enc->i_threads >= 1 )
     {
@@ -1020,15 +1036,15 @@ void E_(CloseEncoder)( vlc_object_t *p_this )
             vlc_thread_join( pp_contexts[i] );
             vlc_mutex_destroy( &pp_contexts[i]->lock );
             vlc_cond_destroy( &pp_contexts[i]->cond );
-            vlc_object_destroy( pp_contexts[i] );
+            vlc_object_release( pp_contexts[i] );
         }
 
         free( pp_contexts );
     }
 
-    vlc_mutex_lock( lockval.p_address );
+    vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
     avcodec_close( p_sys->p_context );
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( lock );
     av_free( p_sys->p_context );
 
     if( p_sys->p_buffer ) free( p_sys->p_buffer );