Removes trailing spaces. Removes tabs.

[vlc] / modules / codec / dirac.c

diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 30d1ed8b126113cfe7a4beea9ef1d4328f66649c..25389fe0241ee3ace1263fbb740c2e2563eecc41 100644 (file)
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -19,15 +19,16 @@
  *
  * 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/sout.h>
+#include <vlc_codec.h>
+#include <vlc_sout.h>
+#include <vlc_vout.h>
 
 #include <libdirac_decoder/dirac_parser.h>
 #include <libdirac_encoder/dirac_encoder.h>
@@ -65,7 +66,7 @@ static const char *ppsz_enc_options[] = {
  *****************************************************************************/
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 1.0 (low) and 10.0 (high)." )
+  "Quality of the encoding between 1.0 (low) and 10.0 (high)." )
 
 vlc_module_begin();
     set_category( CAT_INPUT );
@@ -79,7 +80,6 @@ vlc_module_begin();
     set_description( _("Dirac video encoder") );
     set_capability( "encoder", 100 );
     set_callbacks( OpenEncoder, CloseEncoder );
-    add_shortcut( "dirac" );
     add_float( ENC_CFG_PREFIX "quality", 7.0, NULL, ENC_QUALITY_TEXT,
                ENC_QUALITY_LONGTEXT, VLC_FALSE );
 
@@ -144,13 +144,15 @@ static picture_t *GetNewPicture( decoder_t *p_dec )
     picture_t *p_pic;
     int i_plane;
 
-    p_dec->fmt_out.i_codec =
-        p_sys->p_dirac->seq_params.chroma == format411 ?
-        VLC_FOURCC('I','4','1','1') :
-        p_sys->p_dirac->seq_params.chroma == format420 ?
-        VLC_FOURCC('I','4','2','0') :
-        p_sys->p_dirac->seq_params.chroma == format422 ?
-        VLC_FOURCC('I','4','2','2') : 0;
+    switch( p_sys->p_dirac->seq_params.chroma )
+    {
+    case format420: p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0'); break;
+    case format422: p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','2'); break;
+    case format444: p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','4','4'); break;    // XXX 0.6 ?
+    default:
+        p_dec->fmt_out.i_codec = 0;
+        break;
+    }
 
     p_dec->fmt_out.video.i_visible_width =
     p_dec->fmt_out.video.i_width = p_sys->p_dirac->seq_params.width;
@@ -159,17 +161,17 @@ static picture_t *GetNewPicture( decoder_t *p_dec )
     p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * 4 / 3;
 
     p_dec->fmt_out.video.i_frame_rate =
-        p_sys->p_dirac->seq_params.frame_rate.numerator;
+        p_sys->p_dirac->src_params.frame_rate.numerator;
     p_dec->fmt_out.video.i_frame_rate_base =
-        p_sys->p_dirac->seq_params.frame_rate.denominator;
+        p_sys->p_dirac->src_params.frame_rate.denominator;
 
     /* Get a new picture */
     p_pic = p_dec->pf_vout_buffer_new( p_dec );
 
     if( p_pic == NULL ) return NULL;
+    p_pic->b_progressive = !p_sys->p_dirac->src_params.interlace;
+    p_pic->b_top_field_first = p_sys->p_dirac->src_params.topfieldfirst;
 
-    p_pic->b_progressive = !p_sys->p_dirac->seq_params.interlace;
-    p_pic->b_top_field_first = p_sys->p_dirac->seq_params.topfieldfirst;
     p_pic->i_nb_fields = 2;
 
     /* Copy picture stride by stride */
@@ -184,7 +186,7 @@ static picture_t *GetNewPicture( decoder_t *p_dec )
 
         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_width );
+            p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
             p_src += i_width;
             p_dst += i_dst_stride;
         }
@@ -251,8 +253,8 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                      p_sys->p_dirac->seq_params.width,
                      p_sys->p_dirac->seq_params.height,
                      p_sys->p_dirac->seq_params.chroma,
-                     (float)p_sys->p_dirac->seq_params.frame_rate.numerator/
-                     p_sys->p_dirac->seq_params.frame_rate.denominator );
+                     (float)p_sys->p_dirac->src_params.frame_rate.numerator/
+                     p_sys->p_dirac->src_params.frame_rate.denominator );
 
             FreeFrameBuffer( p_sys->p_dirac );
             buf[0] = malloc( p_sys->p_dirac->seq_params.width *
@@ -350,22 +352,20 @@ static int OpenEncoder( vlc_object_t *p_this )
     p_enc->fmt_in.video.i_bits_per_pixel = 12;
     p_enc->fmt_out.i_codec = VLC_FOURCC('d','r','a','c');
 
-    sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
-
-    /* Initialse the encoder context with the presets for SD576 - Standard
-     * Definition Digital (some parameters will be overwritten later on) */
-    dirac_encoder_context_init( &p_sys->ctx, SD576 );
+    config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
 
-    /* Override parameters if required */
+    dirac_encoder_context_init( &p_sys->ctx, VIDEO_FORMAT_CUSTOM );
+    /* */
     p_sys->ctx.seq_params.width = p_enc->fmt_in.video.i_width;
     p_sys->ctx.seq_params.height = p_enc->fmt_in.video.i_height;
     p_sys->ctx.seq_params.chroma = format420;
-    p_sys->ctx.seq_params.frame_rate.numerator =
+    /* */
+    p_sys->ctx.src_params.frame_rate.numerator =
         p_enc->fmt_in.video.i_frame_rate;
-    p_sys->ctx.seq_params.frame_rate.denominator =
+    p_sys->ctx.src_params.frame_rate.denominator =
         p_enc->fmt_in.video.i_frame_rate_base;
-    p_sys->ctx.seq_params.interlace = 0;
-    p_sys->ctx.seq_params.topfieldfirst = 0;
+    p_sys->ctx.src_params.interlace = 0;
+    p_sys->ctx.src_params.topfieldfirst = 0;
 
     var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
     f_quality = val.f_float;
@@ -406,7 +406,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
 
         for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
         {
-            p_enc->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+            p_enc->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
             p_dst += i_width;
             p_src += i_src_stride;
         }
@@ -448,7 +448,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
             }
             if( p_sys->p_dirac->decoded_frame_avail )
             {
-                //locally decoded frame is available in 
+                //locally decoded frame is available in
                 //encoder->dec_buf
                 //locally decoded frame parameters available
                 //in encoder->dec_fparams