X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftheora.c;h=97e90ca3e1cf56020628d9af82d1519b1b16b372;hb=73b01757f4614e8f483fe1a4a3b65eddb9051c3a;hp=0ac1e76963b15a6dfbdcd265b13bc95479f51930;hpb=d1d3dc1d109110bf68cb048c429f6f05a3839200;p=vlc diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 0ac1e76963..97e90ca3e1 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -28,9 +28,9 @@ # include "config.h" #endif -#include +#include +#include #include -#include #include #include #include @@ -82,7 +82,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 ); @@ -96,31 +96,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_submodule(); - set_description( _("Theora video encoder") ); - set_capability( "encoder", 150 ); - set_callbacks( OpenEncoder, CloseEncoder ); +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, 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 }; @@ -132,18 +134,14 @@ 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; - } + if( ( p_dec->p_sys = p_sys = malloc(sizeof(*p_sys)) ) == NULL ) + return VLC_ENOMEM; p_dec->p_sys->b_packetizer = false; p_sys->i_pts = 0; @@ -151,7 +149,7 @@ static int OpenDecoder( vlc_object_t *p_this ) /* 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 **)) @@ -177,7 +175,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { p_dec->p_sys->b_packetizer = true; - p_dec->fmt_out.i_codec = VLC_FOURCC( 't', 'h', 'e', 'o' ); + p_dec->fmt_out.i_codec = VLC_CODEC_THEORA; } return i_ret; @@ -285,12 +283,33 @@ static int ProcessHeaders( decoder_t *p_dec ) } /* 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 ) @@ -476,10 +495,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; @@ -487,32 +506,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, "%s", 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++; @@ -537,34 +553,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_libvlc->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; } @@ -597,29 +602,26 @@ 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; + encoder_sys_t *p_sys; ogg_packet header; uint8_t *p_extra; vlc_value_t val; int i_quality, i; - 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; config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); @@ -696,7 +698,6 @@ 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 */ @@ -817,6 +818,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; }