comparison libvo/vo_dxr3.c @ 3630:f24527fc1b79

Removed conversion for yuy2, libmp1e supports this format, no need to cnovert it...

3629:a9d1ee93d1c9

};

#ifdef USE_MP1E
void write_dxr3( rte_context* context, void* data, size_t size, void* user_data )
{
    write( fd_video, data, size );
}
#endif

static uint32_t init(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)

    if( format == IMGFMT_YV12 || format == IMGFMT_YUY2 || format == IMGFMT_BGR24 )
    {
#ifdef USE_MP1E
	int size;
	enum rte_frame_rate frame_rate;

	if( !rte_init() )
	{
	    printf( "VO: [dxr3] Unable to initialize MP1E!\n" );
	    return -1;

	else if( vo_fps < 59.97 ) frame_rate = RTE_RATE_6;
	else if( vo_fps < 60.0 ) frame_rate = RTE_RATE_7;
	else if( vo_fps > 60.0 ) frame_rate = RTE_RATE_8;
	else frame_rate = RTE_RATE_NORATE;

        if( !rte_set_video_parameters( mp1e_context, RTE_YUV420, mp1e_context->width,
					mp1e_context->height, frame_rate,
					3e6, "I" ) )
        {
            printf( "VO: [dxr3] Unable to set mp1e context!\n" );
	    rte_context_destroy( mp1e_context );

	return 0;
    }
#ifdef USE_MP1E
    else if( img_format == IMGFMT_YUY2 )
    {
	int w=v_width,h=v_height;
	unsigned char *s,*dY,*dU,*dV;
	
        if(d_pos_x+w>picture_linesize[0]) w=picture_linesize[0]-d_pos_x;
        if(d_pos_y+h>s_height) h=s_height-d_pos_y;

	s = src[0]+s_pos_x+s_pos_y*(w*2);
	dY = picture_data[0]+d_pos_x+d_pos_y*picture_linesize[0];
	dU = picture_data[1]+(d_pos_x/2)+(d_pos_y/2)*picture_linesize[1];
	dV = picture_data[2]+(d_pos_x/2)+(d_pos_y/2)*picture_linesize[2];
	
	yuy2toyv12( s, dY, dU, dV, w, h, picture_linesize[0], picture_linesize[1], w*2 );
	
	mp1e_buffer.data = picture_data[0];
	mp1e_buffer.time = vo_pts/90000.0;
	mp1e_buffer.user_data = NULL;
	rte_push_video_buffer( mp1e_context, &mp1e_buffer );
	return 0;
    }

3630:f24527fc1b79

};

#ifdef USE_MP1E
void write_dxr3( rte_context* context, void* data, size_t size, void* user_data )
{
    if(ioctl(fd_video,EM8300_IOCTL_VIDEO_SETPTS,&vo_pts) < 0)
	    printf( "VO: [dxr3] Unable to set pts\n" );
    write( fd_video, data, size );
}
#endif

static uint32_t init(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)

    if( format == IMGFMT_YV12 || format == IMGFMT_YUY2 || format == IMGFMT_BGR24 )
    {
#ifdef USE_MP1E
	int size;
	enum rte_frame_rate frame_rate;
	enum rte_pixformat pixel_format;

	if( !rte_init() )
	{
	    printf( "VO: [dxr3] Unable to initialize MP1E!\n" );
	    return -1;

	else if( vo_fps < 59.97 ) frame_rate = RTE_RATE_6;
	else if( vo_fps < 60.0 ) frame_rate = RTE_RATE_7;
	else if( vo_fps > 60.0 ) frame_rate = RTE_RATE_8;
	else frame_rate = RTE_RATE_NORATE;

	if( format == IMGFMT_YUY2 )
	    pixel_format = RTE_YUYV;
	else
	    pixel_format = RTE_YUV420;
        if( !rte_set_video_parameters( mp1e_context, pixel_format, mp1e_context->width,
					mp1e_context->height, frame_rate,
					3e6, "I" ) )
        {
            printf( "VO: [dxr3] Unable to set mp1e context!\n" );
	    rte_context_destroy( mp1e_context );

	return 0;
    }
#ifdef USE_MP1E
    else if( img_format == IMGFMT_YUY2 )
    {
	mp1e_buffer.data = src[0];
	mp1e_buffer.time = vo_pts/90000.0;
	mp1e_buffer.user_data = NULL;
	rte_push_video_buffer( mp1e_context, &mp1e_buffer );
	return 0;
    }