X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftheora.c;h=88e14c0aa685f20706f6704e82fab7662f1dbdb8;hb=59da25707ad2c660c0327d6edb59824729922710;hp=3806d9eaaf9ec3d19c4ddfbdf61c9a15905251a1;hpb=15f53b191e81dcbf4d63e9a310620400b4f3b9c9;p=vlc diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 3806d9eaaf..88e14c0aa6 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -1,7 +1,7 @@ /***************************************************************************** * theora.c: theora decoder module making use of libtheora. ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN + * Copyright (C) 1999-2001 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -18,17 +18,22 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include - +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include #include #include @@ -39,7 +44,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -56,7 +61,7 @@ struct decoder_sys_t /* * Decoding properties */ - vlc_bool_t b_decoded_first_keyframe; + bool b_decoded_first_keyframe; /* * Common properties @@ -89,35 +94,34 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ); *****************************************************************************/ #define ENC_QUALITY_TEXT N_("Encoding quality") #define ENC_QUALITY_LONGTEXT N_( \ - "Allows you to specify a quality between 1 (low) and 10 (high), instead " \ + "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_description( _("Theora video decoder") ); + set_shortname( "Theora" ); + set_description( N_("Theora video decoder") ); set_capability( "decoder", 100 ); set_callbacks( OpenDecoder, CloseDecoder ); add_shortcut( "theora" ); add_submodule(); - set_description( _("Theora video packetizer") ); + set_description( N_("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_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 ); + ENC_QUALITY_LONGTEXT, false ); vlc_module_end(); -static const char *ppsz_enc_options[] = { +static const char *const ppsz_enc_options[] = { "quality", NULL }; @@ -137,14 +141,11 @@ static int OpenDecoder( vlc_object_t *p_this ) /* 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; + return VLC_ENOMEM; + p_dec->p_sys->b_packetizer = false; p_sys->i_pts = 0; - p_sys->b_decoded_first_keyframe = VLC_FALSE; + p_sys->b_decoded_first_keyframe = false; /* Set output properties */ p_dec->fmt_out.i_cat = VIDEO_ES; @@ -173,7 +174,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { - p_dec->p_sys->b_packetizer = VLC_TRUE; + p_dec->p_sys->b_packetizer = true; p_dec->fmt_out.i_codec = VLC_FOURCC( 't', 'h', 'e', 'o' ); } @@ -217,7 +218,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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 = ((uint8_t *)p_dec->fmt_in.p_extra) + p_dec->fmt_in.i_extra; *(p_extra++) = oggpacket.bytes >> 8; *(p_extra++) = oggpacket.bytes & 0xFF; @@ -277,24 +278,45 @@ static int ProcessHeaders( decoder_t *p_dec ) if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 ) { - msg_Err( p_dec, "This bitstream does not contain Theora video data" ); + msg_Err( p_dec, "this bitstream does not contain Theora video data" ); return VLC_EGENERIC; } /* Set output properties */ + switch( p_sys->ti.pixelformat ) + { + case OC_PF_420: + p_dec->fmt_out.i_codec = VLC_FOURCC( 'I','4','2','0' ); + break; + case OC_PF_422: + p_dec->fmt_out.i_codec = VLC_FOURCC( 'I','4','2','2' ); + break; + case OC_PF_444: + p_dec->fmt_out.i_codec = VLC_FOURCC( 'I','4','4','4' ); + 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_sys->ti.width ) / - ( p_sys->ti.aspect_denominator * p_sys->ti.height ); + ( p_sys->ti.aspect_numerator * p_dec->fmt_out.video.i_width ) / + ( p_sys->ti.aspect_denominator * p_dec->fmt_out.video.i_height ); } else { @@ -315,6 +337,21 @@ static int ProcessHeaders( decoder_t *p_dec ) p_sys->ti.frame_width, p_sys->ti.frame_height, p_sys->ti.offset_x, p_sys->ti.offset_y ); + /* Sanity check that seems necessary for some corrupted files */ + if( p_sys->ti.width < p_sys->ti.frame_width || + p_sys->ti.height < p_sys->ti.frame_height ) + { + msg_Warn( p_dec, "trying to correct invalid theora header " + "(frame size (%dx%d) is smaller than frame content (%d,%d))", + p_sys->ti.width, p_sys->ti.height, + p_sys->ti.frame_width, p_sys->ti.frame_height ); + + if( p_sys->ti.width < p_sys->ti.frame_width ) + p_sys->ti.width = p_sys->ti.frame_width; + if( p_sys->ti.height < p_sys->ti.frame_height ) + p_sys->ti.height = p_sys->ti.frame_height; + } + /* The next packet in order is the comments header */ oggpacket.b_o_s = 0; oggpacket.bytes = *(p_extra++) << 8; @@ -386,7 +423,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, block_t *p_block = *pp_block; void *p_buf; - if( ( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY ) != 0 ) + if( ( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) != 0 ) { /* Don't send the the first packet after a discontinuity to * theora_decode, otherwise we get purple/green display artifacts @@ -425,7 +462,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, } /* 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; @@ -442,8 +479,10 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) theora_decode_packetin( &p_sys->td, p_oggpacket ); - if( theora_packet_iskeyframe( p_oggpacket ) == 1 ) - p_sys->b_decoded_first_keyframe = VLC_TRUE; + /* Check for keyframe */ + if( !(p_oggpacket->packet[0] & 0x80) /* data packet */ && + !(p_oggpacket->packet[0] & 0x40) /* intra frame */ ) + 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 @@ -492,7 +531,7 @@ static void ParseTheoraComments( decoder_t *p_dec ) *psz_value = '\0'; psz_value++; input_Control( p_input, INPUT_ADD_INFO, _("Theora comment"), - psz_name, psz_value ); + psz_name, "%s", psz_value ); } free( psz_comment ); i++; @@ -520,30 +559,20 @@ static void CloseDecoder( vlc_object_t *p_this ) 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; - 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_yoffset); - - 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_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; } @@ -558,7 +587,7 @@ struct encoder_sys_t /* * Input properties */ - vlc_bool_t b_headers; + bool b_headers; /* * Theora properties @@ -590,17 +619,14 @@ static int OpenEncoder( vlc_object_t *p_this ) /* 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; - } + 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'); - 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; @@ -646,12 +672,12 @@ static int OpenEncoder( vlc_object_t *p_this ) if( p_enc->fmt_in.video.i_aspect ) { - int64_t i_num, i_den; - int i_dst_num, i_dst_den; + 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_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); + vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); p_sys->ti.aspect_numerator = i_dst_num; p_sys->ti.aspect_denominator = i_dst_den; }