X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftheora.c;h=07fb81045bed8c67e8e4a9a12b1be95c3abce412;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=05d121a48b6e776a55e28cefdf736dd74a6bd71a;hpb=f28b106bb531ec36c1295ecc212f653d43fc5645;p=vlc diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 05d121a48b..07fb81045b 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -24,10 +24,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include "../demux/xiph.h" #include @@ -39,12 +45,12 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties */ - int i_headers; + bool b_has_headers; /* * Theora properties @@ -56,7 +62,7 @@ struct decoder_sys_t /* * Decoding properties */ - vlc_bool_t b_decoded_first_keyframe; + bool b_decoded_first_keyframe; /* * Common properties @@ -78,7 +84,7 @@ static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** ); static picture_t *DecodePacket( decoder_t *, ogg_packet * ); static void ParseTheoraComments( decoder_t * ); -static void theora_CopyPicture( decoder_t *, picture_t *, yuv_buffer * ); +static void theora_CopyPicture( picture_t *, yuv_buffer * ); static int OpenEncoder( vlc_object_t *p_this ); static void CloseEncoder( vlc_object_t *p_this ); @@ -92,33 +98,33 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ); "Enforce a quality between 1 (low) and 10 (high), instead " \ "of specifying a particular bitrate. This will produce a VBR stream." ) -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_shortname( "Theora" ); - set_description( _("Theora video decoder") ); - set_capability( "decoder", 100 ); - 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", 150 ); - set_callbacks( OpenEncoder, CloseEncoder ); - add_shortcut( "theora" ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_shortname( "Theora" ) + set_description( N_("Theora video decoder") ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "theora" ) + + add_submodule () + set_description( N_("Theora video packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) + add_shortcut( "theora" ) + + add_submodule () + set_description( N_("Theora video encoder") ) + set_capability( "encoder", 150 ) + set_callbacks( OpenEncoder, CloseEncoder ) + add_shortcut( "theora" ) # define ENC_CFG_PREFIX "sout-theora-" add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, VLC_FALSE ); -vlc_module_end(); + ENC_QUALITY_LONGTEXT, false ) +vlc_module_end () -static const char *ppsz_enc_options[] = { +static const char *const ppsz_enc_options[] = { "quality", NULL }; @@ -130,26 +136,22 @@ static int OpenDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','h','e','o') ) + if( p_dec->fmt_in.i_codec != VLC_CODEC_THEORA ) { return VLC_EGENERIC; } /* 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_dec, "out of memory" ); - return VLC_EGENERIC; - } - p_dec->p_sys->b_packetizer = VLC_FALSE; - - p_sys->i_pts = 0; - p_sys->b_decoded_first_keyframe = VLC_FALSE; + if( ( p_dec->p_sys = p_sys = malloc(sizeof(*p_sys)) ) == NULL ) + return VLC_ENOMEM; + p_dec->p_sys->b_packetizer = false; + p_sys->b_has_headers = false; + p_sys->i_pts = VLC_TS_INVALID; + p_sys->b_decoded_first_keyframe = false; /* Set output properties */ p_dec->fmt_out.i_cat = VIDEO_ES; - p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0'); + p_dec->fmt_out.i_codec = VLC_CODEC_I420; /* Set callbacks */ p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **)) @@ -161,8 +163,6 @@ static int OpenDecoder( vlc_object_t *p_this ) theora_comment_init( &p_sys->tc ); theora_info_init( &p_sys->ti ); - p_sys->i_headers = 0; - return VLC_SUCCESS; } @@ -174,8 +174,8 @@ static int OpenPacketizer( vlc_object_t *p_this ) 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' ); + p_dec->p_sys->b_packetizer = true; + p_dec->fmt_out.i_codec = VLC_CODEC_THEORA; } return i_ret; @@ -205,41 +205,14 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) oggpacket.packetno = 0; /* Check for headers */ - if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra ) - { - /* Headers already available as extra data */ - p_sys->i_headers = 3; - } - else if( oggpacket.bytes && p_sys->i_headers < 3 ) + if( !p_sys->b_has_headers ) { - /* Backup headers as extra data */ - uint8_t *p_extra; - - p_dec->fmt_in.p_extra = - realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra + - oggpacket.bytes + 2 ); - p_extra = p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra; - *(p_extra++) = oggpacket.bytes >> 8; - *(p_extra++) = oggpacket.bytes & 0xFF; - - memcpy( p_extra, oggpacket.packet, oggpacket.bytes ); - p_dec->fmt_in.i_extra += oggpacket.bytes + 2; - - block_Release( *pp_block ); - p_sys->i_headers++; - return NULL; - } - - if( p_sys->i_headers == 3 ) - { - if( ProcessHeaders( p_dec ) != VLC_SUCCESS ) + if( ProcessHeaders( p_dec ) ) { - p_sys->i_headers = 0; - p_dec->fmt_in.i_extra = 0; block_Release( *pp_block ); return NULL; } - else p_sys->i_headers++; + p_sys->b_has_headers = true; } return ProcessPacket( p_dec, &oggpacket, pp_block ); @@ -252,55 +225,69 @@ static int ProcessHeaders( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; ogg_packet oggpacket; - uint8_t *p_extra; - int i_extra; - if( !p_dec->fmt_in.i_extra ) return VLC_EGENERIC; + unsigned pi_size[XIPH_MAX_HEADER_COUNT]; + void *pp_data[XIPH_MAX_HEADER_COUNT]; + unsigned i_count; + if( xiph_SplitHeaders( pi_size, pp_data, &i_count, + p_dec->fmt_in.i_extra, p_dec->fmt_in.p_extra) ) + return VLC_EGENERIC; + if( i_count < 3 ) + goto error; oggpacket.granulepos = -1; - oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ oggpacket.e_o_s = 0; oggpacket.packetno = 0; - p_extra = p_dec->fmt_in.p_extra; - i_extra = p_dec->fmt_in.i_extra; /* Take care of the initial Vorbis header */ - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - p_extra += oggpacket.bytes; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - + oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ + oggpacket.bytes = pi_size[0]; + oggpacket.packet = pp_data[0]; if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { msg_Err( p_dec, "this bitstream does not contain Theora video data" ); - return VLC_EGENERIC; + goto error; } /* Set output properties */ + switch( p_sys->ti.pixelformat ) + { + case OC_PF_420: + p_dec->fmt_out.i_codec = VLC_CODEC_I420; + break; + case OC_PF_422: + p_dec->fmt_out.i_codec = VLC_CODEC_I422; + break; + case OC_PF_444: + p_dec->fmt_out.i_codec = VLC_CODEC_I444; + break; + case OC_PF_RSVD: + default: + msg_Err( p_dec, "unknown chroma in theora sample" ); + break; + } 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.frame_width && p_sys->ti.frame_height ) { - p_dec->fmt_out.video.i_width = p_sys->ti.frame_width; - p_dec->fmt_out.video.i_height = p_sys->ti.frame_height; + p_dec->fmt_out.video.i_visible_width = p_sys->ti.frame_width; + p_dec->fmt_out.video.i_visible_height = p_sys->ti.frame_height; + if( p_sys->ti.offset_x || p_sys->ti.offset_y ) + { + p_dec->fmt_out.video.i_x_offset = p_sys->ti.offset_x; + p_dec->fmt_out.video.i_y_offset = p_sys->ti.offset_y; + } } if( p_sys->ti.aspect_denominator && p_sys->ti.aspect_numerator ) { - p_dec->fmt_out.video.i_aspect = ((int64_t)VOUT_ASPECT_FACTOR) * - ( p_sys->ti.aspect_numerator * p_dec->fmt_out.video.i_width ) / - ( p_sys->ti.aspect_denominator * p_dec->fmt_out.video.i_height ); + p_dec->fmt_out.video.i_sar_num = p_sys->ti.aspect_numerator; + p_dec->fmt_out.video.i_sar_den = 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; + p_dec->fmt_out.video.i_sar_num = 1; + p_dec->fmt_out.video.i_sar_den = 1; } if( p_sys->ti.fps_numerator > 0 && p_sys->ti.fps_denominator > 0 ) @@ -332,23 +319,13 @@ static int ProcessHeaders( decoder_t *p_dec ) } /* The next packet in order is the comments header */ - oggpacket.b_o_s = 0; - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - p_extra += oggpacket.bytes; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - - /* The next packet in order is the comments header */ + oggpacket.b_o_s = 0; + oggpacket.bytes = pi_size[1]; + oggpacket.packet = pp_data[1]; if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { msg_Err( p_dec, "2nd Theora header is corrupted" ); - return VLC_EGENERIC; + goto error; } ParseTheoraComments( p_dec ); @@ -356,23 +333,13 @@ static int ProcessHeaders( decoder_t *p_dec ) /* 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. */ - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - - /* 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 */ + oggpacket.b_o_s = 0; + oggpacket.bytes = pi_size[2]; + oggpacket.packet = pp_data[2]; if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { msg_Err( p_dec, "3rd Theora header is corrupted" ); - return VLC_EGENERIC; + goto error; } if( !p_sys->b_packetizer ) @@ -383,13 +350,20 @@ static int ProcessHeaders( decoder_t *p_dec ) else { p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra; - p_dec->fmt_out.p_extra = - realloc( p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra ); + p_dec->fmt_out.p_extra = xrealloc( p_dec->fmt_out.p_extra, + p_dec->fmt_out.i_extra ); memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra ); } + for( unsigned i = 0; i < i_count; i++ ) + free( pp_data[i] ); return VLC_SUCCESS; + +error: + for( unsigned i = 0; i < i_count; i++ ) + free( pp_data[i] ); + return VLC_EGENERIC; } /***************************************************************************** @@ -411,7 +385,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, } /* Date management */ - if( p_block->i_pts > 0 && p_block->i_pts != p_sys->i_pts ) + if( p_block->i_pts > VLC_TS_INVALID && p_block->i_pts != p_sys->i_pts ) { p_sys->i_pts = p_block->i_pts; } @@ -423,25 +397,19 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *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_block->i_length = p_sys->i_pts - p_block->i_pts; p_buf = p_block; } else { - if( p_sys->i_headers >= 3 ) - p_buf = DecodePacket( p_dec, p_oggpacket ); - else - p_buf = NULL; - - if( p_block ) block_Release( p_block ); + p_buf = DecodePacket( p_dec, p_oggpacket ); + if( p_block ) + block_Release( p_block ); } /* Date management */ - p_sys->i_pts += ( I64C(1000000) * p_sys->ti.fps_denominator / + p_sys->i_pts += ( INT64_C(1000000) * p_sys->ti.fps_denominator / p_sys->ti.fps_numerator ); /* 1 frame per packet */ return p_buf; @@ -461,7 +429,7 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) /* Check for keyframe */ if( !(p_oggpacket->packet[0] & 0x80) /* data packet */ && !(p_oggpacket->packet[0] & 0x40) /* intra frame */ ) - p_sys->b_decoded_first_keyframe = VLC_TRUE; + p_sys->b_decoded_first_keyframe = true; /* If we haven't seen a single keyframe yet, don't let Theora decode * anything, otherwise we'll get display artifacts. (This is impossible @@ -474,10 +442,10 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) return NULL; /* Get a new picture */ - p_pic = p_dec->pf_vout_buffer_new( p_dec ); + p_pic = decoder_NewPicture( p_dec ); if( !p_pic ) return NULL; - theora_CopyPicture( p_dec, p_pic, &yuv ); + theora_CopyPicture( p_pic, &yuv ); p_pic->date = p_sys->i_pts; @@ -485,32 +453,29 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) } /***************************************************************************** - * ParseTheoraComments: FIXME should be done in demuxer + * ParseTheoraComments: *****************************************************************************/ static void ParseTheoraComments( decoder_t *p_dec ) { - input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; char *psz_name, *psz_value, *psz_comment; int i = 0; - if( p_input->i_object_type != VLC_OBJECT_INPUT ) return; - while ( i < p_dec->p_sys->tc.comments ) { 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_Control( p_input, INPUT_ADD_INFO, _("Theora comment"), - psz_name, psz_value ); + + if( !p_dec->p_description ) + p_dec->p_description = vlc_meta_New(); + if( p_dec->p_description ) + vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value ); } free( psz_comment ); i++; @@ -535,34 +500,23 @@ static void CloseDecoder( vlc_object_t *p_this ) * theora_CopyPicture: copy a picture from theora internal buffers to a * picture_t structure. *****************************************************************************/ -static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic, +static void theora_CopyPicture( picture_t *p_pic, yuv_buffer *yuv ) { - int i_plane, i_line, i_width, i_dst_stride, i_src_stride; - int i_src_xoffset, i_src_yoffset; + int i_plane, i_line, i_dst_stride, i_src_stride; 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_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_xoffset); - - for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) + for( i_line = 0; i_line < p_pic->p[i_plane].i_lines; i_line++ ) { - p_dec->p_vlc->pf_memcpy( p_dst, p_src + i_src_xoffset, - i_plane ? yuv->uv_width : yuv->y_width ); + vlc_memcpy( p_dst, p_src, + i_plane ? yuv->uv_width : yuv->y_width ); p_src += i_src_stride; p_dst += i_dst_stride; } @@ -577,7 +531,7 @@ struct encoder_sys_t /* * Input properties */ - vlc_bool_t b_headers; + bool b_headers; /* * Theora properties @@ -595,34 +549,27 @@ struct encoder_sys_t 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; - ogg_packet header; - uint8_t *p_extra; - vlc_value_t val; - int i_quality, i; + encoder_sys_t *p_sys; + int i_quality; - if( p_enc->fmt_out.i_codec != VLC_FOURCC('t','h','e','o') && + if( p_enc->fmt_out.i_codec != VLC_CODEC_THEORA && !p_enc->b_force ) { 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; - } + if( ( p_sys = malloc(sizeof(encoder_sys_t)) ) == NULL ) + return VLC_ENOMEM; p_enc->p_sys = p_sys; p_enc->pf_encode_video = Encode; - p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0'); - p_enc->fmt_out.i_codec = VLC_FOURCC('t','h','e','o'); + p_enc->fmt_in.i_codec = VLC_CODEC_I420; + p_enc->fmt_out.i_codec = VLC_CODEC_THEORA; - sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); + config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); - var_Get( p_enc, ENC_CFG_PREFIX "quality", &val ); - i_quality = val.i_int; + i_quality = var_GetInteger( p_enc, ENC_CFG_PREFIX "quality" ); if( i_quality > 10 ) i_quality = 10; if( i_quality < 0 ) i_quality = 0; @@ -663,14 +610,12 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->ti.fps_denominator = p_enc->fmt_in.video.i_frame_rate_base; } - if( p_enc->fmt_in.video.i_aspect ) + if( p_enc->fmt_in.video.i_sar_num > 0 && p_enc->fmt_in.video.i_sar_den > 0 ) { - uint64_t i_num, i_den; unsigned i_dst_num, i_dst_den; - - i_num = p_enc->fmt_in.video.i_aspect * (int64_t)p_sys->ti.height; - i_den = VOUT_ASPECT_FACTOR * p_sys->ti.width; - vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); + vlc_ureduce( &i_dst_num, &i_dst_den, + p_enc->fmt_in.video.i_sar_num, + p_enc->fmt_in.video.i_sar_den, 0 ); p_sys->ti.aspect_numerator = i_dst_num; p_sys->ti.aspect_denominator = i_dst_den; } @@ -694,30 +639,27 @@ static int OpenEncoder( vlc_object_t *p_this ) 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 ); /* Create and store headers */ - p_enc->fmt_out.i_extra = 3 * 2; - for( i = 0; i < 3; i++ ) + for( int i = 0; i < 3; i++ ) { - if( i == 0 ) theora_encode_header( &p_sys->td, &header ); - else if( i == 1 ) theora_encode_comment( &p_sys->tc, &header ); - else if( i == 2 ) theora_encode_tables( &p_sys->td, &header ); - - p_enc->fmt_out.p_extra = - realloc( p_enc->fmt_out.p_extra, - p_enc->fmt_out.i_extra + header.bytes ); - p_extra = p_enc->fmt_out.p_extra; - p_extra += p_enc->fmt_out.i_extra + (i-3)*2; - p_enc->fmt_out.i_extra += header.bytes; + ogg_packet header; - *(p_extra++) = header.bytes >> 8; - *(p_extra++) = header.bytes & 0xFF; + if( i == 0 ) + theora_encode_header( &p_sys->td, &header ); + else if( i == 1 ) + theora_encode_comment( &p_sys->tc, &header ); + else + theora_encode_tables( &p_sys->td, &header ); - memcpy( p_extra, header.packet, header.bytes ); + if( xiph_AppendHeaders( &p_enc->fmt_out.i_extra, &p_enc->fmt_out.p_extra, + header.bytes, header.packet ) ) + { + p_enc->fmt_out.i_extra = 0; + p_enc->fmt_out.p_extra = NULL; + } } - return VLC_SUCCESS; } @@ -734,6 +676,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) yuv_buffer yuv; int i; + if( !p_pict ) return NULL; /* Sanity check */ if( p_pict->p[0].i_pitch < (int)p_sys->i_width || p_pict->p[0].i_lines < (int)p_sys->i_height ) @@ -815,6 +758,11 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) memcpy( p_block->p_buffer, oggpacket.packet, oggpacket.bytes ); p_block->i_dts = p_block->i_pts = p_pict->date; + if( theora_packet_iskeyframe( &oggpacket ) ) + { + p_block->i_flags |= BLOCK_FLAG_TYPE_I; + } + return p_block; }