comparison libvo/vo_directfb2.c @ 10840:10f45897d653

Config fixed, changed put_image to use memcpy instead of native blits (for compatibility reasons), always clear primary layer (to have always black background) and try to center image.

10839:0f2182b3261f

                    opt_no = 0;
               } else if (!strncmp(vo_subdevice, "help", 4)) {
                    show_help = 1;
                    vo_subdevice += 4;
                    break;
               }
               }
	       
          if (show_help) {
               mp_msg( MSGT_VO, MSGL_ERR,
                       "\nvo_dfbmga command line help:\n"
                       "Example: mplayer -vo directfb:layer=1:buffermode=single\n"

				    }
			    }
		    }
	    }
	} // vm end

// find best layer

        mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Config - looking for suitable layer\n");
	params.format=format;

    	   //YUY2 and RGB formats
           mpi->planes[0]=dst;
	   mpi->width=width;
	   mpi->stride[0]=pitch;
       }
       mpi->flags|=MP_IMGFLAG_DIRECT;
//       if (verbose) printf("DirectFB: get_image() SUCCESS -> Direct Rendering ENABLED\n");
       return VO_TRUE;

    } 

	unsigned int pitch;
        void *dst;
        void *dst2;
        void *srcp;
	unsigned int p;

	unlock();

	if (frame) {
		DFBCHECK (frame->Lock(frame,DSLF_WRITE|DSLF_READ,&dst,&pitch));

	
	for (i=0;i<mpi->h;i++) {
            memcpy(dst+i*pitch,src+i*mpi->stride[0],p);
        }

	if (pixel_format == DSPF_YV12) {

            dst += pitch*height;
    	    p = p/2;
	    src = mpi->planes[2]+mpi->y*mpi->stride[2]+mpi->x/2;

	
	}
	unlock();

    } else {

	dsc.flags = DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_WIDTH | DSDESC_PREALLOCATED;
	dsc.preallocated[0].data = mpi->planes[0];
	dsc.preallocated[0].pitch = mpi->stride[0];
        dsc.width = mpi->width;
        dsc.height = mpi->height;

		DFBCHECK (tmp->Blit(tmp,frame,&rect,0,0));
        } else {
		DFBCHECK (tmp->Blit(tmp,primary,&rect,xoffset,yoffset));
        };
        tmp->Release(tmp);
    }
    return VO_TRUE;
}

10840:10f45897d653

                    opt_no = 0;
               } else if (!strncmp(vo_subdevice, "help", 4)) {
                    show_help = 1;
                    vo_subdevice += 4;
                    break;
               } else  {
                    vo_subdevice++;
	       }
          }
	       
          if (show_help) {
               mp_msg( MSGT_VO, MSGL_ERR,
                       "\nvo_dfbmga command line help:\n"
                       "Example: mplayer -vo directfb:layer=1:buffermode=single\n"

				    }
			    }
		    }
	    }
	} // vm end

// just for sure clear primary layer
#if DIRECTFBVERSION > 913
        ret = dfb->GetDisplayLayer( dfb, DLID_PRIMARY, &layer);
	if (ret==DFB_OK) {
	    ret = layer->GetSurface(layer,&primary);
	    if (ret==DFB_OK) {
		primary->Clear(primary,0,0,0,0xff);
		ret = primary->Flip(primary,NULL,0);
		if (ret==DFB_OK) { 
		    primary->Clear(primary,0,0,0,0xff);
		}
    	    primary->Release(primary);
	    }
	primary=NULL;
        layer->Release(layer);
	}
	layer=NULL;
#endif

// find best layer

        mp_msg(MSGT_VO, MSGL_INFO,"DirectFB: Config - looking for suitable layer\n");
	params.format=format;

    	   //YUY2 and RGB formats
           mpi->planes[0]=dst;
	   mpi->width=width;
	   mpi->stride[0]=pitch;
       }

       // center image
       
       if (!frame) {
            if(mpi->flags&MP_IMGFLAG_PLANAR){
		mpi->planes[0]= dst + yoffset * pitch + xoffset;
		mpi->planes[1]+= (yoffset * pitch) >> 2 + xoffset >> 1;
		mpi->planes[2]+= (yoffset * pitch) >> 2 + xoffset >> 1;
	    } else {
		mpi->planes[0]=dst + yoffset * pitch + xoffset * (mpi->bpp >> 3);
	    }		   
       }
       
       mpi->flags|=MP_IMGFLAG_DIRECT;
//       if (verbose) printf("DirectFB: get_image() SUCCESS -> Direct Rendering ENABLED\n");
       return VO_TRUE;

    } 

	unsigned int pitch;
        void *dst;
        void *dst2;
        void *srcp;
	unsigned int p;

//        if (verbose) printf("DirectFB: draw_slice entered\n");

	unlock();

	if (frame) {
		DFBCHECK (frame->Lock(frame,DSLF_WRITE|DSLF_READ,&dst,&pitch));

	
	for (i=0;i<mpi->h;i++) {
            memcpy(dst+i*pitch,src+i*mpi->stride[0],p);
        }

	
	if (pixel_format == DSPF_YV12) {

            dst += pitch*height;
    	    p = p/2;
	    src = mpi->planes[2]+mpi->y*mpi->stride[2]+mpi->x/2;

	
	}
	unlock();

    } else {
// I had to disable native directfb blit because it wasn't working under some conditions :-(

/*
	dsc.flags = DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_WIDTH | DSDESC_PREALLOCATED;
	dsc.preallocated[0].data = mpi->planes[0];
	dsc.preallocated[0].pitch = mpi->stride[0];
        dsc.width = mpi->width;
        dsc.height = mpi->height;

		DFBCHECK (tmp->Blit(tmp,frame,&rect,0,0));
        } else {
		DFBCHECK (tmp->Blit(tmp,primary,&rect,xoffset,yoffset));
        };
        tmp->Release(tmp);
*/

	unsigned int pitch;
        void *dst;

//        if (verbose) printf("DirectFB: Put_image - non planar branch\n");
	if (frame) {
		DFBCHECK (frame->Lock(frame,DSLF_WRITE,&dst,&pitch));
		framelocked = 1;
		mem2agpcpy_pic(dst,mpi->planes[0] + mpi->y * mpi->stride[0] + mpi->x * (mpi->bpp >> 3)  ,mpi->w * (mpi->bpp >> 3),mpi->h,pitch,mpi->stride[0]);
        } else {
		DFBCHECK (primary->Lock(primary,DSLF_WRITE,&dst,&pitch));
		primarylocked = 1;
		mem2agpcpy_pic(dst + yoffset * pitch + xoffset * (mpi->bpp >> 3),mpi->planes[0] + mpi->y * mpi->stride[0] + mpi->x * (mpi->bpp >> 3)  ,mpi->w * (mpi->bpp >> 3),mpi->h,pitch,mpi->stride[0]);
        };
	unlock();

    }
    return VO_TRUE;
}