X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftheora.c;h=e7bf1fb8b75af17207b4719ad107eb3fca5b9c5d;hb=9d12fa3b456f70d7621038a47f6b46f100fe5644;hp=2f81c7140d8f0703205ed737d3e17763c3a180ab;hpb=88991a5ce9c2603bc5a9be0779353fe08b29e8f9;p=vlc diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 2f81c7140d..e7bf1fb8b7 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -2,7 +2,7 @@ * theora.c: theora decoder module making use of libtheora. ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: theora.c,v 1.13 2003/10/25 00:49:13 sam Exp $ + * $Id: theora.c,v 1.21 2003/12/22 02:24:51 sam Exp $ * * Authors: Gildas Bazin * @@ -24,15 +24,9 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* memcpy(), memset() */ - #include -#include #include -#include -#include -#include +#include "input_ext-plugins.h" #include @@ -58,17 +52,6 @@ struct decoder_sys_t theora_comment tc; /* theora comment header */ theora_state td; /* theora bitstream user comments */ - /* - * Output properties - */ - vout_thread_t *p_vout; - - /* - * Packetizer output properties - */ - sout_packetizer_input_t *p_sout_input; - sout_format_t sout_format; - /* * Common properties */ @@ -78,16 +61,14 @@ struct decoder_sys_t /***************************************************************************** * Local prototypes *****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int OpenPacketizer( vlc_object_t * ); +static int OpenDecoder ( vlc_object_t * ); +static int OpenPacketizer( vlc_object_t * ); +static void CloseDecoder ( vlc_object_t * ); -static int InitDecoder ( decoder_t * ); -static int RunDecoder ( decoder_t *, block_t * ); -static int EndDecoder ( decoder_t * ); +static void *DecodeBlock ( decoder_t *, block_t ** ); +static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** ); -static int ProcessPacket ( decoder_t *, ogg_packet *, mtime_t ); -static int DecodePacket ( decoder_t *, ogg_packet * ); -static int SendPacket ( decoder_t *, ogg_packet * ); +static picture_t *DecodePacket( decoder_t *, ogg_packet * ); static void ParseTheoraComments( decoder_t * ); static void theora_CopyPicture( decoder_t *, picture_t *, yuv_buffer * ); @@ -103,18 +84,18 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ); vlc_module_begin(); set_description( _("Theora video decoder") ); set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, NULL ); + set_callbacks( OpenDecoder, CloseDecoder ); add_shortcut( "theora" ); add_submodule(); set_description( _("Theora video packetizer") ); set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, NULL ); + set_callbacks( OpenPacketizer, CloseDecoder ); add_shortcut( "theora" ); add_submodule(); set_description( _("Theora video encoder") ); - set_capability( "video encoder", 100 ); + set_capability( "encoder", 100 ); set_callbacks( OpenEncoder, CloseEncoder ); add_shortcut( "theora" ); vlc_module_end(); @@ -125,18 +106,15 @@ vlc_module_end(); static int OpenDecoder( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; - if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('t','h','e','o') ) + if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','h','e','o') ) { return VLC_EGENERIC; } - p_dec->pf_init = InitDecoder; - p_dec->pf_decode = RunDecoder; - p_dec->pf_end = EndDecoder; - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_dec->p_sys = + if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { msg_Err( p_dec, "out of memory" ); @@ -144,6 +122,24 @@ static int OpenDecoder( vlc_object_t *p_this ) } p_dec->p_sys->b_packetizer = VLC_FALSE; + p_sys->i_pts = 0; + + /* Set output properties */ + p_dec->fmt_out.i_cat = VIDEO_ES; + p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0'); + + /* 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; + + /* Init supporting Theora structures needed in header parsing */ + theora_comment_init( &p_sys->tc ); + theora_info_init( &p_sys->ti ); + + p_sys->i_headers = 0; + return VLC_SUCCESS; } @@ -153,48 +149,29 @@ static int OpenPacketizer( vlc_object_t *p_this ) int i_ret = OpenDecoder( p_this ); - if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE; + if( i_ret == VLC_SUCCESS ) + { + p_dec->p_sys->b_packetizer = VLC_TRUE; + p_dec->fmt_out.i_codec = VLC_FOURCC( 't', 'h', 'e', 'o' ); + } return i_ret; } -/***************************************************************************** - * InitDecoder: Initalize the decoder - *****************************************************************************/ -static int InitDecoder( decoder_t *p_dec ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - - p_sys->i_pts = 0; - - p_sys->p_sout_input = NULL; - p_sys->sout_format.i_cat = VIDEO_ES; - p_sys->sout_format.i_fourcc = VLC_FOURCC( 't', 'h', 'e', 'o' ); - p_sys->sout_format.i_width = 0; - p_sys->sout_format.i_height = 0; - p_sys->sout_format.i_bitrate = 0; - p_sys->sout_format.i_extra_data = 0; - p_sys->sout_format.p_extra_data = NULL; - - /* Init supporting Theora structures needed in header parsing */ - theora_comment_init( &p_sys->tc ); - theora_info_init( &p_sys->ti ); - - p_sys->i_headers = 0; - - return VLC_SUCCESS; -} - /**************************************************************************** - * RunDecoder: the whole thing + * DecodeBlock: the whole thing **************************************************************************** * This function must be fed with ogg packets. ****************************************************************************/ -static int RunDecoder( decoder_t *p_dec, block_t *p_block ) +static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; ogg_packet oggpacket; - int i_ret; + + if( !pp_block || !*pp_block ) return NULL; + + p_block = *pp_block; /* Block to Ogg packet */ oggpacket.packet = p_block->p_buffer; @@ -211,55 +188,23 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { - msg_Err( p_dec->p_fifo, "This bitstream does not contain Theora " + msg_Err( p_dec, "This bitstream does not contain Theora " "video data" ); block_Release( p_block ); - return VLC_EGENERIC; + return NULL; } p_sys->i_headers++; + /* Set output properties */ + p_dec->fmt_out.video.i_width = p_sys->ti.width; + p_dec->fmt_out.video.i_height = p_sys->ti.height; - if( p_sys->b_packetizer ) - { - /* add a input for the stream ouput */ - p_sys->sout_format.i_width = p_sys->ti.width; - p_sys->sout_format.i_height = p_sys->ti.height; - - p_sys->p_sout_input = - sout_InputNew( p_dec, &p_sys->sout_format ); - - if( !p_sys->p_sout_input ) - { - msg_Err( p_dec, "cannot add a new stream" ); - block_Release( p_block ); - return VLC_EGENERIC; - } - } + if( p_sys->ti.aspect_denominator ) + p_dec->fmt_out.video.i_aspect = ((int64_t)VOUT_ASPECT_FACTOR) * + p_sys->ti.aspect_numerator / p_sys->ti.aspect_denominator; else - { - /* Initialize video output */ - int i_chroma, i_aspect; - - if( p_sys->ti.aspect_denominator ) - i_aspect = VOUT_ASPECT_FACTOR * p_sys->ti.aspect_numerator / - p_sys->ti.aspect_denominator; - else - i_aspect = VOUT_ASPECT_FACTOR * - p_sys->ti.frame_width / p_sys->ti.frame_height; - - i_chroma = VLC_FOURCC('Y','V','1','2'); - - p_sys->p_vout = - vout_Request( p_dec, NULL, - p_sys->ti.frame_width, p_sys->ti.frame_height, - i_chroma, i_aspect ); - if( p_sys->p_vout == NULL ) - { - msg_Err( p_dec, "failed to create video output" ); - block_Release( p_block ); - return VLC_EGENERIC; - } - } + p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * + p_sys->ti.frame_width / p_sys->ti.frame_height; msg_Dbg( p_dec, "%dx%d %.02f fps video, frame content " "is %dx%d with offset (%d,%d)", @@ -268,17 +213,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) p_sys->ti.frame_width, p_sys->ti.frame_height, p_sys->ti.offset_x, p_sys->ti.offset_y ); - if( p_sys->b_packetizer ) - { - i_ret = SendPacket( p_dec, &oggpacket ); - block_Release( p_block ); - return i_ret; - } - else - { - block_Release( p_block ); - return VLC_SUCCESS; - } + return ProcessPacket( p_dec, &oggpacket, pp_block ); } if( p_sys->i_headers == 1 ) @@ -287,23 +222,13 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { msg_Err( p_dec, "2nd Theora header is corrupted" ); - return VLC_EGENERIC; + return NULL; } p_sys->i_headers++; ParseTheoraComments( p_dec ); - if( p_sys->b_packetizer ) - { - i_ret = SendPacket( p_dec, &oggpacket ); - block_Release( p_block ); - return i_ret; - } - else - { - block_Release( p_block ); - return VLC_SUCCESS; - } + return ProcessPacket( p_dec, &oggpacket, pp_block ); } if( p_sys->i_headers == 2 ) @@ -314,7 +239,7 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { msg_Err( p_dec, "3rd Theora header is corrupted" ); - return VLC_EGENERIC; + return NULL; } p_sys->i_headers++; @@ -324,115 +249,84 @@ static int RunDecoder( decoder_t *p_dec, block_t *p_block ) theora_decode_init( &p_sys->td, &p_sys->ti ); } - if( p_sys->b_packetizer ) - { - i_ret = SendPacket( p_dec, &oggpacket ); - block_Release( p_block ); - return i_ret; - } - else - { - block_Release( p_block ); - return VLC_SUCCESS; - } + return ProcessPacket( p_dec, &oggpacket, pp_block ); } - i_ret = ProcessPacket( p_dec, &oggpacket, p_block->i_pts ); - block_Release( p_block ); - return i_ret; + return ProcessPacket( p_dec, &oggpacket, pp_block ); } /***************************************************************************** - * ProcessPacket: processes a Vorbis packet. + * ProcessPacket: processes a theora packet. *****************************************************************************/ -static int ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, - mtime_t i_pts ) +static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, + block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block = *pp_block; + void *p_buf; /* Date management */ - if( i_pts > 0 && i_pts != p_sys->i_pts ) + if( p_block->i_pts > 0 && p_block->i_pts != p_sys->i_pts ) { - p_sys->i_pts = i_pts; + p_sys->i_pts = p_block->i_pts; } if( p_sys->b_packetizer ) { - return SendPacket( p_dec, p_oggpacket ); + /* Date management */ + p_block->i_dts = p_block->i_pts = p_sys->i_pts; + + if( p_sys->i_headers >= 3 ) + p_block->i_length = p_sys->i_pts - p_block->i_pts; + else + p_block->i_length = 0; + + p_buf = p_block; } else { - return DecodePacket( p_dec, p_oggpacket ); - } -} - -/***************************************************************************** - * DecodePacket: decodes a Theora packet. - *****************************************************************************/ -static int DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) -{ - picture_t *p_pic; - yuv_buffer yuv; - - decoder_sys_t *p_sys = p_dec->p_sys; - - theora_decode_packetin( &p_sys->td, p_oggpacket ); - - /* Decode */ - theora_decode_YUVout( &p_sys->td, &yuv ); + if( p_sys->i_headers >= 3 ) + p_buf = DecodePacket( p_dec, p_oggpacket ); + else + p_buf = NULL; - /* Get a new picture */ - while( !(p_pic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 ) ) ) - { - if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) + if( p_block ) { - return VLC_EGENERIC; + block_Release( p_block ); + *pp_block = NULL; } - msleep( VOUT_OUTMEM_SLEEP ); } - if( !p_pic ) return VLC_EGENERIC; - - theora_CopyPicture( p_dec, p_pic, &yuv ); - - vout_DatePicture( p_sys->p_vout, p_pic, p_sys->i_pts ); - vout_DisplayPicture( p_sys->p_vout, p_pic ); /* Date management */ p_sys->i_pts += ( I64C(1000000) * p_sys->ti.fps_denominator / p_sys->ti.fps_numerator ); /* 1 frame per packet */ - return VLC_SUCCESS; + return p_buf; } /***************************************************************************** - * SendPacket: send an ogg packet to the stream output. + * DecodePacket: decodes a Theora packet. *****************************************************************************/ -static int SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) +static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) { decoder_sys_t *p_sys = p_dec->p_sys; + picture_t *p_pic; + yuv_buffer yuv; - sout_buffer_t *p_sout_buffer = - sout_BufferNew( p_sys->p_sout_input->p_sout, p_oggpacket->bytes ); - - if( !p_sout_buffer ) return VLC_EGENERIC; + theora_decode_packetin( &p_sys->td, p_oggpacket ); - p_dec->p_vlc->pf_memcpy( p_sout_buffer->p_buffer, - p_oggpacket->packet, - p_oggpacket->bytes ); + /* Decode */ + theora_decode_YUVout( &p_sys->td, &yuv ); - /* Date management */ - p_sout_buffer->i_dts = p_sout_buffer->i_pts = p_sys->i_pts; - p_sys->i_pts += ( I64C(1000000) * p_sys->ti.fps_denominator / - p_sys->ti.fps_numerator ); /* 1 frame per packet */ + /* Get a new picture */ + p_pic = p_dec->pf_vout_buffer_new( p_dec ); + if( !p_pic ) return NULL; - if( p_sys->i_headers >= 3 ) - p_sout_buffer->i_length = p_sys->i_pts - p_sout_buffer->i_pts; - else - p_sout_buffer->i_length = 0; + theora_CopyPicture( p_dec, p_pic, &yuv ); - sout_InputSendBuffer( p_sys->p_sout_input, p_sout_buffer ); + p_pic->date = p_sys->i_pts; - return VLC_SUCCESS; + return p_pic; } /***************************************************************************** @@ -442,7 +336,7 @@ static void ParseTheoraComments( decoder_t *p_dec ) { input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; input_info_category_t *p_cat = - input_InfoCategory( p_input, _("Theora Comment") ); + input_InfoCategory( p_input, _("Theora comment") ); int i = 0; char *psz_name, *psz_value, *psz_comment; while ( i < p_dec->p_sys->tc.comments ) @@ -467,26 +361,17 @@ static void ParseTheoraComments( decoder_t *p_dec ) } /***************************************************************************** - * EndDecoder: theora decoder destruction + * CloseDecoder: theora decoder destruction *****************************************************************************/ -static int EndDecoder( decoder_t *p_dec ) +static void CloseDecoder( vlc_object_t *p_this ) { + decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - if( !p_sys->b_packetizer ) - vout_Request( p_dec, p_sys->p_vout, 0, 0, 0, 0 ); - - if( p_sys->p_sout_input != NULL ) - { - sout_InputDelete( p_sys->p_sout_input ); - } - theora_info_clear( &p_sys->ti ); theora_comment_clear( &p_sys->tc ); free( p_sys ); - - return VLC_SUCCESS; } /***************************************************************************** @@ -534,7 +419,7 @@ struct encoder_sys_t /* * Input properties */ - int i_headers; + vlc_bool_t b_headers; /* * Theora properties @@ -543,12 +428,6 @@ struct encoder_sys_t theora_comment tc; /* theora comment header */ theora_state td; /* theora bitstream user comments */ - /* - * Packetizer output properties - */ - sout_packetizer_input_t *p_sout_input; - sout_format_t sout_format; - /* * Common properties */ @@ -563,8 +442,17 @@ static int OpenEncoder( vlc_object_t *p_this ) encoder_t *p_enc = (encoder_t *)p_this; encoder_sys_t *p_sys = p_enc->p_sys; - if( p_enc->i_fourcc != VLC_FOURCC('t','h','e','o') ) + if( p_enc->fmt_out.i_codec != VLC_FOURCC('t','h','e','o') ) + { + return VLC_EGENERIC; + } + + if( p_enc->fmt_in.video.i_width % 16 || + p_enc->fmt_in.video.i_height % 16 ) { + msg_Err( p_enc, "Theora video encoding requires dimensions which are " + "multiples of 16. Which is not the case here (%dx%d)", + p_enc->fmt_in.video.i_width, p_enc->fmt_in.video.i_height ); return VLC_EGENERIC; } @@ -578,30 +466,37 @@ static int OpenEncoder( vlc_object_t *p_this ) p_enc->pf_header = Headers; p_enc->pf_encode_video = Encode; - p_enc->format.video.i_chroma = VLC_FOURCC('I','4','2','0'); + p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0'); #define frame_x_offset 0 #define frame_y_offset 0 #define video_hzn 25 #define video_hzd 1 -#define video_an 4 -#define video_ad 3 #define video_q 5 theora_info_init( &p_sys->ti ); - p_sys->ti.width = p_enc->format.video.i_width; - p_sys->ti.height = p_enc->format.video.i_height; - p_sys->ti.frame_width = p_enc->format.video.i_width; - p_sys->ti.frame_height = p_enc->format.video.i_height; + p_sys->ti.width = p_enc->fmt_in.video.i_width; + p_sys->ti.height = p_enc->fmt_in.video.i_height; + p_sys->ti.frame_width = p_enc->fmt_in.video.i_width; + p_sys->ti.frame_height = p_enc->fmt_in.video.i_height; p_sys->ti.offset_x = frame_x_offset; p_sys->ti.offset_y = frame_y_offset; p_sys->ti.fps_numerator = video_hzn; p_sys->ti.fps_denominator = video_hzd; - p_sys->ti.aspect_numerator = video_an; - p_sys->ti.aspect_denominator = video_ad; - p_sys->ti.colorspace = not_specified; - p_sys->ti.target_bitrate = p_enc->i_bitrate; + + if( p_enc->fmt_in.video.i_aspect ) + { + p_sys->ti.aspect_numerator = p_enc->fmt_in.video.i_aspect; + p_sys->ti.aspect_denominator = VOUT_ASPECT_FACTOR; + } + else + { + p_sys->ti.aspect_numerator = 4; + p_sys->ti.aspect_denominator = 3; + } + + p_sys->ti.target_bitrate = p_enc->fmt_out.i_bitrate; p_sys->ti.quality = video_q; p_sys->ti.dropframes_p = 0; @@ -609,7 +504,7 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->ti.keyframe_auto_p = 1; p_sys->ti.keyframe_frequency = 64; p_sys->ti.keyframe_frequency_force = 64; - p_sys->ti.keyframe_data_target_bitrate = p_enc->i_bitrate * 1.5; + p_sys->ti.keyframe_data_target_bitrate = p_enc->fmt_out.i_bitrate * 1.5; p_sys->ti.keyframe_auto_threshold = 80; p_sys->ti.keyframe_mindistance = 8; p_sys->ti.noise_sensitivity = 1; @@ -618,7 +513,7 @@ static int OpenEncoder( vlc_object_t *p_this ) theora_info_clear( &p_sys->ti ); theora_comment_init( &p_sys->tc ); - p_sys->i_headers = 0; + p_sys->b_headers = VLC_FALSE; return VLC_SUCCESS; } @@ -631,35 +526,41 @@ static int OpenEncoder( vlc_object_t *p_this ) static block_t *Headers( encoder_t *p_enc ) { encoder_sys_t *p_sys = p_enc->p_sys; - ogg_packet oggpacket; - block_t *p_block; + block_t *p_chain = NULL; /* Create theora headers */ - switch( p_sys->i_headers ) + if( !p_sys->b_headers ) { - case 0: - theora_encode_header( &p_sys->td, &oggpacket ); - break; - case 1: - theora_encode_comment( &p_sys->tc, &oggpacket ); - break; - case 2: - theora_encode_tables( &p_sys->td, &oggpacket ); - break; - default: - break; - } + ogg_packet oggpackets; + int i; + block_t *p_block; + + /* Ogg packet to block */ + for( i = 0; i < 3; i++ ) + { + switch( i ) + { + case 0: + theora_encode_header( &p_sys->td, &oggpackets ); + break; + case 1: + theora_encode_comment( &p_sys->tc, &oggpackets ); + break; + case 2: + theora_encode_tables( &p_sys->td, &oggpackets ); + break; + } - p_sys->i_headers++; - if( p_sys->i_headers > 3 ) return NULL; + p_block = block_New( p_enc, oggpackets.bytes ); + memcpy( p_block->p_buffer, oggpackets.packet, oggpackets.bytes ); + p_block->i_dts = p_block->i_pts = p_block->i_length = 0; + block_ChainAppend( &p_chain, p_block ); + } - /* Ogg packet to block */ - p_block = block_New( p_enc, oggpacket.bytes ); - p_block->p_buffer = oggpacket.packet; - p_block->i_buffer = oggpacket.bytes; - p_block->i_dts = oggpacket.granulepos; + p_sys->b_headers = VLC_TRUE; + } - return p_block; + return p_chain; } /**************************************************************************** @@ -689,7 +590,11 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) yuv.u = p_pict->p[1].p_pixels; yuv.v = p_pict->p[2].p_pixels; - theora_encode_YUVin( &p_sys->td, &yuv ); + if( theora_encode_YUVin( &p_sys->td, &yuv ) < 0 ) + { + msg_Warn( p_enc, "failed encoding a frame" ); + return NULL; + } theora_encode_packetout( &p_sys->td, 0, &oggpacket );