#define ENC_CODINGMODE "coding-mode"
#define ENC_CODINGMODE_TEXT N_("Picture coding mode")
#define ENC_CODINGMODE_LONGTEXT N_("Field coding is where interlaced fields are coded" \
- " seperately as opposed to a pseudo-progressive frame")
+ " separately as opposed to a pseudo-progressive frame")
static const char *const enc_codingmode_list[] =
{ "auto", "progressive", "field" };
static const char *const enc_codingmode_list_text[] =
{ N_("auto - let encoder decide based upon input (Best)"),
N_("force coding frame as single picture"),
- N_("force coding frame as seperate interlaced fields"),
+ N_("force coding frame as separate interlaced fields"),
};
#define ENC_MCBLK_WIDTH "mc-blk-width"
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
set_description( N_("Dirac video encoder using dirac-research library") )
+ set_shortname( "Dirac" )
set_capability( "encoder", 100 )
set_callbacks( OpenEncoder, CloseEncoder )
add_integer( ENC_CFG_PREFIX ENC_MCBLK_WIDTH, -1, NULL,
ENC_MCBLK_WIDTH_TEXT, ENC_MCBLK_WIDTH_LONGTEXT, false )
- add_deprecated_alias( ENC_CFG_PREFIX ENC_MCBLK_XBLEN );
change_integer_range(-1, INT_MAX);
add_integer( ENC_CFG_PREFIX ENC_MCBLK_HEIGHT, -1, NULL,
ENC_MCBLK_HEIGHT, ENC_MCBLK_HEIGHT_LONGTEXT, false )
- add_deprecated_alias( ENC_CFG_PREFIX ENC_MCBLK_YBLEN );
change_integer_range(-1, INT_MAX);
add_integer( ENC_CFG_PREFIX ENC_MCBLK_OVERLAP, -1, NULL,
int i_plane, i_line, i_width, i_src_stride;
uint8_t *p_dst;
+ if( !p_pic ) return NULL;
/* we only know if the sequence is interlaced when the first
* picture arrives, so final setup is done here */
/* XXX todo, detect change of interlace */
if( !p_sys->p_dirac )
{
msg_Err( p_enc, "Failed to initialize dirac encoder" );
- p_enc->b_error = 1;
return NULL;
}
date_Init( &date, p_enc->fmt_in.video.i_frame_rate, p_enc->fmt_in.video.i_frame_rate_base );
* coded order */
p_block = block_New( p_enc, 1 );
if( !p_block )
- {
- p_enc->b_error = 1;
return NULL;
- }
p_block->i_dts = p_pic->date - p_sys->i_pts_offset;
block_FifoPut( p_sys->p_dts_fifo, p_block );
p_block = NULL;
p_block = block_New( p_enc, 1 );
if( !p_block )
- {
- p_enc->b_error = 1;
return NULL;
- }
p_block->i_dts = p_pic->date - p_sys->i_pts_offset + p_sys->i_field_time;
block_FifoPut( p_sys->p_dts_fifo, p_block );
p_block = NULL;
/* extract data from encoder temporary buffer. */
p_block = block_New( p_enc, p_sys->p_dirac->enc_buf.size );
if( !p_block )
- {
- p_enc->b_error = 1;
return NULL;
- }
memcpy( p_block->p_buffer, p_sys->p_dirac->enc_buf.buffer,
p_sys->p_dirac->enc_buf.size );
/* XXX, should this be done using the packetizer ? */
p_enc->fmt_out.p_extra = malloc( len + sizeof(eos) );
if( !p_enc->fmt_out.p_extra )
- {
- p_enc->b_error = 1;
return NULL;
- }
memcpy( p_enc->fmt_out.p_extra, p_block->p_buffer, len);
memcpy( (uint8_t*)p_enc->fmt_out.p_extra + len, eos, sizeof(eos) );
SetDWBE( (uint8_t*)p_enc->fmt_out.p_extra + len + 10, len );