X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftheora.c;h=48ffd2cccd36a440e5c5ed208db83d8f8f595947;hb=09d997200c05de78bb05ea4e2219fec752aef5a9;hp=64c7b42a5abe570a291ce5c855bdd46ee712823a;hpb=e1c7565e47303f230be11db082d5b0c4cb8761de;p=vlc diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 64c7b42a5a..48ffd2cccd 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.3 2002/11/28 21:00:48 gbazin Exp $ + * $Id: theora.c,v 1.14 2003/11/16 21:07:30 gbazin Exp $ * * Authors: Gildas Bazin * @@ -10,7 +10,7 @@ * 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 @@ -24,66 +24,82 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include - #include /* malloc(), free() */ #include /* memcpy(), memset() */ +#include +#include +#include + #include #include /***************************************************************************** - * dec_thread_t : theora decoder thread descriptor + * decoder_sys_t : theora decoder descriptor *****************************************************************************/ -typedef struct dec_thread_t +struct decoder_sys_t { + /* Module mode */ + vlc_bool_t b_packetizer; + /* - * Thread properties + * Input properties */ - vlc_thread_t thread_id; /* id for thread functions */ + int i_headers; /* * Theora properties */ theora_info ti; /* theora bitstream settings */ + theora_comment tc; /* theora comment header */ theora_state td; /* theora bitstream user comments */ /* - * Input properties + * Common properties */ - decoder_fifo_t *p_fifo; /* stores the PES stream data */ - pes_packet_t *p_pes; /* current PES we are decoding */ - - /* - * Output properties - */ - vout_thread_t *p_vout; - -} dec_thread_t; + mtime_t i_pts; +}; /***************************************************************************** * Local prototypes *****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int RunDecoder ( decoder_fifo_t * ); -static void CloseDecoder ( dec_thread_t * ); +static int OpenDecoder ( vlc_object_t * ); +static int OpenPacketizer( vlc_object_t * ); +static void CloseDecoder ( vlc_object_t * ); + +static void *DecodeBlock ( decoder_t *, block_t ** ); +static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** ); + +static picture_t *DecodePacket( decoder_t *, ogg_packet * ); -static void DecodePacket ( dec_thread_t * ); -static int GetOggPacket ( dec_thread_t *, ogg_packet *, mtime_t * ); +static void ParseTheoraComments( decoder_t * ); +static void theora_CopyPicture( decoder_t *, picture_t *, yuv_buffer * ); -static void theora_CopyPicture( dec_thread_t *, picture_t *, yuv_buffer * ); +static int OpenEncoder( vlc_object_t *p_this ); +static void CloseEncoder( vlc_object_t *p_this ); +static block_t *Headers( encoder_t *p_enc ); +static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("Theora decoder module") ); + 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, CloseDecoder ); + add_shortcut( "theora" ); + + add_submodule(); + set_description( _("Theora video encoder") ); + set_capability( "encoder", 100 ); + set_callbacks( OpenEncoder, CloseEncoder ); add_shortcut( "theora" ); vlc_module_end(); @@ -92,208 +108,492 @@ vlc_module_end(); *****************************************************************************/ 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; - if( 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_fifo->pf_run = RunDecoder; - return VLC_SUCCESS; -} -/***************************************************************************** - * RunDecoder: the theora decoder - *****************************************************************************/ -static int RunDecoder( decoder_fifo_t *p_fifo ) -{ - dec_thread_t *p_dec; - ogg_packet oggpacket; - int i_chroma, i_aspect; - mtime_t i_pts; - - /* Allocate the memory needed to store the thread's structure */ - if( (p_dec = (dec_thread_t *)malloc (sizeof(dec_thread_t)) ) - == NULL) + /* 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 ) { - msg_Err( p_fifo, "out of memory" ); - goto error; + msg_Err( p_dec, "out of memory" ); + return VLC_EGENERIC; } + 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 ); - /* Initialize the thread properties */ - memset( p_dec, 0, sizeof(dec_thread_t) ); - p_dec->p_fifo = p_fifo; - p_dec->p_pes = NULL; - p_dec->p_vout = NULL; + p_sys->i_headers = 0; + + return VLC_SUCCESS; +} + +static int OpenPacketizer( vlc_object_t *p_this ) +{ + decoder_t *p_dec = (decoder_t*)p_this; - /* Take care of the initial Theora header */ - if( GetOggPacket( p_dec, &oggpacket, &i_pts ) != VLC_SUCCESS ) - goto error; + int i_ret = OpenDecoder( p_this ); - oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ - if( theora_decode_header( &p_dec->ti, &oggpacket ) < 0 ) + if( i_ret == VLC_SUCCESS ) { - msg_Err( p_dec->p_fifo, "This bitstream does not contain Theora " - "video data"); - goto error; + p_dec->p_sys->b_packetizer = VLC_TRUE; + p_dec->fmt_out.i_codec = VLC_FOURCC( 't', 'h', 'e', 'o' ); } - /* Initialize decoder */ - theora_decode_init( &p_dec->td, &p_dec->ti ); - msg_Dbg( p_dec->p_fifo, "%dx%d %.02f fps video", - p_dec->ti.width, p_dec->ti.height, - (double)p_dec->ti.fps_numerator/p_dec->ti.fps_denominator); + return i_ret; +} - /* Initialize video output */ - if( p_dec->ti.aspect_denominator ) - i_aspect = VOUT_ASPECT_FACTOR * p_dec->ti.aspect_numerator / - p_dec->ti.aspect_denominator; - else - i_aspect = VOUT_ASPECT_FACTOR * p_dec->ti.width / p_dec->ti.height; +/**************************************************************************** + * DecodeBlock: the whole thing + **************************************************************************** + * This function must be fed with ogg packets. + ****************************************************************************/ +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; + + if( !pp_block || !*pp_block ) return NULL; - i_chroma = VLC_FOURCC('Y','V','1','2'); + p_block = *pp_block; - p_dec->p_vout = vout_Request( p_dec->p_fifo, p_dec->p_vout, - p_dec->ti.width, p_dec->ti.height, - i_chroma, i_aspect ); + /* Block to Ogg packet */ + oggpacket.packet = p_block->p_buffer; + oggpacket.bytes = p_block->i_buffer; + oggpacket.granulepos = p_block->i_dts; + oggpacket.b_o_s = 0; + oggpacket.e_o_s = 0; + oggpacket.packetno = 0; - /* theora decoder thread's main loop */ - while( (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) ) + if( p_sys->i_headers == 0 ) { - DecodePacket( p_dec ); + /* Take care of the initial Theora header */ + + 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, "This bitstream does not contain Theora " + "video data" ); + block_Release( p_block ); + 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->ti.aspect_denominator ) + p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * + p_sys->ti.aspect_numerator / p_sys->ti.aspect_denominator; + else + 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)", + p_sys->ti.width, p_sys->ti.height, + (double)p_sys->ti.fps_numerator/p_sys->ti.fps_denominator, + p_sys->ti.frame_width, p_sys->ti.frame_height, + p_sys->ti.offset_x, p_sys->ti.offset_y ); + + return ProcessPacket( p_dec, &oggpacket, pp_block ); } - /* If b_error is set, the theora decoder thread enters the error loop */ - if( p_dec->p_fifo->b_error ) + if( p_sys->i_headers == 1 ) { - DecoderError( p_dec->p_fifo ); - } + /* The next packet in order is the comments header */ + if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) + { + msg_Err( p_dec, "2nd Theora header is corrupted" ); + return NULL; + } + p_sys->i_headers++; - /* End of the theora decoder thread */ - CloseDecoder( p_dec ); + ParseTheoraComments( p_dec ); - return 0; + return ProcessPacket( p_dec, &oggpacket, pp_block ); + } - error: - DecoderError( p_fifo ); - if( p_dec ) + if( p_sys->i_headers == 2 ) { - if( p_dec->p_fifo ) - p_dec->p_fifo->b_error = 1; + /* The next packet in order is the codebooks header + We need to watch out that this packet is not missing as a + missing or corrupted header is fatal. */ + if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) + { + msg_Err( p_dec, "3rd Theora header is corrupted" ); + return NULL; + } + p_sys->i_headers++; + + if( !p_sys->b_packetizer ) + { + /* We have all the headers, initialize decoder */ + theora_decode_init( &p_sys->td, &p_sys->ti ); + } - /* End of the theora decoder thread */ - CloseDecoder( p_dec ); + return ProcessPacket( p_dec, &oggpacket, pp_block ); } - return -1; + return ProcessPacket( p_dec, &oggpacket, pp_block ); } /***************************************************************************** - * DecodePacket: decodes a Theora packet. + * ProcessPacket: processes a theora packet. *****************************************************************************/ -static void DecodePacket( dec_thread_t *p_dec ) +static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, + block_t **pp_block ) { - ogg_packet oggpacket; - picture_t *p_pic; - mtime_t i_pts; - yuv_buffer yuv; + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block = *pp_block; + void *p_buf; - if( GetOggPacket( p_dec, &oggpacket, &i_pts ) != VLC_SUCCESS ) + /* Date management */ + if( p_block->i_pts > 0 && p_block->i_pts != p_sys->i_pts ) { - /* This should mean an eos */ - return; + p_sys->i_pts = p_block->i_pts; } - theora_decode_packetin( &p_dec->td, &oggpacket ); + if( p_sys->b_packetizer ) + { + /* Date management */ + p_block->i_dts = p_block->i_pts = p_sys->i_pts; - /* Decode */ - theora_decode_YUVout( &p_dec->td, &yuv ); + if( p_sys->i_headers >= 3 ) + p_block->i_length = p_sys->i_pts - p_block->i_pts; + else + p_block->i_length = 0; - /* Get a new picture */ - while( !(p_pic = vout_CreatePicture( p_dec->p_vout, 0, 0, 0 ) ) ) + p_buf = p_block; + } + else { - if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) + if( p_sys->i_headers >= 3 ) + p_buf = DecodePacket( p_dec, p_oggpacket ); + else + p_buf = NULL; + + if( p_block ) { - return; + block_Release( p_block ); + *pp_block = NULL; } - msleep( VOUT_OUTMEM_SLEEP ); } - if( !p_pic ) - return; - theora_CopyPicture( p_dec, p_pic, &yuv ); + /* Date management */ + p_sys->i_pts += ( I64C(1000000) * p_sys->ti.fps_denominator / + p_sys->ti.fps_numerator ); /* 1 frame per packet */ - vout_DatePicture( p_dec->p_vout, p_pic, i_pts ); - vout_DisplayPicture( p_dec->p_vout, p_pic ); + return p_buf; } /***************************************************************************** - * GetOggPacket: get the following theora packet from the stream and send back - * the result in an ogg packet (for easy decoding by libtheora). - ***************************************************************************** - * Returns VLC_EGENERIC in case of eof. + * DecodePacket: decodes a Theora packet. *****************************************************************************/ -static int GetOggPacket( dec_thread_t *p_dec, ogg_packet *p_oggpacket, - mtime_t *p_pts ) +static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) { - if( p_dec->p_pes ) input_DeletePES( p_dec->p_fifo->p_packets_mgt, - p_dec->p_pes ); + decoder_sys_t *p_sys = p_dec->p_sys; + picture_t *p_pic; + yuv_buffer yuv; - input_ExtractPES( p_dec->p_fifo, &p_dec->p_pes ); - if( !p_dec->p_pes ) return VLC_EGENERIC; + theora_decode_packetin( &p_sys->td, p_oggpacket ); - p_oggpacket->packet = p_dec->p_pes->p_first->p_payload_start; - p_oggpacket->bytes = p_dec->p_pes->i_pes_size; - p_oggpacket->granulepos = p_dec->p_pes->i_dts; - p_oggpacket->b_o_s = 0; - p_oggpacket->e_o_s = 0; - p_oggpacket->packetno = 0; + /* Decode */ + theora_decode_YUVout( &p_sys->td, &yuv ); - *p_pts = p_dec->p_pes->i_pts; + /* Get a new picture */ + p_pic = p_dec->pf_vout_buffer_new( p_dec ); + if( !p_pic ) return NULL; - return VLC_SUCCESS; + theora_CopyPicture( p_dec, p_pic, &yuv ); + + p_pic->date = p_sys->i_pts; + + return p_pic; } /***************************************************************************** - * CloseDecoder: theora decoder destruction + * ParseTheoraComments: FIXME should be done in demuxer *****************************************************************************/ -static void CloseDecoder( dec_thread_t * p_dec ) +static void ParseTheoraComments( decoder_t *p_dec ) { - - if( 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") ); + int i = 0; + char *psz_name, *psz_value, *psz_comment; + while ( i < p_dec->p_sys->tc.comments ) { - if( p_dec->p_pes ) - input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_dec->p_pes ); + psz_comment = strdup( p_dec->p_sys->tc.user_comments[i] ); + if( !psz_comment ) + { + msg_Warn( p_dec, "Out of memory" ); + break; + } + psz_name = psz_comment; + psz_value = strchr( psz_comment, '=' ); + if( psz_value ) + { + *psz_value = '\0'; + psz_value++; + input_AddInfo( p_cat, psz_name, psz_value ); + } + free( psz_comment ); + i++; + } +} - vout_Request( p_dec->p_fifo, p_dec->p_vout, 0, 0, 0, 0 ); +/***************************************************************************** + * CloseDecoder: theora decoder destruction + *****************************************************************************/ +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; - free( p_dec ); - } + theora_info_clear( &p_sys->ti ); + theora_comment_clear( &p_sys->tc ); + + free( p_sys ); } /***************************************************************************** * theora_CopyPicture: copy a picture from theora internal buffers to a * picture_t structure. *****************************************************************************/ -static void theora_CopyPicture( dec_thread_t *p_dec, picture_t *p_pic, +static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic, yuv_buffer *yuv ) { int i_plane, i_line, i_width, i_dst_stride, i_src_stride; - u8 *p_dst, *p_src; + int i_src_xoffset, i_src_yoffset; + uint8_t *p_dst, *p_src; for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) { p_dst = p_pic->p[i_plane].p_pixels; p_src = i_plane ? (i_plane - 1 ? yuv->v : yuv->u ) : yuv->y; i_width = p_pic->p[i_plane].i_visible_pitch; - i_dst_stride = p_pic->p[i_plane].i_pitch; - i_src_stride = i_plane ? yuv->uv_stride : yuv->y_stride; + i_dst_stride = p_pic->p[i_plane].i_pitch; + i_src_stride = i_plane ? yuv->uv_stride : yuv->y_stride; + i_src_xoffset = p_dec->p_sys->ti.offset_x; + i_src_yoffset = p_dec->p_sys->ti.offset_y; + if( i_plane ) + { + i_src_xoffset /= 2; + i_src_yoffset /= 2; + } + + p_src += (i_src_yoffset * i_src_stride + i_src_yoffset); for( i_line = 0; i_line < p_pic->p[i_plane].i_lines; i_line++ ) { - p_dec->p_fifo->p_vlc->pf_memcpy( p_dst, p_src, i_width ); + p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width ); p_src += i_src_stride; p_dst += i_dst_stride; } } } + +/***************************************************************************** + * encoder_sys_t : theora encoder descriptor + *****************************************************************************/ +struct encoder_sys_t +{ + /* + * Input properties + */ + vlc_bool_t b_headers; + + /* + * Theora properties + */ + theora_info ti; /* theora bitstream settings */ + theora_comment tc; /* theora comment header */ + theora_state td; /* theora bitstream user comments */ + + /* + * Common properties + */ + mtime_t i_pts; +}; + +/***************************************************************************** + * OpenEncoder: probe the encoder and return score + *****************************************************************************/ +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->fmt_out.i_codec != VLC_FOURCC('t','h','e','o') ) + { + return VLC_EGENERIC; + } + + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) + { + msg_Err( p_enc, "out of memory" ); + return VLC_EGENERIC; + } + p_enc->p_sys = p_sys; + + p_enc->pf_header = Headers; + p_enc->pf_encode_video = Encode; + 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->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->fmt_out.i_bitrate; + p_sys->ti.quality = video_q; + + p_sys->ti.dropframes_p = 0; + p_sys->ti.quick_p = 1; + 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->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; + + theora_encode_init( &p_sys->td, &p_sys->ti ); + theora_info_clear( &p_sys->ti ); + theora_comment_init( &p_sys->tc ); + + p_sys->b_headers = VLC_FALSE; + + return VLC_SUCCESS; +} + +/**************************************************************************** + * Encode: the whole thing + **************************************************************************** + * This function spits out ogg packets. + ****************************************************************************/ +static block_t *Headers( encoder_t *p_enc ) +{ + encoder_sys_t *p_sys = p_enc->p_sys; + block_t *p_chain = NULL; + + /* Create theora headers */ + if( !p_sys->b_headers ) + { + ogg_packet oggpackets[3]; + int i; + + theora_encode_header( &p_sys->td, &oggpackets[0] ); + theora_encode_comment( &p_sys->tc, &oggpackets[1] ); + theora_encode_tables( &p_sys->td, &oggpackets[2] ); + + /* Ogg packet to block */ + for( i = 0; i < 3; i++ ) + { + block_t *p_block = block_New( p_enc, oggpackets[i].bytes ); + memcpy( p_block->p_buffer, oggpackets[i].packet, + oggpackets[i].bytes ); + p_block->i_dts = p_block->i_pts = p_block->i_length = 0; + block_ChainAppend( &p_chain, p_block ); + } + + p_sys->b_headers = VLC_TRUE; + } + + return p_chain; +} + +/**************************************************************************** + * Encode: the whole thing + **************************************************************************** + * This function spits out ogg packets. + ****************************************************************************/ +static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) +{ + encoder_sys_t *p_sys = p_enc->p_sys; + ogg_packet oggpacket; + block_t *p_block; + yuv_buffer yuv; + + /* Theora is a one-frame-in, one-frame-out system. Submit a frame + * for compression and pull out the packet. */ + + yuv.y_width = p_pict->p[0].i_visible_pitch; + yuv.y_height = p_pict->p[0].i_lines; + yuv.y_stride = p_pict->p[0].i_pitch; + + yuv.uv_width = p_pict->p[1].i_visible_pitch; + yuv.uv_height = p_pict->p[1].i_lines; + yuv.uv_stride = p_pict->p[1].i_pitch; + + yuv.y = p_pict->p[0].p_pixels; + yuv.u = p_pict->p[1].p_pixels; + yuv.v = p_pict->p[2].p_pixels; + + 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 ); + + /* Ogg packet to block */ + p_block = block_New( p_enc, oggpacket.bytes ); + memcpy( p_block->p_buffer, oggpacket.packet, oggpacket.bytes ); + p_block->i_dts = p_block->i_pts = p_pict->date;; + + return p_block; +} + +/***************************************************************************** + * CloseEncoder: theora encoder destruction + *****************************************************************************/ +static void CloseEncoder( vlc_object_t *p_this ) +{ + encoder_t *p_enc = (encoder_t *)p_this; + encoder_sys_t *p_sys = p_enc->p_sys; + + theora_info_clear( &p_sys->ti ); + theora_comment_clear( &p_sys->tc ); + + free( p_sys ); +}