X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Frawvideo.c;h=857a44ff7d1941ca6d84be91b1aabcb466a6fbb8;hb=e1f5cdc4ffad50fd595dd0b29808086792b2d0f0;hp=de85678a52872cc12989423010f541348ed4a4d5;hpb=15fb148536e9d870b6b2c9c2148fd1de6516ba0e;p=vlc diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c index de85678a52..857a44ff7d 100644 --- a/modules/codec/rawvideo.c +++ b/modules/codec/rawvideo.c @@ -1,8 +1,8 @@ /***************************************************************************** - * rawvideo.c: Pseudo audio decoder; for raw video data + * rawvideo.c: Pseudo video decoder/packetizer for raw video data ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: rawvideo.c,v 1.3 2003/04/27 17:53:20 gbazin Exp $ + * $Id: rawvideo.c,v 1.11 2004/01/07 19:20:29 gbazin Exp $ * * Authors: Laurent Aimar * @@ -25,60 +25,63 @@ * Preamble *****************************************************************************/ #include -#include #include -#include -#include /* malloc(), free() */ -#include /* strdup() */ -#include "codecs.h" /***************************************************************************** - * Local prototypes + * decoder_sys_t : raw video decoder descriptor *****************************************************************************/ - -typedef struct +struct decoder_sys_t { - /* Input properties */ - decoder_fifo_t *p_fifo; - int i_raw_size; + /* Module mode */ + vlc_bool_t b_packetizer; - /* Output properties */ + /* + * Input properties + */ + int i_raw_size; - mtime_t pts; + /* + * Common properties + */ + mtime_t i_pts; - vout_thread_t *p_vout; +}; -} vdec_thread_t; +/**************************************************************************** + * Local prototypes + ****************************************************************************/ +static int OpenDecoder ( vlc_object_t * ); +static int OpenPacketizer( vlc_object_t * ); +static void CloseDecoder ( vlc_object_t * ); -static int OpenDecoder ( vlc_object_t * ); +static void *DecodeBlock ( decoder_t *, block_t ** ); -static int RunDecoder ( decoder_fifo_t * ); -static int InitThread ( vdec_thread_t * ); -static void DecodeThread ( vdec_thread_t * ); -static void EndThread ( vdec_thread_t * ); +static picture_t *DecodeFrame( decoder_t *, block_t * ); +static block_t *SendFrame ( decoder_t *, block_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ - vlc_module_begin(); - set_description( _("Pseudo Raw Video decoder") ); + set_description( _("Pseudo raw video decoder") ); set_capability( "decoder", 50 ); - set_callbacks( OpenDecoder, NULL ); -vlc_module_end(); + set_callbacks( OpenDecoder, CloseDecoder ); + add_submodule(); + set_description( _("Pseudo raw video packetizer") ); + set_capability( "packetizer", 100 ); + set_callbacks( OpenPacketizer, CloseDecoder ); +vlc_module_end(); /***************************************************************************** * OpenDecoder: probe the decoder and return score - ***************************************************************************** - * Tries to launch a decoder and return score so that the interface is able - * to choose. *****************************************************************************/ static int OpenDecoder( vlc_object_t *p_this ) { - decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this; + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; - switch( p_fifo->i_fourcc ) + switch( p_dec->fmt_in.i_codec ) { /* Planar YUV */ case VLC_FOURCC('I','4','4','4'): @@ -89,240 +92,197 @@ static int OpenDecoder( vlc_object_t *p_this ) case VLC_FOURCC('I','4','1','1'): case VLC_FOURCC('I','4','1','0'): - /* Packed YUV */ + /* Packed YUV */ case VLC_FOURCC('Y','U','Y','2'): case VLC_FOURCC('U','Y','V','Y'): - /* RGB */ + /* RGB */ case VLC_FOURCC('R','V','3','2'): case VLC_FOURCC('R','V','2','4'): case VLC_FOURCC('R','V','1','6'): case VLC_FOURCC('R','V','1','5'): - - p_fifo->pf_run = RunDecoder; - return VLC_SUCCESS; + break; default: return VLC_EGENERIC; } -} - -/***************************************************************************** - * RunDecoder: this function is called just after the thread is created - *****************************************************************************/ -static int RunDecoder( decoder_fifo_t *p_fifo ) -{ - vdec_thread_t *p_vdec; - int b_error; - - if( !( p_vdec = malloc( sizeof( vdec_thread_t ) ) ) ) - { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return( -1 ); - } - memset( p_vdec, 0, sizeof( vdec_thread_t ) ); - - p_vdec->p_fifo = p_fifo; - - if( InitThread( p_vdec ) != 0 ) + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_dec->p_sys = p_sys = + (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { - DecoderError( p_fifo ); - return( -1 ); + msg_Err( p_dec, "out of memory" ); + return VLC_EGENERIC; } + /* Misc init */ + p_dec->p_sys->b_packetizer = VLC_FALSE; + p_sys->i_pts = 0; - while( ( !p_vdec->p_fifo->b_die )&&( !p_vdec->p_fifo->b_error ) ) + if( p_dec->fmt_in.video.i_width <= 0 || + p_dec->fmt_in.video.i_height <= 0 ) { - DecodeThread( p_vdec ); + msg_Err( p_dec, "invalid display size %dx%d", + p_dec->fmt_in.video.i_width, p_dec->fmt_in.video.i_height ); + return VLC_EGENERIC; } - - if( ( b_error = p_vdec->p_fifo->b_error ) ) + /* Find out p_vdec->i_raw_size */ + vout_InitFormat( &p_dec->fmt_out.video, p_dec->fmt_in.i_codec, + p_dec->fmt_in.video.i_width, + p_dec->fmt_in.video.i_height, + p_dec->fmt_in.video.i_aspect ); + p_sys->i_raw_size = p_dec->fmt_out.video.i_bits_per_pixel * + p_dec->fmt_out.video.i_width * p_dec->fmt_out.video.i_height / 8; + + /* Set output properties */ + p_dec->fmt_out.i_cat = VIDEO_ES; + p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec; + //if( !p_dec->fmt_in.video.i_aspect ) { - DecoderError( p_vdec->p_fifo ); + p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * + p_dec->fmt_out.video.i_width / p_dec->fmt_out.video.i_height; } - EndThread( p_vdec ); - if( b_error ) - { - return( -1 ); - } + /* Set callbacks */ + p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **)) + DecodeBlock; + p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) + DecodeBlock; - return( 0 ); + return VLC_SUCCESS; } +static int OpenPacketizer( vlc_object_t *p_this ) +{ + decoder_t *p_dec = (decoder_t*)p_this; -#define FREE( p ) if( p ) { free( p ); p = NULL; } + int i_ret = OpenDecoder( p_this ); + if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE; -/***************************************************************************** - * InitThread: initialize data before entering main loop - *****************************************************************************/ -static int InitThread( vdec_thread_t * p_vdec ) + return i_ret; +} + +/**************************************************************************** + * DecodeBlock: the whole thing + **************************************************************************** + * This function must be fed with complete frames. + ****************************************************************************/ +static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { - picture_t *p_pic; - int i; + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; + void *p_buf; + + if( !pp_block || !*pp_block ) return NULL; -#define bih ((BITMAPINFOHEADER*)p_vdec->p_fifo->p_bitmapinfoheader) - if( bih == NULL ) + p_block = *pp_block; + + if( !p_sys->i_pts && !p_block->i_pts && !p_block->i_dts ) { - msg_Err( p_vdec->p_fifo, - "info missing, fatal" ); - return( VLC_EGENERIC ); + /* We've just started the stream, wait for the first PTS. */ + block_Release( p_block ); + return NULL; } - if( bih->biWidth <= 0 || bih->biHeight <= 0 ) + + /* Date management */ + if( p_block->i_pts > 0 || p_block->i_dts > 0 ) { - msg_Err( p_vdec->p_fifo, - "invalid display size %dx%d", - bih->biWidth, bih->biHeight ); - return( VLC_EGENERIC ); + if( p_block->i_pts > 0 ) p_sys->i_pts = p_block->i_pts; + else if( p_block->i_dts > 0 ) p_sys->i_pts = p_block->i_dts; } - p_vdec->p_vout = vout_Request( p_vdec->p_fifo, NULL, - bih->biWidth, bih->biHeight, - p_vdec->p_fifo->i_fourcc, - VOUT_ASPECT_FACTOR * bih->biWidth / - bih->biHeight ); - - if( p_vdec->p_vout == NULL ) + if( p_block->i_buffer < p_sys->i_raw_size ) { - msg_Err( p_vdec->p_fifo, "failled created vout" ); - return( VLC_EGENERIC ); + msg_Warn( p_dec, "invalid frame size (%d < %d)", + p_block->i_buffer, p_sys->i_raw_size ); + + block_Release( p_block ); + return NULL; } - /* Get a 1 picture to be able to compute p_vdec->i_raw_size */ - p_pic = vout_CreatePicture( p_vdec->p_vout, 0, 0, 0 ); - if( p_pic == NULL ) + if( p_sys->b_packetizer ) { - msg_Err( p_vdec->p_fifo, "failled to get a vout picture" ); - return( VLC_EGENERIC ); + p_buf = SendFrame( p_dec, p_block ); } - - p_vdec->i_raw_size = 0; - for( i = 0; i < p_pic->i_planes; i++ ) + else { - p_vdec->i_raw_size += p_pic->p[i].i_lines * p_pic->p[i].i_visible_pitch - * p_pic->p[i].i_pixel_pitch; + p_buf = DecodeFrame( p_dec, p_block ); } - vout_DestroyPicture( p_vdec->p_vout, p_pic ); + /* Date management: 1 frame per packet */ + p_sys->i_pts += ( I64C(1000000) * 1.0 / 25 /*FIXME*/ ); + *pp_block = NULL; - return( VLC_SUCCESS ); -#undef bih + return p_buf; } - -static void FillPicture( pes_packet_t *p_pes, picture_t *p_pic ) +/***************************************************************************** + * FillPicture: + *****************************************************************************/ +static void FillPicture( decoder_t *p_dec, block_t *p_block, picture_t *p_pic ) { - int i_plane; - - data_packet_t *p_data; - uint8_t *p_src; - int i_src; + uint8_t *p_src, *p_dst; + int i_src, i_plane, i_line, i_width; - p_data = p_pes->p_first; - p_src = p_data->p_payload_start; - i_src = p_data->p_payload_end - p_data->p_payload_start; + p_src = p_block->p_buffer; + i_src = p_block->i_buffer; for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) { - - uint8_t *p_dst; - int i_dst; - p_dst = p_pic->p[i_plane].p_pixels; - i_dst = p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_lines; + i_width = p_pic->p[i_plane].i_visible_pitch; - while( i_dst > 0 ) + for( i_line = 0; i_line < p_pic->p[i_plane].i_lines; i_line++ ) { - int i_copy; - - i_copy = __MIN( i_src, i_dst ); - if( i_copy > 0 ) - { - memcpy( p_dst, p_src, i_copy ); - } - i_dst -= i_copy; - p_dst += i_copy; - - i_src -= i_copy; - if( i_src <= 0 ) - { - do - { - p_data = p_data->p_next; - if( p_data == NULL ) - { - return; - } - p_src = p_data->p_payload_start; - i_src = p_data->p_payload_end - p_data->p_payload_start; - } while( i_src <= 0 ); - } + p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width ); + p_src += i_width; + p_dst += p_pic->p[i_plane].i_pitch; } } } /***************************************************************************** - * DecodeThread: decodes a frame + * DecodeFrame: decodes a video frame. *****************************************************************************/ -static void DecodeThread( vdec_thread_t *p_vdec ) +static picture_t *DecodeFrame( decoder_t *p_dec, block_t *p_block ) { - int i_size; - pes_packet_t *p_pes; - picture_t *p_pic; - - /* **** get frame **** */ - input_ExtractPES( p_vdec->p_fifo, &p_pes ); - if( !p_pes ) - { - p_vdec->p_fifo->b_error = 1; - return; - } - i_size = p_pes->i_pes_size; + decoder_sys_t *p_sys = p_dec->p_sys; + picture_t *p_pic; - if( i_size < p_vdec->i_raw_size ) + /* Get a new picture */ + p_pic = p_dec->pf_vout_buffer_new( p_dec ); + if( !p_pic ) { - msg_Warn( p_vdec->p_fifo, "invalid frame size (%d < %d)", i_size, p_vdec->i_raw_size ); - input_DeletePES( p_vdec->p_fifo->p_packets_mgt, p_pes ); - return; + block_Release( p_block ); + return NULL; } - /* **** get video picture **** */ - while( !(p_pic = vout_CreatePicture( p_vdec->p_vout, 0, 0, 0 ) ) ) - { - if( p_vdec->p_fifo->b_die || p_vdec->p_fifo->b_error ) - { - return; - } - msleep( VOUT_OUTMEM_SLEEP ); - } + FillPicture( p_dec, p_block, p_pic ); + p_pic->date = p_sys->i_pts; - /* **** fill p_pic **** */ - FillPicture( p_pes, p_pic ); + block_Release( p_block ); + return p_pic; +} - /* **** display p_pic **** */ - vout_DatePicture( p_vdec->p_vout, p_pic, p_pes->i_pts); - vout_DisplayPicture( p_vdec->p_vout, p_pic ); +/***************************************************************************** + * SendFrame: send a video frame to the stream output. + *****************************************************************************/ +static block_t *SendFrame( decoder_t *p_dec, block_t *p_block ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + p_block->i_dts = p_block->i_pts = p_sys->i_pts; - input_DeletePES( p_vdec->p_fifo->p_packets_mgt, p_pes ); + return p_block; } - /***************************************************************************** - * EndThread : faad decoder thread destruction + * CloseDecoder: decoder destruction *****************************************************************************/ -static void EndThread (vdec_thread_t *p_vdec) +static void CloseDecoder( vlc_object_t *p_this ) { - if( p_vdec->p_vout ) - { - vout_Request( p_vdec->p_fifo, p_vdec->p_vout, 0, 0, 0, 0 ); - } - - msg_Dbg( p_vdec->p_fifo, "raw video decoder closed" ); - - free( p_vdec ); + decoder_t *p_dec = (decoder_t*)p_this; + free( p_dec->p_sys ); }