@@ -20,6 +20,7 @@ #include <sys/time.h> #include <sys/mman.h> #include <sys/ioctl.h> +#include <uiomux/uiomux.h> #include <shveu/shveu.h> #include <asm/types.h> /* for videodev2.h */ @@ -245,6 +246,7 @@ static void uninit_device(sh_ceu * ceu) case IO_METHOD_USERPTR: for (i = 0; i < ceu->n_buffers; ++i) // free (ceu->buffers[i].start);//this is the VEU UIO memory, not stuff we malloc'ed + // uiomux_free (...); break; } free (ceu->buffers); @@ -359,12 +361,21 @@ static void init_userp(sh_ceu * ceu, unsigned int buffer_size) } { - struct uio_map uio; + UIOMux * uiomux; + unsigned char * veu_virt_base; + + fprintf (stderr, "Initializing for buffer size %u\n", buffer_size); + // get veu's virtual address - shveu_get_memory_info(&uio); + // XXX: This capture.c isn't actually going to use the uiomux afterwards. This memory should + // be allocated with uiomux_malloc() and that ptr passed to the main gstshvideocapenc plugin. + uiomux = uiomux_open(); + uiomux_get_mem (uiomux, UIOMUX_SH_VEU, NULL, NULL, (void *)&veu_virt_base); + for (ceu->n_buffers = 0; ceu->n_buffers < req.count; ++ceu->n_buffers) { ceu->buffers[ceu->n_buffers].length = buffer_size; - ceu->buffers[ceu->n_buffers].start = (unsigned char *)((unsigned int)uio.iomem + (buffer_size*ceu->n_buffers)); + ceu->buffers[ceu->n_buffers].start = (unsigned char *)(veu_virt_base + (buffer_size*ceu->n_buffers)); + //ceu->buffers[ceu->n_buffers].start = uiomux_malloc (uiomux, UIOMUX_SH_VEU, buffer_size, 32); if (!ceu->buffers[ceu->n_buffers].start) { fprintf (stderr, "Out of memory\n"); exit (EXIT_FAILURE); @@ -446,11 +457,11 @@ static void init_device(sh_ceu * ceu) if (-1 == xioctl (ceu->fd, VIDIOC_S_FMT, &fmt)) { fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_UYVY; if (-1 == xioctl (ceu->fd, VIDIOC_S_FMT, &fmt)) { - fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB565; - if (-1 == xioctl (ceu->fd, VIDIOC_S_FMT, &fmt)) { - errno_exit ("VIDIOC_S_FMT"); - } - } + fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB565; + if (-1 == xioctl (ceu->fd, VIDIOC_S_FMT, &fmt)) { + errno_exit ("VIDIOC_S_FMT"); + } + } } ceu->pixel_format = fmt.fmt.pix.pixelformat; cntlfile/capture.c @@ -32,6 +32,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <string.h> +#include <uiomux/uiomux.h> #include <shveu/shveu.h> #include "gstshvideocapenc.h" #include <linux/fb.h> @@ -85,6 +86,8 @@ struct _GstshvideoEnc pthread_mutex_t blit_mutex; pthread_mutex_t blit_vpu_end_mutex; pthread_mutex_t output_mutex; + + UIOMux * uiomux; int veu; int ceu_buf_size; @@ -229,24 +232,39 @@ static void *capture_thread(void *data) } } +//#define USE_UIOMUX_VIRT_TO_PHYS static void *blit_thread(void *data) { GstshvideoEnc *shvideoenc = (GstshvideoEnc *)data; - struct uio_map uio; - unsigned char *in_yaddr; - unsigned char *in_caddr; + unsigned long veu_base; + unsigned long in_yaddr; + unsigned long in_caddr; - shveu_get_memory_info(&uio); +#ifndef USE_UIOMUX_VIRT_TO_PHYS + uiomux_get_mem (shvideoenc->uiomux, UIOMUX_SH_VEU, &veu_base, NULL, NULL); +#endif while(1) { GST_LOG_OBJECT(shvideoenc,"%s called preview %d",__FUNCTION__, shvideoenc->preview); pthread_mutex_lock(&shvideoenc->blit_mutex); - in_yaddr = (unsigned char *)(uio.address+shvideoenc->ceu_buf_size*shvideoenc->ceu_buf_num); - in_caddr = (unsigned char *)(in_yaddr+shvideoenc->ceu_buf_size/2); + +#ifdef USE_UIOMUX_VIRT_TO_PHYS + veu_base = uiomux_virt_to_phys (shvideoenc->uiomux, UIOMUX_SH_VEU, shvideoenc->ceu_ubuf); + in_yaddr = veu_base; +#else + in_yaddr = veu_base+shvideoenc->ceu_buf_size*shvideoenc->ceu_buf_num; +#endif + + in_caddr = in_yaddr+shvideoenc->ceu_buf_size/2; /* memory copy from ceu output buffer to vpu input buffer */ +#if 0 + fprintf (stderr, "Resizing input data from %lu from size %ld x %ld to size %d x %d\n", + in_yaddr, shvideoenc->ainfo.xpic, shvideoenc->ainfo.ypic, shvideoenc->width, shvideoenc->height); +#endif + shveu_operation( shvideoenc->veu, in_yaddr, @@ -255,11 +273,11 @@ static void *blit_thread(void *data) shvideoenc->ainfo.ypic, shvideoenc->ainfo.xpic, SHVEU_YCbCr420, - (unsigned char *)shvideoenc->enc_in_yaddr, - (unsigned char *)shvideoenc->enc_in_caddr, - shvideoenc->width, - shvideoenc->height, - shvideoenc->width, + shvideoenc->enc_in_yaddr, + shvideoenc->enc_in_caddr, + (long)shvideoenc->width, + (long)shvideoenc->height, + (long)shvideoenc->width, SHVEU_YCbCr420, SHVEU_NO_ROT); pthread_mutex_unlock(&shvideoenc->blit_vpu_end_mutex); @@ -268,17 +286,17 @@ static void *blit_thread(void *data) { shveu_operation( shvideoenc->veu, - (unsigned char *)shvideoenc->enc_in_yaddr, - (unsigned char *)shvideoenc->enc_in_caddr, - shvideoenc->width, - shvideoenc->height, - shvideoenc->width, + shvideoenc->enc_in_yaddr, + shvideoenc->enc_in_caddr, + (long)shvideoenc->width, + (long)shvideoenc->height, + (long)shvideoenc->width, SHVEU_YCbCr420, - (unsigned char *)shvideoenc->finfo.smem_start, - NULL, - shvideoenc->fbinfo.xres, - shvideoenc->fbinfo.yres, - shvideoenc->fbinfo.xres, + shvideoenc->finfo.smem_start, + 0UL, + (long)shvideoenc->fbinfo.xres, + (long)shvideoenc->fbinfo.yres, + (long)shvideoenc->fbinfo.xres, SHVEU_RGB565, SHVEU_NO_ROT); } @@ -356,6 +374,8 @@ gst_shvideo_enc_dispose (GObject * object) shveu_close(); sh_ceu_close(shvideoenc->ainfo.ceu); + uiomux_close (shvideoenc->uiomux); + pthread_mutex_destroy(&shvideoenc->capture_start_mutex); pthread_mutex_destroy(&shvideoenc->capture_end_mutex); pthread_mutex_destroy(&shvideoenc->blit_mutex); @@ -817,6 +837,9 @@ launch_camera_encoder_thread(void *data) enc->ainfo.buf_input_yuv_file_with_path, enc->ainfo.buf_input_yuv_file); + /* uiomux open */ + enc->uiomux = uiomux_open (); + /* veu oopen */ enc->veu = shveu_open(); gstshvideocapenc.c 757fc79b39742e8529eaf728126383343eabe474 Conrad Parker conrad@metadecks.org http://github.com/kfish/gst-sh-mobile/commit/87e3216c51992e4ff54fa7a83f11df2453451959 87e3216c51992e4ff54fa7a83f11df2453451959 2009-10-16T06:49:22-07:00 2009-10-16T02:41:25-07:00 use libuiomux memory addresses, update new shveu_op types 9023c376bb050f7628227dd4bbfab47d65fbf583 Conrad Parker conrad@metadecks.org