X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_decoder%2Fvideo_decoder.c;h=2813d2aaeb8689f61a81adde48bcb07dc1c83bb3;hb=26ee312a6f7584df6ebd66404ef674192400a869;hp=2e4ad70573af66b12fcb27f6bd9b6e3e72b92eff;hpb=1c5e6d000adfd2f49d4138b9fc817001e38a89ab;p=vlc diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c index 2e4ad70573..2813d2aaeb 100644 --- a/src/video_decoder/video_decoder.c +++ b/src/video_decoder/video_decoder.c @@ -1,33 +1,47 @@ -/******************************************************************************* +/***************************************************************************** * video_decoder.c : video decoder thread - * (c)1999 VideoLAN - *******************************************************************************/ - -/* ?? passer en terminate/destroy avec les signaux supplémentaires */ - -/******************************************************************************* + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_decoder.c,v 1.44 2001/01/05 18:46:44 massiot Exp $ + * + * Authors: Christophe Massiot + * Gaël Hendryckx + * + * 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. + *****************************************************************************/ + +/***************************************************************************** * Preamble - *******************************************************************************/ -//#include "vlc.h" + *****************************************************************************/ +#include "defs.h" -#include -#include -#include -#include -#include -#include +#include /* free() */ +#include /* getpid() */ +#include /* errno */ #include "config.h" #include "common.h" +#include "threads.h" #include "mtime.h" -#include "vlc_thread.h" +#include "plugins.h" #include "intf_msg.h" -#include "debug.h" /* ?? temporaire, requis par netlist.h */ -#include "input.h" -#include "input_netlist.h" -#include "decoder_fifo.h" +#include "stream_control.h" +#include "input_ext-dec.h" + #include "video.h" #include "video_output.h" @@ -46,31 +60,29 @@ */ #ifdef VDEC_SMP static int vdec_InitThread ( vdec_thread_t *p_vdec ); -static void vdec_DecodeMacroblock( vdec_thread_t *p_vdec, - macroblock_t * p_mb ); #endif static void RunThread ( vdec_thread_t *p_vdec ); static void ErrorThread ( vdec_thread_t *p_vdec ); static void EndThread ( vdec_thread_t *p_vdec ); -/******************************************************************************* +/***************************************************************************** * vdec_CreateThread: create a video decoder thread - ******************************************************************************* + ***************************************************************************** * This function creates a new video decoder thread, and returns a pointer * to its description. On error, it returns NULL. * Following configuration properties are used: - * ?? - *******************************************************************************/ + * XXX?? + *****************************************************************************/ vdec_thread_t * vdec_CreateThread( vpar_thread_t *p_vpar /*, int *pi_status */ ) { vdec_thread_t * p_vdec; - intf_DbgMsg("vdec debug: creating video decoder thread\n"); + intf_DbgMsg("vdec debug: creating video decoder thread"); /* Allocate the memory needed to store the thread's structure */ if ( (p_vdec = (vdec_thread_t *)malloc( sizeof(vdec_thread_t) )) == NULL ) { - intf_ErrMsg("vdec error: not enough memory for vdec_CreateThread() to create the new thread\n"); + intf_ErrMsg("vdec error: not enough memory for vdec_CreateThread() to create the new thread"); return( NULL ); } @@ -89,25 +101,25 @@ vdec_thread_t * vdec_CreateThread( vpar_thread_t *p_vpar /*, int *pi_status */ ) if ( vlc_thread_create(&p_vdec->thread_id, "video decoder", (vlc_thread_func_t)RunThread, (void *)p_vdec) ) { - intf_ErrMsg("vdec error: can't spawn video decoder thread\n"); + intf_ErrMsg("vdec error: can't spawn video decoder thread"); free( p_vdec ); return( NULL ); } - intf_DbgMsg("vdec debug: video decoder thread (%p) created\n", p_vdec); + intf_DbgMsg("vdec debug: video decoder thread (%p) created", p_vdec); return( p_vdec ); } -/******************************************************************************* +/***************************************************************************** * vdec_DestroyThread: destroy a video decoder thread - ******************************************************************************* + ***************************************************************************** * Destroy and terminate thread. This function will return 0 if the thread could * be destroyed, and non 0 else. The last case probably means that the thread * was still active, and another try may succeed. - *******************************************************************************/ + *****************************************************************************/ void vdec_DestroyThread( vdec_thread_t *p_vdec /*, int *pi_status */ ) { - intf_DbgMsg("vdec debug: requesting termination of video decoder thread %p\n", p_vdec); + intf_DbgMsg("vdec debug: requesting termination of video decoder thread %p", p_vdec); /* Ask thread to kill itself */ p_vdec->b_die = 1; @@ -126,33 +138,26 @@ void vdec_DestroyThread( vdec_thread_t *p_vdec /*, int *pi_status */ ) /* following functions are local */ -/******************************************************************************* +/***************************************************************************** * vdec_InitThread: initialize video decoder thread - ******************************************************************************* + ***************************************************************************** * This function is called from RunThread and performs the second step of the * initialization. It returns 0 on success. Note that the thread's flag are not * modified inside this function. - *******************************************************************************/ + *****************************************************************************/ #ifdef VDEC_SMP static int vdec_InitThread( vdec_thread_t *p_vdec ) #else int vdec_InitThread( vdec_thread_t *p_vdec ) #endif { +#ifndef HAVE_MMX int i_dummy; - - intf_DbgMsg("vdec debug: initializing video decoder thread %p\n", p_vdec); - - /* Initialize other properties */ -#ifdef STATS - p_vdec->c_loops = 0; - p_vdec->c_idle_loops = 0; - p_vdec->c_decoded_pictures = 0; - p_vdec->c_decoded_i_pictures = 0; - p_vdec->c_decoded_p_pictures = 0; - p_vdec->c_decoded_b_pictures = 0; #endif + intf_DbgMsg("vdec debug: initializing video decoder thread %p", p_vdec); + +#ifndef HAVE_MMX /* Init crop table */ p_vdec->pi_crop = p_vdec->pi_crop_buf + (VDEC_CROPRANGE >> 1); for( i_dummy = -(VDEC_CROPRANGE >> 1); i_dummy < 0; i_dummy++ ) @@ -167,19 +172,29 @@ int vdec_InitThread( vdec_thread_t *p_vdec ) { p_vdec->pi_crop[i_dummy] = 255; } +#endif + +#ifdef VDEC_SMP + /* Re-nice ourself */ + if( nice(VDEC_NICE) == -1 ) + { + intf_WarnMsg( 2, "vdec warning : couldn't nice() (%s)", + strerror(errno) ); + } +#endif /* Mark thread as running and return */ - intf_DbgMsg("vdec debug: InitThread(%p) succeeded\n", p_vdec); - return( 0 ); + intf_DbgMsg("vdec debug: InitThread(%p) succeeded", p_vdec); + return( 0 ); } -/******************************************************************************* +/***************************************************************************** * ErrorThread: RunThread() error loop - ******************************************************************************* + ***************************************************************************** * This function is called when an error occured during thread main's loop. The * thread can still receive feed, but must be ready to terminate as soon as * possible. - *******************************************************************************/ + *****************************************************************************/ static void ErrorThread( vdec_thread_t *p_vdec ) { macroblock_t * p_mb; @@ -192,26 +207,26 @@ static void ErrorThread( vdec_thread_t *p_vdec ) } } -/******************************************************************************* +/***************************************************************************** * EndThread: thread destruction - ******************************************************************************* - * This function is called when the thread ends after a sucessfull + ***************************************************************************** + * This function is called when the thread ends after a sucessful * initialization. - *******************************************************************************/ + *****************************************************************************/ static void EndThread( vdec_thread_t *p_vdec ) { - intf_DbgMsg("vdec debug: EndThread(%p)\n", p_vdec); + intf_DbgMsg("vdec debug: EndThread(%p)", p_vdec); } -/******************************************************************************* +/***************************************************************************** * AddBlock : add a block - *******************************************************************************/ + *****************************************************************************/ #ifndef HAVE_MMX static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, yuv_data_t * p_data, int i_incr ) { int i_x, i_y; - + for( i_y = 0; i_y < 8; i_y++ ) { for( i_x = 0; i_x < 8; i_x++ ) @@ -238,7 +253,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -248,7 +263,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -258,7 +273,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -268,7 +283,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -278,7 +293,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -288,7 +303,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -298,7 +313,7 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" "addl %2,%0\n\t" - + "movq (%0),%%mm1\n\t" "movq %%mm1,%%mm2\n\t" "punpckhbw %%mm7,%%mm1\n\t" @@ -308,15 +323,15 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "packuswb %%mm1,%%mm2\n\t" "movq %%mm2,(%0)\n\t" - "emms" - :"+r" (p_data): "r" (p_block),"r" (i_incr+8)); + //"emms" + :"+r" (p_data): "r" (p_block),"r" (i_incr+8)); } #endif -/******************************************************************************* +/***************************************************************************** * CopyBlock : copy a block - *******************************************************************************/ + *****************************************************************************/ #ifndef HAVE_MMX static __inline__ void CopyBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, yuv_data_t * p_data, int i_incr ) @@ -349,14 +364,14 @@ static __inline__ void CopyBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "movq 32(%1),%%mm0\n\t" "packuswb 40(%1),%%mm0\n\t" - "movq %%mm0,(%0)\n\t" + "movq %%mm0,(%0)\n\t" "addl %2,%0\n\t" - + "movq 48(%1),%%mm0\n\t" "packuswb 56(%1),%%mm0\n\t" "movq %%mm0,(%0)\n\t" "addl %2,%0\n\t" - + "movq 64(%1),%%mm0\n\t" "packuswb 72(%1),%%mm0\n\t" "movq %%mm0,(%0)\n\t" @@ -375,16 +390,16 @@ static __inline__ void CopyBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, "movq 112(%1),%%mm0\n\t" "packuswb 120(%1),%%mm0\n\t" "movq %%mm0,(%0)\n\t" - "emms" + //"emms" :"+r" (p_data): "r" (p_block),"r" (i_incr+8)); } #endif -/******************************************************************************* +/***************************************************************************** * vdec_DecodeMacroblock : decode a macroblock of a picture - *******************************************************************************/ -#define DECODEBLOCKS( OPBLOCK ) \ + *****************************************************************************/ +#define DECODEBLOCKSC( OPBLOCK ) \ { \ int i_b, i_mask; \ \ @@ -432,24 +447,84 @@ static __inline__ void CopyBlock( vdec_thread_t * p_vdec, dctelem_t * p_block, } \ } -#ifdef VDEC_SMP -static __inline__ void vdec_DecodeMacroblock( vdec_thread_t *p_vdec, macroblock_t * p_mb ) -#else -void vdec_DecodeMacroblock( vdec_thread_t *p_vdec, macroblock_t * p_mb ) -#endif +#define DECODEBLOCKSBW( OPBLOCK ) \ +{ \ + int i_b, i_mask; \ + \ + i_mask = 1 << (3 + p_mb->i_chroma_nb_blocks); \ + \ + /* luminance */ \ + for( i_b = 0; i_b < 4; i_b++, i_mask >>= 1 ) \ + { \ + if( p_mb->i_coded_block_pattern & i_mask ) \ + { \ + /* \ + * Inverse DCT (ISO/IEC 13818-2 section Annex A) \ + */ \ + (p_mb->pf_idct[i_b])( p_vdec, p_mb->ppi_blocks[i_b], \ + p_mb->pi_sparse_pos[i_b] ); \ + \ + /* \ + * Adding prediction and coefficient data (ISO/IEC 13818-2 \ + * section 7.6.8) \ + */ \ + OPBLOCK( p_vdec, p_mb->ppi_blocks[i_b], \ + p_mb->p_data[i_b], p_mb->i_addb_l_stride ); \ + } \ + } \ +} + +void vdec_DecodeMacroblockC ( vdec_thread_t *p_vdec, macroblock_t * p_mb ) +{ + if( !(p_mb->i_mb_type & MB_INTRA) ) + { + /* + * Motion Compensation (ISO/IEC 13818-2 section 7.6) + */ + if( p_mb->pf_motion == 0 ) + { + intf_ErrMsg( "vdec error: pf_motion set to NULL" ); + } + else + { + p_mb->pf_motion( p_mb ); + } + + DECODEBLOCKSC( AddBlock ) + } + else + { + DECODEBLOCKSC( CopyBlock ) + } + + /* + * Decoding is finished, release the macroblock and free + * unneeded memory. + */ + vpar_ReleaseMacroblock( &p_vdec->p_vpar->vfifo, p_mb ); +} + +void vdec_DecodeMacroblockBW ( vdec_thread_t *p_vdec, macroblock_t * p_mb ) { if( !(p_mb->i_mb_type & MB_INTRA) ) { /* * Motion Compensation (ISO/IEC 13818-2 section 7.6) */ - p_mb->pf_motion( p_mb ); + if( p_mb->pf_motion == 0 ) + { + intf_ErrMsg( "vdec error: pf_motion set to NULL" ); + } + else + { + p_mb->pf_motion( p_mb ); + } - DECODEBLOCKS( AddBlock ) + DECODEBLOCKSBW( AddBlock ) } else { - DECODEBLOCKS( CopyBlock ) + DECODEBLOCKSBW( CopyBlock ) } /* @@ -460,19 +535,20 @@ void vdec_DecodeMacroblock( vdec_thread_t *p_vdec, macroblock_t * p_mb ) } -/******************************************************************************* + +/***************************************************************************** * RunThread: video decoder thread - ******************************************************************************* + ***************************************************************************** * Video decoder thread. This function does only return when the thread is - * terminated. - *******************************************************************************/ + * terminated. + *****************************************************************************/ static void RunThread( vdec_thread_t *p_vdec ) { - intf_DbgMsg("vdec debug: running video decoder thread (%p) (pid == %i)\n", + intf_DbgMsg("vdec debug: running video decoder thread (%p) (pid == %i)", p_vdec, getpid()); - /* - * Initialize thread and free configuration + /* + * Initialize thread and free configuration */ p_vdec->b_error = vdec_InitThread( p_vdec ); if( p_vdec->b_error ) @@ -491,9 +567,9 @@ static void RunThread( vdec_thread_t *p_vdec ) if( (p_mb = vpar_GetMacroblock( &p_vdec->p_vpar->vfifo )) != NULL ) { - vdec_DecodeMacroblock( p_vdec, p_mb ); + vdec_DecodeMacroblockC ( p_vdec, p_mb ); } - } + } /* * Error loop