X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvideo_decoder.h;h=6607b64242b447313736b24ed8f51888815153bd;hb=05b2c1efc26bd11dfacb4ed4f0b668b83987cc15;hp=0b328f7bab3a91da55fa4735f64796b7be04b5a8;hpb=c2c756049238d481fbb196d5d4e7a6693713fe1e;p=vlc diff --git a/include/video_decoder.h b/include/video_decoder.h index 0b328f7bab..6607b64242 100644 --- a/include/video_decoder.h +++ b/include/video_decoder.h @@ -1,76 +1,87 @@ -/******************************************************************************* +/***************************************************************************** * video_decoder.h : video decoder thread - * (c)1999 VideoLAN - ******************************************************************************* - ******************************************************************************* + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_decoder.h,v 1.22 2001/01/13 12:57:19 sam Exp $ + * + * Authors: Christophe Massiot + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" * "decoder_fifo.h" - *******************************************************************************/ + *****************************************************************************/ -/******************************************************************************* +/***************************************************************************** * vdec_thread_t: video decoder thread descriptor - ******************************************************************************* - * ?? - *******************************************************************************/ + ***************************************************************************** + * XXX?? + *****************************************************************************/ typedef struct vdec_thread_s { /* Thread properties and locks */ - boolean_t b_die; /* `die' flag */ - boolean_t b_run; /* `run' flag */ - boolean_t b_error; /* `error' flag */ - boolean_t b_active; /* `active' flag */ - vlc_thread_t thread_id; /* id for thread functions */ + boolean_t b_die; /* `die' flag */ + boolean_t b_run; /* `run' flag */ + boolean_t b_error; /* `error' flag */ + boolean_t b_active; /* `active' flag */ + vlc_thread_t thread_id; /* id for thread functions */ /* Thread configuration */ - /* ?? */ - /*??*/ + /* XXX?? */ // int *pi_status; - - /* Input properties */ - decoder_fifo_t fifo; /* PES input fifo */ + /* idct iformations */ + dctelem_t p_pre_idct[64*64]; - /* The bit stream structure handles the PES stream at the bit level */ - bit_stream_t bit_stream; + /* Input properties */ + struct vpar_thread_s * p_vpar; /* video_parser thread */ - /* Output properties */ - vout_thread_t * p_vout; /* video output thread */ - int i_stream; /* video stream id */ - - -#ifdef STATS - /* Statistics */ - count_t c_loops; /* number of loops */ - count_t c_idle_loops; /* number of idle loops */ - count_t c_pictures; /* number of pictures read */ - count_t c_i_pictures; /* number of I pictures read */ - count_t c_p_pictures; /* number of P pictures read */ - count_t c_b_pictures; /* number of B pictures read */ - count_t c_decoded_pictures; /* number of pictures decoded */ - count_t c_decoded_i_pictures; /* number of I pictures decoded */ - count_t c_decoded_p_pictures; /* number of P pictures decoded */ - count_t c_decoded_b_pictures; /* number of B pictures decoded */ +#ifndef HAVE_MMX + /* Lookup tables */ + u8 pi_crop_buf[VDEC_CROPRANGE]; + u8 * pi_crop; #endif } vdec_thread_t; -/******************************************************************************* +/***************************************************************************** * Prototypes - *******************************************************************************/ + *****************************************************************************/ +struct vpar_thread_s; +struct macroblock_s; /* Thread management functions */ -p_vdec_thread_t vdec_CreateThread ( /* video_cfg_t *p_cfg, */ input_thread_t *p_input /*, - vout_thread_t *p_vout, int *pi_status */ ); -void vdec_DestroyThread ( vdec_thread_t *p_vdec /*, int *pi_status */ ); - -/* Time management functions */ -/* ?? */ +#ifndef VDEC_SMP +int vdec_InitThread ( struct vdec_thread_s *p_vdec ); +#endif +void vdec_DecodeMacroblock ( struct vdec_thread_s *p_vdec, + struct macroblock_s *p_mb ); +void vdec_DecodeMacroblockC ( struct vdec_thread_s *p_vdec, + struct macroblock_s *p_mb ); +void vdec_DecodeMacroblockBW ( struct vdec_thread_s *p_vdec, + struct macroblock_s *p_mb ); +vdec_thread_t * vdec_CreateThread ( struct vpar_thread_s *p_vpar /*, + int *pi_status */ ); +void vdec_DestroyThread ( vdec_thread_t *p_vdec /*, + int *pi_status */ ); -/* Dynamic thread settings */ -/* ?? */