Commit 423a3bcf authored by Christophe Massiot's avatar Christophe Massiot

* Moved video_decoder's headers from include/ to src/video_decoder.

* Temporarily removed b&w kludge.
parent 434f3796
......@@ -117,10 +117,6 @@ typedef int (yuv_sys_init_t) ( p_vout_thread_t p_vout );
typedef int (yuv_sys_reset_t) ( p_vout_thread_t p_vout );
typedef void (yuv_sys_end_t) ( p_vout_thread_t p_vout );
struct macroblock_s;
typedef void (vdec_DecodeMacroblock_t) ( struct vdec_thread_s *p_vdec,
struct macroblock_s *p_mb );
typedef struct vout_thread_s
{
/* Thread properties and lock */
......@@ -133,8 +129,6 @@ typedef struct vout_thread_s
vlc_mutex_t change_lock; /* thread change lock */
int * pi_status; /* temporary status flag */
p_vout_sys_t p_sys; /* system output method */
vdec_DecodeMacroblock_t *
vdec_DecodeMacroblock; /* decoder function to use */
/* Current display properties */
u16 i_changes; /* changes made to the thread */
......
......@@ -2,6 +2,7 @@
* vdec_idct.c : IDCT functions
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_idct.c,v 1.22 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Gal Hendryckx <jimmy@via.ecp.fr>
*
......
......@@ -2,6 +2,7 @@
* vdec_idct.h : types for the inverse discrete cosine transform
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_idct.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
......
......@@ -2,6 +2,7 @@
* vdec_idctmmx.S : MMX IDCT implementation
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_idctmmx.S,v 1.5 2000/12/21 17:19:52 massiot Exp $
*
* Authors:
*
......
......@@ -2,6 +2,7 @@
* vdec_motion.c : motion compensation routines
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_motion.c,v 1.32 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
......
......@@ -2,6 +2,7 @@
* vdec_motion.h : types for the motion compensation algorithm
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_motion.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
......
......@@ -2,6 +2,7 @@
* vdec_motion_inner.c : motion compensation inner routines
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_motion_inner.c,v 1.10 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
......
......@@ -3,6 +3,7 @@
* MMX
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_motion_inner_mmx.c,v 1.5 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>, largerly inspired by the
* work done by the livid project <http://www.linuxvideo.org/>
......
......@@ -2,6 +2,7 @@
* video_decoder.c : video decoder thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_decoder.c,v 1.41 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Gal Hendryckx <jimmy@via.ecp.fr>
......@@ -567,7 +568,7 @@ static void RunThread( vdec_thread_t *p_vdec )
if( (p_mb = vpar_GetMacroblock( &p_vdec->p_vpar->vfifo )) != NULL )
{
p_vdec->p_vpar->p_vout->vdec_DecodeMacroblock ( p_vdec, p_mb );
vdec_DecodeMacroblockC ( p_vdec, p_mb );
}
}
......
......@@ -2,6 +2,7 @@
* video_decoder.h : video decoder thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_decoder.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......
......@@ -2,6 +2,7 @@
* video_fifo.h : FIFO for the pool of video_decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_fifo.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -126,8 +127,7 @@ static __inline__ void vpar_DecodeMacroblock( video_fifo_t * p_fifo,
vlc_mutex_unlock( &p_fifo->lock );
#else
p_fifo->p_vpar->p_vout->vdec_DecodeMacroblock(
p_fifo->p_vpar->pp_vdec[0], p_mb );
vdec_DecodeMacroblockC( p_fifo->p_vpar->pp_vdec[0], p_mb );
#endif
}
......
......@@ -2,7 +2,7 @@
* video_parser.h : video parser thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_parser.h,v 1.32 2000/12/21 13:25:50 massiot Exp $
* $Id: video_parser.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......
......@@ -2,6 +2,7 @@
* vpar_blocks.h : video parser blocks management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_blocks.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
......
......@@ -2,6 +2,7 @@
* vpar_headers.h : video parser : headers parsing
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_headers.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......
......@@ -2,6 +2,7 @@
* vpar_synchro.h : video parser blocks management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_synchro.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
*
* Author: Christophe Massiot <massiot@via.ecp.fr>
*
......
......@@ -51,9 +51,6 @@
#include "intf_msg.h"
#include "main.h"
#include "vdec_idct.h"
#include "video_decoder.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......@@ -166,7 +163,6 @@ vout_thread_t * vout_CreateThread ( char *psz_display, int i_root_window,
p_vout->b_grayscale = main_GetIntVariable( VOUT_GRAYSCALE_VAR,
VOUT_GRAYSCALE_DEFAULT );
p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockC;
p_vout->b_info = 0;
p_vout->b_interface = 0;
p_vout->b_scale = 1;
......@@ -2047,15 +2043,6 @@ static int Manage( vout_thread_t *p_vout )
if( p_vout->i_changes & (VOUT_GAMMA_CHANGE | VOUT_GRAYSCALE_CHANGE |
VOUT_YUV_CHANGE) )
{
/* Change vdec_DecodeMacroblock when switching between BW and C */
if( !p_vout->b_grayscale )
{
p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockC;
}
else if( p_vout->b_grayscale)
{
p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockBW;
}
if( vout_ResetYUV( p_vout ) )
{
intf_ErrMsg("error: can't rebuild convertion tables\n");
......
......@@ -2,6 +2,7 @@
* video_fifo.c : video FIFO management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_fifo.c,v 1.24 2000/12/21 17:19:54 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -35,7 +36,6 @@
#include "plugins.h"
#include "intf_msg.h"
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -43,15 +43,15 @@
#include "video.h"
#include "video_output.h"
#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
#include "../video_decoder/video_decoder.h"
#include "../video_decoder/vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "video_fifo.h"
#include "../video_decoder/vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
#include "../video_decoder/video_fifo.h"
/*****************************************************************************
* vpar_InitFIFO : initialize the video FIFO
......
......@@ -2,7 +2,7 @@
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_parser.c,v 1.56 2000/12/21 14:18:15 massiot Exp $
* $Id: video_parser.c,v 1.57 2000/12/21 17:19:54 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -22,8 +22,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/* FIXME: passer en terminate/destroy avec les signaux supplmentaires ?? */
/*****************************************************************************
* Preamble
*****************************************************************************/
......@@ -47,7 +45,6 @@
#include "plugins.h"
#include "intf_msg.h"
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -55,15 +52,15 @@
#include "video.h"
#include "video_output.h"
#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
#include "../video_decoder/video_decoder.h"
#include "../video_decoder/vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "video_fifo.h"
#include "../video_decoder/vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
#include "../video_decoder/video_fifo.h"
/*
* Local prototypes
......
......@@ -2,6 +2,7 @@
* vpar_blocks.c : blocks parsing
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_blocks.c,v 1.67 2000/12/21 17:19:54 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
......@@ -38,7 +39,6 @@
#include "plugins.h"
#include "intf_msg.h"
#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -46,15 +46,15 @@
#include "video.h"
#include "video_output.h"
#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
#include "../video_decoder/video_decoder.h"
#include "../video_decoder/vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "video_fifo.h"
#include "../video_decoder/vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
#include "../video_decoder/video_fifo.h"
/*
* Welcome to vpar_blocks.c ! Here's where the heavy processor-critical parsing
......
......@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_headers.c,v 1.60 2000/12/21 13:25:51 massiot Exp $
* $Id: vpar_headers.c,v 1.61 2000/12/21 17:19:54 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -45,15 +45,15 @@
#include "video.h"
#include "video_output.h"
#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
#include "../video_decoder/video_decoder.h"
#include "../video_decoder/vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "video_fifo.h"
#include "../video_decoder/vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
#include "../video_decoder/video_fifo.h"
/*
* Local prototypes
......
......@@ -2,6 +2,7 @@
* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_synchro.c,v 1.62 2000/12/21 17:19:54 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -96,10 +97,6 @@
*****************************************************************************/
#include "defs.h"
#include <stdlib.h> /* free() */
#include <sys/types.h> /* on BSD, uio.h needs types.h */
#include <sys/uio.h> /* "input.h" */
#include "config.h"
#include "common.h"
#include "threads.h"
......@@ -114,14 +111,14 @@
#include "video.h"
#include "video_output.h"
#include "vdec_idct.h"
#include "video_decoder.h"
#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
#include "../video_decoder/video_decoder.h"
#include "../video_decoder/vdec_motion.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
#include "vpar_synchro.h"
#include "video_parser.h"
#include "../video_decoder/vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
#include "main.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment