* modules/codec/x264.c: add x264 version debug info

[vlc] / modules / codec / theora.c

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 1a08fa61d8a6cb45012b7109b185e1ffde603663..df30ac2b272b6861ed699b911b4883ce04a5b6bd 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * theora.c: theora decoder module making use of libtheora.
  *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
+ * Copyright (C) 1999-2001 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,17 +18,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <vlc/vlc.h>
+#include <vlc_codec.h>
+#include <vlc_vout.h>
+#include <vlc_sout.h>
+#include <vlc_input.h>
 #include <ogg/ogg.h>
 
 #include <theora/theora.h>
@@ -89,13 +93,13 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict );
  *****************************************************************************/
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 1 (low) and 10 (high), instead " \
+  "Enforce a quality between 1 (low) and 10 (high), instead " \
   "of specifying a particular bitrate. This will produce a VBR stream." )
 
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_VCODEC );
-    set_shorname( "Theora" );
+    set_shortname( "Theora" );
     set_description( _("Theora video decoder") );
     set_capability( "decoder", 100 );
     set_callbacks( OpenDecoder, CloseDecoder );
@@ -105,13 +109,11 @@ vlc_module_begin();
     set_description( _("Theora video packetizer") );
     set_capability( "packetizer", 100 );
     set_callbacks( OpenPacketizer, CloseDecoder );
-    add_shortcut( "theora" );
 
     add_submodule();
     set_description( _("Theora video encoder") );
-    set_capability( "encoder", 100 );
+    set_capability( "encoder", 150 );
     set_callbacks( OpenEncoder, CloseEncoder );
-    add_shortcut( "theora" );
 
 #   define ENC_CFG_PREFIX "sout-theora-"
     add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT,
@@ -218,7 +220,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         p_dec->fmt_in.p_extra =
             realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra +
                      oggpacket.bytes + 2 );
-        p_extra = p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra;
+        p_extra = ((uint8_t *)p_dec->fmt_in.p_extra) + p_dec->fmt_in.i_extra;
         *(p_extra++) = oggpacket.bytes >> 8;
         *(p_extra++) = oggpacket.bytes & 0xFF;
 
@@ -278,7 +280,7 @@ static int ProcessHeaders( decoder_t *p_dec )
 
     if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 )
     {
-        msg_Err( p_dec, "This bitstream does not contain Theora video data" );
+        msg_Err( p_dec, "this bitstream does not contain Theora video data" );
         return VLC_EGENERIC;
     }
 
@@ -294,8 +296,8 @@ static int ProcessHeaders( decoder_t *p_dec )
     if( p_sys->ti.aspect_denominator && p_sys->ti.aspect_numerator )
     {
         p_dec->fmt_out.video.i_aspect = ((int64_t)VOUT_ASPECT_FACTOR) *
-            ( p_sys->ti.aspect_numerator * p_sys->ti.width ) /
-            ( p_sys->ti.aspect_denominator * p_sys->ti.height );
+            ( p_sys->ti.aspect_numerator * p_dec->fmt_out.video.i_width ) /
+            ( p_sys->ti.aspect_denominator * p_dec->fmt_out.video.i_height );
     }
     else
     {
@@ -510,7 +512,7 @@ static void ParseTheoraComments( decoder_t *p_dec )
             *psz_value = '\0';
             psz_value++;
             input_Control( p_input, INPUT_ADD_INFO, _("Theora comment"),
-                           psz_name, psz_value );
+                           psz_name, "%s", psz_value );
         }
         free( psz_comment );
         i++;
@@ -557,11 +559,11 @@ static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
             i_src_yoffset /= 2;
         }
 
-        p_src += (i_src_yoffset * i_src_stride + i_src_yoffset);
+        p_src += (i_src_yoffset * i_src_stride + i_src_xoffset);
 
         for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
         {
-            p_dec->p_vlc->pf_memcpy( p_dst, p_src + i_src_xoffset,
+            p_dec->p_libvlc->pf_memcpy( p_dst, p_src + i_src_xoffset,
                                      i_plane ? yuv->uv_width : yuv->y_width );
             p_src += i_src_stride;
             p_dst += i_dst_stride;
@@ -619,7 +621,7 @@ static int OpenEncoder( vlc_object_t *p_this )
     p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0');
     p_enc->fmt_out.i_codec = VLC_FOURCC('t','h','e','o');
 
-    sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+    config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
 
     var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
     i_quality = val.i_int;
@@ -665,12 +667,12 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     if( p_enc->fmt_in.video.i_aspect )
     {
-        int64_t i_num, i_den;
-        int i_dst_num, i_dst_den;
+        uint64_t i_num, i_den;
+        unsigned i_dst_num, i_dst_den;
 
         i_num = p_enc->fmt_in.video.i_aspect * (int64_t)p_sys->ti.height;
         i_den = VOUT_ASPECT_FACTOR * p_sys->ti.width;
-        vlc_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
+        vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
         p_sys->ti.aspect_numerator = i_dst_num;
         p_sys->ti.aspect_denominator = i_dst_den;
     }