From a74d895e226283b332ee351c5fe0baa0e33be0e7 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 21 Jun 2006 08:54:03 +0000 Subject: packages/mplayer/mplayer-1.0pre7+cvs20060519/* : dropping patches ready to move them to more generic locale. --- .../mplayer-1.0pre7+cvs20060519/.mtn2git_empty | 0 .../mplayer-1.0pre7+cvs20060519/Makefile.patch | 11 - .../mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c | 947 ----- .../mplayer-1.0pre7+cvs20060519/vo_w100_api.h | 306 -- .../mplayer-1.0pre7+cvs20060519/vo_w100_fb.h | 4338 -------------------- .../w100-Makefile.patch | 10 - .../w100-configure.patch | 53 - .../mplayer-1.0pre7+cvs20060519/w100-mplayer.patch | 31 - .../w100-video_out.patch | 20 - 9 files changed, 5716 deletions(-) delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch delete mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch (limited to 'packages') diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch b/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch deleted file mode 100644 index da316ad129..0000000000 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayer_20060519/Makefile.orig 2006-05-30 09:32:23.000000000 +0100 -+++ mplayer_20060519/Makefile 2006-05-30 09:34:07.000000000 +0100 -@@ -438,7 +438,7 @@ - $(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@ - - $(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \ -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \ - -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) - - install: $(ALL_PRG) diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c deleted file mode 100644 index 702707c656..0000000000 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c +++ /dev/null @@ -1,947 +0,0 @@ -/* - * Video driver for ATI Imageon 100 (w100) - * by AGAWA Koji - * (C) 2004 - */ -/* English in this source code is written by machine translation. - Meaning also not leading, permitting. */ - -#include -#include -#include - -#include "config.h" -#include "video_out.h" -#include "video_out_internal.h" -#include "sub.h" -#include "aspect.h" -#include "mp_msg.h" -#include "subopt-helper.h" - -#include "vo_w100_api.h" -#include "vo_w100_fb.h" - -#define UNUSED(v) ((void)(v)) - -static vo_info_t info = { - "ATI Imageon 100", - "w100", - "AGAWA Koji ", - "for Sharp Linux Zaurus SL-C700/750/760/860" -}; - -LIBVO_EXTERN(w100); - -// ---------------------------------------------------------------- -#define MAX_FRAMES 20 -typedef struct vidix_yuv_s -{ - unsigned y,u,v; -}vidix_yuv_t; - -typedef struct vidix_rect_s -{ - unsigned x,y,w,h; /* in pixels */ - vidix_yuv_t pitch; /* line-align in bytes */ -}vidix_rect_t; - -typedef struct w100_yuv_planes_s { - uint8_t *y; - uint8_t *u; - uint8_t *v; -} w100_yuv_planes_t; - -typedef struct w100_priv_s { - uint32_t format; - int src_width; - int src_height; - int nframes; /* total num of frames */ - int current_frame; /* current frame to display */ - int rotate; - int current_rotate; - - /* w100 info */ - int vram_size[2]; /* */ - void *vram_addr[2]; /* address */ - w100_yuv_planes_t frame_addrs[MAX_FRAMES]; - w100_yuv_planes_t frame_offsets[MAX_FRAMES]; - int is_graphic_window_enabled; - int eq_brightness; /* for mplayer */ - int display_brightness; /* for w100 */ - - /* overlay info */ - uint16_t overlay_handle; - ATI_OVERLAYPROP overlay_prop; - int overlay_pos_x; - int overlay_pos_y; - int overlay_expand_h; - int overlay_expand_v; - int overlay_pitch_y; - int overlay_pitch_u; - int overlay_pitch_v; - video_y_offset_u video_y_offset; - video_u_offset_u video_u_offset; - video_v_offset_u video_v_offset; -} w100_priv_t; - -static w100_priv_t st_w100_priv; -static vidix_yuv_t dstrides; - -static int test_rotate(int *arg) -{ - if ((*arg < -1) || (*arg > 3)) - return 0; - return 1; -} - -static opt_t subopts[] = { - { "rotate", OPT_ARG_INT, &st_w100_priv.rotate, (opt_test_f)test_rotate }, - { NULL } -}; - -static void draw_alpha(int x0,int y0, int w,int h, - unsigned char* src, unsigned char *srca, int stride) -{ - w100_priv_t *priv = &st_w100_priv; - uint8_t *psrc, *psrca, *pdst; - pdst = priv->frame_addrs[priv->current_frame].y; - pdst += (x0 * priv->overlay_prop.SrcPitch) + (priv->overlay_prop.SrcPitch - 1 - y0); - psrc = src; - psrca = srca; - while (h--) { - int j; - for (j = 0; j < w; ++j) { - if (psrca[j]) - pdst[j * priv->overlay_prop.SrcPitch] = - ((pdst[j * priv->overlay_prop.SrcPitch] * psrca[j]) >> 8) + psrc[j]; - } - psrc += stride; - psrca += stride; - pdst -= 1; - } -#if 0 - w100_priv_t *priv = &st_w100_priv; - uint32_t apitch, bespitch; - void *lvo_mem; - lvo_mem = priv->frame_addrs[priv->current_frame].y; - apitch = priv->overlay_pitch_y - 1; - switch (priv->format) { - case IMGFMT_YV12: - case IMGFMT_IYUV: - case IMGFMT_I420: - case IMGFMT_YVU9: - case IMGFMT_IF09: - case IMGFMT_Y8: - case IMGFMT_Y800: - bespitch = (priv->src_width + apitch) & (~apitch); - vo_draw_alpha_yv12(w,h,src,srca,stride,lvo_mem+bespitch*y0+x0,bespitch); - break; - case IMGFMT_YUY2: - bespitch = (priv->src_width*2 + apitch) & (~apitch); - vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0,bespitch); - break; - case IMGFMT_UYVY: - bespitch = (priv->src_width*2 + apitch) & (~apitch); - vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0+1,bespitch); - break; - case IMGFMT_RGB32: - case IMGFMT_BGR32: - bespitch = (priv->src_width*4 + apitch) & (~apitch); - vo_draw_alpha_rgb32(w,h,src,srca,stride,lvo_mem+y0*bespitch+4*x0,bespitch); - break; - case IMGFMT_RGB24: - case IMGFMT_BGR24: - bespitch = (priv->src_width*3 + apitch) & (~apitch); - vo_draw_alpha_rgb24(w,h,src,srca,stride,lvo_mem+y0*bespitch+3*x0,bespitch); - break; - case IMGFMT_RGB16: - case IMGFMT_BGR16: - bespitch = (priv->src_width*2 + apitch) & (~apitch); - vo_draw_alpha_rgb16(w,h,src,srca,stride,lvo_mem+y0*bespitch+2*x0,bespitch); - break; - case IMGFMT_RGB15: - case IMGFMT_BGR15: - bespitch = (priv->src_width*2 + apitch) & (~apitch); - vo_draw_alpha_rgb15(w,h,src,srca,stride,lvo_mem+y0*bespitch+2*x0,bespitch); - break; - default: - return; - } -#endif -} - -static uint32_t w100_draw_slice_420(uint8_t *image[], int stride[], - int w, int h, int x, int y) -{ - w100_priv_t *priv = &st_w100_priv; - uint8_t *src; - uint8_t *dest; - int i; - - /* Plane Y */ - dest = priv->frame_addrs[priv->current_frame].y; - dest += dstrides.y * y + x; - src = image[0]; - for (i = 0; i < h; ++i) { - memcpy(dest, src, w); - src += stride[0]; - dest += dstrides.y; - } - - /* Plane V */ - dest = priv->frame_addrs[priv->current_frame].u; - dest += dstrides.v * y / 4 + x; - src = image[1]; - for (i = 0; i < h / 2; ++i) { - memcpy(dest, src, w / 2); - src += stride[1]; - dest += dstrides.v / 2; - } - - /* Plane U */ - dest = priv->frame_addrs[priv->current_frame].v; - dest += dstrides.u * y / 4 + x; - src = image[2]; - for (i = 0; i < h / 2; ++i) { - memcpy(dest, src, w / 2); - src += stride[2]; - dest += dstrides.u / 2; - } - - return 0; -} - -/* - w must be multiple of 8 - */ -static uint32_t w100_draw_slice_420_rotate3(uint8_t *image[], int stride[], - int w, int h, int x, int y) -{ - w100_priv_t *priv = &st_w100_priv; - void *src, *dest; - int i, dpitch2, h_; - - h_ = h; - - for (i = 0; i < 3; ++i) { - src = image[i]; - switch (i) { - case 0: - dest = priv->frame_addrs[priv->current_frame].y; - dest += dstrides.y * x + dstrides.y - y; - dpitch2 = dstrides.y << 1; - break; - case 1: - dest = priv->frame_addrs[priv->current_frame].u; - dest += (dstrides.y >> 1) * (x >> 1) + (dstrides.y >> 1) - (y >> 1); - dpitch2 = dstrides.y; - h = h_ >> 1; - w >>= 1; - break; - case 2: - dest = priv->frame_addrs[priv->current_frame].v; - dest += (dstrides.y >> 1) * (x >> 1) + (dstrides.y >> 1) - (y >> 1); - h = h_ >> 1; - dpitch2 = dstrides.y; - break; - } - - __asm__ __volatile__ ( - "1: \n\t" - "mov r8, %[w] \n\t" - "sub %[dest], %[dest], #1 \n\t" - "mov r4, %[dest] \n\t" - "add r5, %[dest], %[dpitch2], lsr #1 \n\t" - - "2: \n\t" - "ldrb r0, [%[src]] \n\t" - "ldrb r1, [%[src], #1] \n\t" - "add %[src], %[src], #2 \n\t" - "strb r0, [r4] \n\t" - "strb r1, [r5] \n\t" - "add r4, r4, %[dpitch2] \n\t" - "add r5, r5, %[dpitch2] \n\t" - "ldrb r0, [%[src]] \n\t" - "ldrb r1, [%[src], #1] \n\t" - "add %[src], %[src], #2 \n\t" - "strb r0, [r4] \n\t" - "strb r1, [r5] \n\t" - "add r4, r4, %[dpitch2] \n\t" - "add r5, r5, %[dpitch2] \n\t" - "subs r8, r8, #4 \n\t" - "bne 2b \n\t" - - "add %[src], %[src], %[srcdiff] \n\t" - "subs %[h], %[h], #1 \n\t" - "bne 1b \n\t" - : [src]"+r"(src), [dest]"+r"(dest), [h]"+r"(h) - : [dpitch2]"r"(dpitch2), [w]"r"(w), [srcdiff]"r"(stride[i] - w) - : "memory", "r0", "r1", "r4", "r5", "r8"); - } -} - -static uint32_t w100_draw_slice_packed(uint8_t *image[], int stride[], - int w, int h, int x, int y) -{ -#if 0 - uint8_t *src; - uint8_t *dest; - int i; - - dest = st_w100_mem + vidix_play.offsets[st_next_frame] + vidix_play.offset.y; - dest += dstrides.y * y + x; - src = image[0]; - for (i = 0; i < h; ++i) { - memcpy(dest, src, w * st_image_bpp); - src += stride[0]; - dest += dstrides.y; - } -#endif - return 0; -} - -static uint32_t w100_get_image(mp_image_t *mpi) -{ -#if 0 - mp_msg(MSGT_VO, MSGL_V, "vo_w100: w100_get_image called.\n"); - - if (mpi->type == MP_IMGTYPE_STATIC && st_num_frames > 1) - return VO_FALSE; - if (mpi->flags & MP_IMGFLAG_READABLE) - return VO_FALSE; /* slow video ram */ - if (((mpi->stride[0] == dstrides.y && - (!(mpi->flags & MP_IMGFLAG_PLANAR) || - (mpi->stride[1] == dstrides.u && mpi->stride[2]==dstrides.v))) - || (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) && - (!(vidix_play.flags & VID_PLAY_INTERLEAVED_UV))) { - if (mpi->flags & MP_IMGFLAG_ACCEPT_WIDTH) { - // check if only width is enough to represent strides: - if (mpi->flags & MP_IMGFLAG_PLANAR) { - if ((dstrides.y >> 1) != dstrides.v || dstrides.v != dstrides.u) - return VO_FALSE; - } else { - if (dstrides.y % (mpi->bpp / 8)) - return VO_FALSE; - } - } - mpi->planes[0] = st_w100_mem + vidix_play.offsets[st_next_frame] - + vidix_play.offset.y; - mpi->width = mpi->stride[0] = dstrides.y; - if (mpi->flags & MP_IMGFLAG_PLANAR) { - mpi->planes[1] = st_w100_mem + vidix_play.offsets[st_next_frame] - + vidix_play.offset.v; - mpi->stride[1] = dstrides.v >> mpi->chroma_x_shift; - mpi->planes[2] = st_w100_mem + vidix_play.offsets[st_next_frame] - + vidix_play.offset.u; - mpi->stride[2] = dstrides.u >> mpi->chroma_x_shift; - } else - mpi->width /= mpi->bpp / 8; - mpi->flags |= MP_IMGFLAG_DIRECT; - return VO_TRUE; - } -#endif - return VO_FALSE; -} - -static void w100_set_yuv_addrs(w100_priv_t *priv, w100_yuv_planes_t *offsets) -{ - uint32_t val; - - priv->video_y_offset.f.y_offset = GetRealMemAddr((uint32_t)offsets->y); - priv->video_u_offset.f.u_offset = GetRealMemAddr((uint32_t)offsets->u); - priv->video_v_offset.f.v_offset = GetRealMemAddr((uint32_t)offsets->v); - AtiCore_WriteReg(mmVIDEO_Y_OFFSET, (uint32_t *)&priv->video_y_offset); - AtiCore_WriteReg(mmVIDEO_U_OFFSET, (uint32_t *)&priv->video_u_offset); - AtiCore_WriteReg(mmVIDEO_V_OFFSET, (uint32_t *)&priv->video_v_offset); - - val = 0x7B; - AtiCore_WriteReg(mmDISP_DB_BUF_CNTL, &val); -} - -static void w100_set_overlay_expand(w100_priv_t *priv, int exp_h, int exp_v) -{ - video_ctrl_u video_ctrl; - - priv->overlay_expand_h = exp_h; - priv->overlay_expand_v = exp_v; - - AtiCore_ReadReg(mmVIDEO_CTRL, (uint32_t *)&video_ctrl); - video_ctrl.f.video_hor_exp = exp_h; - video_ctrl.f.video_ver_exp = exp_v; - AtiCore_WriteReg(mmVIDEO_CTRL, (uint32_t *)&video_ctrl); -} - -static int w100_setup(w100_priv_t *priv) -{ - if (!AtiCore_AllocOverlay(&priv->overlay_handle)) { - mp_msg(MSGT_VO, MSGL_FATAL, - "vo_w100: AtiCore_AllocOverlay failed.\n"); - return 0; - } - if (!AtiCore_SetupOverlay(priv->overlay_handle, &priv->overlay_prop)) { - mp_msg(MSGT_VO, MSGL_FATAL, - "vo_w100: AtiCore_SetupOverlay failed.\n"); - return 0; - } - AtiCore_SetOverlayPos(priv->overlay_handle, - priv->overlay_pos_x, priv->overlay_pos_y); - AtiCore_SetOverlayOnOff(priv->overlay_handle, 1); - w100_set_yuv_addrs(priv, &priv->frame_offsets[priv->current_frame]); - w100_set_overlay_expand(priv, priv->overlay_expand_h, priv->overlay_expand_v); - AtiCore_SetDisplayBrightness(priv->display_brightness); - AtiCore_SetGraphicWindowOnOff(priv->is_graphic_window_enabled); - -/* graphic_ctrl_t gc; */ -/* AtiCore_ReadReg(mmGRAPHIC_CTRL, &gc); */ -/* gc.low_power_on = 0; */ -/* AtiCore_WriteReg(mmGRAPHIC_CTRL, &gc); */ - - return 1; -} - -static void *w100_offset2addr(uint32_t offset) -{ - void *addr; - AtiCore_SetupMemoryTransfer((uint32_t)offset, &addr); - AtiCore_TerminateMemoryTransfer(); - return addr; -} - -// ---------------------------------------------------------------- interfaces -/* - * Preinitializes driver (real INITIALIZATION) - * arg - currently it's vo_subdevice - * returns: zero on successful initialization, non-zero on error. - */ -static int preinit(const char *vo_subdevice) -{ - w100_priv_t *priv = &st_w100_priv; - - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: preinit() was called\n"); - - if (!AtiCore_ProcessAttach()) - return -1; - - /* fill w100_priv_t information */ - memset(priv, 0, sizeof(*priv)); - priv->rotate = -1; - - if (subopt_parse(vo_subdevice, subopts) != 0) { - return -1; - } - - priv->is_graphic_window_enabled = 1; - priv->eq_brightness = 0; /* FIXME */ - - GetAvailableVideoMem(&priv->vram_size[INTERNAL_VRAM], - &priv->vram_size[EXTERNAL_VRAM]); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: VRAM size %dKB/%dKB\n", - priv->vram_size[INTERNAL_VRAM] / 1024, - priv->vram_size[EXTERNAL_VRAM] / 1024); - - priv->vram_addr[INTERNAL_VRAM] = w100_offset2addr(VRAM_OFFSET_INTERNAL); - priv->vram_addr[EXTERNAL_VRAM] = w100_offset2addr(VRAM_OFFSET_EXTERNAL); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: VRAM address 0x%08x/0x%08x\n", - priv->vram_addr[INTERNAL_VRAM], priv->vram_addr[EXTERNAL_VRAM]); - - lcd_background_color_u lbc; - lbc.f.lcd_bg_red = 0; - lbc.f.lcd_bg_green = 0; - lbc.f.lcd_bg_blue = 0; - AtiCore_WriteReg(mmLCD_BACKGROUND_COLOR, &lbc); - - return 0; -} - -/* - * Initialize (means CONFIGURE) the display driver. - * params: - * src_width,srcheight: image source size - * dst_width,dst_height: size of the requested window size, just a hint - * fullscreen: flag, 0=windowd 1=fullscreen, just a hint - * title: window title, if available - * format: fourcc of pixel format - * returns : zero on successful initialization, non-zero on error. - */ -static int config(uint32_t src_width, uint32_t src_height, - uint32_t dst_width, uint32_t dst_height, uint32_t flags, - char *title, uint32_t format) -{ - w100_priv_t *priv = &st_w100_priv; - int fs = flags & VOFLAG_FULLSCREEN; - int vm = flags & VOFLAG_MODESWITCHING; - int zoom = flags & VOFLAG_SWSCALE; - int y_pitch, uv_pitch; - int x_res = 480, y_res = 640; - uint32_t apitch; - int i; - uint32_t plane_flags = 0; - - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: config() was called\n"); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: src_width:%d, src_height:%d, dst_width:%d, dst_height:%d\n", - src_width, src_height, dst_width, dst_height); - - if (!query_format(format)) { - printf("vo_w100: unsupported fourcc for this w100 driver: %x (%s)\n", - format, vo_format_name(format)); - return -1; - } - priv->format = format; - - // rotate - if (priv->rotate < 0) { - if (src_width > src_height) { - priv->current_rotate = 3; - } else { - priv->current_rotate = 0; - } - } else - priv->current_rotate = priv->rotate; - if (priv->current_rotate != 0 && priv->current_rotate != 3) { - mp_msg(MSGT_VO, MSGL_FATAL, "vo_w100: Rotate %d not supported\n", priv->current_rotate); - return -1; - } - - if (priv->current_rotate == 1 || priv->current_rotate == 3) { - i = src_width; - src_width = src_height; - src_height = i; - } - - dst_width = src_width; - dst_height = src_height; - - if (fs) { - int arg[] = { 0, 0, 1, 1, 2, 2, 2, 2, 3 }; - int arg2[] = { 1, 2, 4, 8 }; - int hor_exp = x_res / src_width; - int ver_exp = y_res / (src_height - 32); - int expand; - mp_msg(MSGT_VO, MSGL_V, "vo_w100: hor_exp:%d, ver_exp:%d\n", - hor_exp, ver_exp); - if ((hor_exp > 0 && hor_exp <= 8 && arg[hor_exp] >= 0) && - (ver_exp > 0 && ver_exp <= 8 && arg[ver_exp] >= 0)) { - if (arg[hor_exp] > arg[ver_exp]) - expand = arg[ver_exp]; - else - expand = arg[hor_exp]; - } - priv->overlay_expand_h = priv->overlay_expand_v = expand; - dst_width *= arg2[expand]; - dst_height *= arg2[expand]; - if (dst_height > y_res) - dst_height = y_res; - } - - // 表示領域をセンタリング - priv->overlay_pos_x = (x_res - dst_width) / 2; - priv->overlay_pos_y = (y_res - dst_height) / 2; - - // Hardware scaling - geometry(&priv->overlay_pos_x, &priv->overlay_pos_y, - &dst_width, &dst_height, x_res, y_res); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: overlay pos(%d, %d)\n", - priv->overlay_pos_x, priv->overlay_pos_y); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: src size(%dx%d), dst size(%dx%d)\n", - src_width, src_height, dst_width, dst_height); - - /* select first frame */ - priv->current_frame = 0; - - priv->src_width = src_width; - priv->src_height = src_height; - priv->overlay_pitch_y = 16; - priv->overlay_pitch_u = 16; - priv->overlay_pitch_v = 16; - - switch (format) { - case IMGFMT_YV12: - case IMGFMT_IYUV: - case IMGFMT_I420: - case IMGFMT_YVU9: - case IMGFMT_IF09: - case IMGFMT_Y8: - case IMGFMT_Y800: - y_pitch = (src_width + 15) & ~15; - uv_pitch = ((src_width / 2) + 7) & ~7; - break; - default: - return -1; - } - - /* サーフェイスが内蔵VRAMに収まらない場合は、V-Planeを外部VRAMに追い出す。 */ - if (y_pitch * src_height + uv_pitch * src_height > priv->vram_size[INTERNAL_VRAM]) - plane_flags = 4; - - if (vo_doublebuffering) { - if (y_pitch * src_height + uv_pitch * src_height * 2> priv->vram_size[INTERNAL_VRAM]) - plane_flags = 4; - } - - /* 外部VRAMにプレーンを置いた場合は、Graphic windowを切らないと画像が乱れる */ -/* priv->is_graphic_window_enabled = (plane_flags != 0) ? 0 : 1; */ - priv->is_graphic_window_enabled = 0; - - uint32_t p[2] = { - VRAM_OFFSET_INTERNAL, - VRAM_OFFSET_EXTERNAL + 640 * 480 * 2 - }; - i = 0; - while (i < MAX_FRAMES) { - int sel, j; - /* Y-plane */ - sel = plane_flags & 1 ? EXTERNAL_VRAM : INTERNAL_VRAM; - priv->frame_offsets[i].y = (void *)p[sel]; - priv->frame_addrs[i].y = w100_offset2addr(p[sel]); - p[sel] += y_pitch * src_height; - /* U-plane */ - sel = plane_flags & 2 ? EXTERNAL_VRAM : INTERNAL_VRAM; - priv->frame_offsets[i].u = (void *)p[sel]; - priv->frame_addrs[i].u = w100_offset2addr(p[sel]); - p[sel] += uv_pitch * (src_height / 2); - /* V-plane */ - sel = plane_flags & 4 ? EXTERNAL_VRAM : INTERNAL_VRAM; - priv->frame_offsets[i].v = (void *)p[sel]; - priv->frame_addrs[i].v = w100_offset2addr(p[sel]); - p[sel] += uv_pitch * (src_height / 2); - if ((p[INTERNAL_VRAM] - VRAM_OFFSET_INTERNAL >= priv->vram_size[INTERNAL_VRAM]) || - (p[EXTERNAL_VRAM] - VRAM_OFFSET_EXTERNAL >= priv->vram_size[EXTERNAL_VRAM])) - break; - mp_msg(MSGT_VO, MSGL_V, "vo_w100: frame_offsets[%d].y = 0x%08x\n", i, priv->frame_offsets[i].y); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: frame_offsets[%d].u = 0x%08x\n", i, priv->frame_offsets[i].u); - mp_msg(MSGT_VO, MSGL_V, "vo_w100: frame_offsets[%d].v = 0x%08x\n", i, priv->frame_offsets[i].v); - ++i; - } - priv->nframes = i; - if (priv->nframes > MAX_FRAMES) - priv->nframes = MAX_FRAMES; - mp_msg(MSGT_VO, MSGL_V, "vo_w100: nframes = %d\n", priv->nframes); - - priv->overlay_prop.lpSrcBitmap = (void *)(priv->frame_offsets[0].y); - priv->overlay_prop.XCoord = 0; - priv->overlay_prop.YCoord = 0; - priv->overlay_prop.SrcPitch = y_pitch; - priv->overlay_prop.SrcHeight = src_height; - priv->overlay_prop.OverlayWidth = dst_width; - priv->overlay_prop.OverlayHeight = dst_height; - priv->overlay_prop.lpOverlayKey = 0; - priv->overlay_prop.OverlayFormat = OVLTYPE_YUV420; - - priv->display_brightness = 127; - - w100_set_yuv_addrs(priv, &priv->frame_offsets[0]); - - /* clear every frame */ - memset(priv->vram_addr[INTERNAL_VRAM], 0, priv->vram_size[INTERNAL_VRAM]); - memset(priv->vram_addr[EXTERNAL_VRAM] + 640 * 480 * 2, 0, - priv->vram_size[EXTERNAL_VRAM] - 640 * 480 * 2); - - switch (format) { - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - case IMGFMT_YVU9: - case IMGFMT_IF09: - case IMGFMT_Y800: - case IMGFMT_Y8: - apitch = priv->overlay_pitch_y - 1; - dstrides.y = (src_width + apitch) & ~apitch; - apitch = priv->overlay_pitch_v - 1; - dstrides.v = (src_width + apitch) & ~apitch; - apitch = priv->overlay_pitch_u - 1; - dstrides.u = (src_width + apitch) & ~apitch; -/* st_image_bpp = 1; */ - break; - case IMGFMT_RGB32: - case IMGFMT_BGR32: - apitch = priv->overlay_pitch_y - 1; - dstrides.y = (src_width * 4 + apitch) & ~apitch; - dstrides.u = dstrides.v = 0; -/* st_image_bpp = 4; */ - break; - case IMGFMT_RGB24: - case IMGFMT_BGR24: - apitch = priv->overlay_pitch_y - 1; - dstrides.y = (src_width * 3 + apitch) & ~apitch; - dstrides.u = dstrides.v = 0; -/* st_image_bpp = 3; */ - break; - default: - apitch = priv->overlay_pitch_y - 1; - dstrides.y = (src_width * 2 + apitch) & ~apitch; - dstrides.u = dstrides.v = 0; -/* st_image_bpp = 2; */ - break; - } - - if (format == IMGFMT_YV12 || format == IMGFMT_I420 || format == IMGFMT_IYUV) { - switch (priv->current_rotate) { - case 0: - video_out_w100.draw_slice = w100_draw_slice_420; - break; - case 1: - break; - case 2: - break; - case 3: - video_out_w100.draw_slice = w100_draw_slice_420_rotate3; - break; - default: - video_out_w100.draw_slice = w100_draw_slice_420; - break; - } - } - /* else if (format == IMGFMT_YVU9 || format == IMGFMT_IF09) */ - /* vo_server->draw_slice = w100_draw_slice_410; */ - else - video_out_w100.draw_slice = w100_draw_slice_packed; - - if (!w100_setup(priv)) - return -1; - - return 0; -} - -/* - * Control interface - */ -static int control(uint32_t request, void *data, ...) -{ - w100_priv_t *priv = &st_w100_priv; - switch (request) { - case VOCTRL_GET_IMAGE: - return w100_get_image(data); - case VOCTRL_QUERY_FORMAT: - return query_format(*((uint32_t *)data)); - case VOCTRL_SET_EQUALIZER: - { - va_list ap; - int value; - - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); - - if (!strcasecmp(data, "brightness")) { - int br; - priv->eq_brightness = value * 10; - br = (priv->eq_brightness + 1000) * 127 / 2000; - if (br < 0) - br = 0; - if (br > 127) - br = 127; - if (br > 64) - br -= 64; - else - br += 64; - priv->display_brightness = br; - - mp_msg(MSGT_VO, MSGL_V, - "vo_w100: control(VOCTRL_SET_EQUALIZER) %d %d\n", - value, br); - - if (AtiCore_SetDisplayBrightness(priv->display_brightness)) - return VO_TRUE; - else - return VO_FALSE; - } - } - case VOCTRL_GET_EQUALIZER: - { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - - if (!strcasecmp(data, "brightness")) { - *value = priv->eq_brightness; - return VO_TRUE; - } else - return VO_FALSE; - } - } - - return VO_NOTIMPL; -} - -/* - * Display a new RGB/BGR frame of the video to the screen. - * params: - * src[0] - pointer to the image - */ -int draw_frame(uint8_t *src[]) -{ - mp_msg(MSGT_VO, MSGL_V, "vo_w100: dummy draw_frame() was called\n"); - return -1; -} - -/* - * Draw a planar YUV slice to the buffer: - * params: - * src[3] = source image planes (Y,U,V) - * stride[3] = source image planes line widths (in bytes) - * w,h = width*height of area to be copied (in Y pixels) - * x,y = position at the destination image (in Y pixels) - */ -int draw_slice(uint8_t *src[], int stride[], int w,int h, int x,int y) -{ - mp_msg(MSGT_VO, MSGL_V, "vo_w100: dummy draw_slice() was called\n"); - return -1; -} - - -/* - * Draws OSD to the screen buffer - */ -static void draw_osd(void) -{ - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: draw_osd() was called\n"); - vo_draw_text(st_w100_priv.src_height, st_w100_priv.src_width, draw_alpha); -} - -/* - * Blit/Flip buffer to the screen. Must be called after each frame! - */ -void flip_page(void) -{ - w100_priv_t *priv = &st_w100_priv; - - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: flip_page() was called\n"); - if (vo_doublebuffering) { - w100_set_yuv_addrs(priv, &priv->frame_offsets[priv->current_frame]); - priv->current_frame = (priv->current_frame + 1) % priv->nframes; - } -} - -/* - * This func is called after every frames to handle keyboard and - * other events. It's called in PAUSE mode too! - */ -extern int g_sigcont; -void check_events(void) -{ - w100_priv_t *priv = &st_w100_priv; - - if (g_sigcont) { - mp_msg(MSGT_VO, MSGL_INFO, "vo_w100: SIGCONT recived.\n"); - - /* Immediately after resuming, because kernel modifies the register, it - waits for that. */ - usleep(1000 * 1000); - - /* re-attach */ -#if 0 - /* Hmm... With respect to of context is necessary, but really it - fails. It does not release and also there is no problem. */ - if (!AtiCore_ReleaseOverlay(priv->overlay_handle)) { - mp_msg(MSGT_VO, MSGL_FATAL, - "vo_w100: AtiCore_ReleaseOverlay failed.\n"); - exit_player(NULL); - } -#endif - if (!AtiCore_ProcessDetach()) { - mp_msg(MSGT_VO, MSGL_FATAL, - "vo_w100: AtiCore_ProcessDetach failed.\n"); - exit_player(NULL); - } - if (!AtiCore_ProcessAttach()) { - mp_msg(MSGT_VO, MSGL_FATAL, - "vo_w100: AtiCore_ProcessAttach failed.\n"); - exit_player(NULL); - } - - /* re-setup */ - if (!w100_setup(priv)) - exit_player(NULL); - - g_sigcont = 0; - } -} - -/* - * Closes driver. Should restore the original state of the system. - */ -static void uninit(void) -{ - mp_msg(MSGT_VO, MSGL_V, "vo_w100: uninit() was called\n"); - - AtiCore_SetOverlayOnOff(st_w100_priv.overlay_handle, 0); - AtiCore_ReleaseOverlay(st_w100_priv.overlay_handle); - AtiCore_SetGraphicWindowOnOff(1); - AtiCore_ProcessDetach(); -} - - -// ---------------------------------------------------------------- -static int query_format(uint32_t format) -{ - mp_msg(MSGT_VO, MSGL_V, "vo_w100: query_format was called: %x (%s)\n", - format, vo_format_name(format)); - - if (IMGFMT_IS_RGB(format)) { - /* RGB/BGR Formats */ - // TODO - return 0; - - switch (IMGFMT_RGB_DEPTH(format)) { - case 16: - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW - | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; - break; - } - } else { - /* Planar YUV Formats */ - switch (format) { - case IMGFMT_YV12: - case IMGFMT_IYUV: - case IMGFMT_I420: - case IMGFMT_YVU9: - case IMGFMT_IF09: - case IMGFMT_Y8: - case IMGFMT_Y800: - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW - | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; - break; - } - } - - return 0; -} - -static void dump_vo_info(void) -{ - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: ================================\n"); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_flags:%x\n", vo_flags); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_depthonscreen:%d\n", vo_depthonscreen); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_screenwidth:%d\n", vo_screenwidth); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_screenheight:%d\n", vo_screenheight); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dx:%d\n", vo_dx); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dy:%d\n", vo_dy); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dwidth:%d\n", vo_dwidth); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dheight:%d\n", vo_dheight); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dbpp:%d\n", vo_dbpp); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_grabpointer:%d\n", vo_grabpointer); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_doublebuffering:%d\n", vo_doublebuffering); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_directrendering:%d\n", vo_directrendering); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_vsync:%d\n", vo_vsync); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_fs:%d\n", vo_fs); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_fsmode:%d\n", vo_fsmode); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_panscan:%f\n", vo_panscan); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_adapter_num:%d\n", vo_adapter_num); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_refresh_rate:%d\n", vo_refresh_rate); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_brightness:%d\n", vo_gamma_brightness); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_saturation:%d\n", vo_gamma_saturation); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_contrast:%d\n", vo_gamma_contrast); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_hue:%d\n", vo_gamma_hue); -/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_red_intensity:%d\n", vo_gamma_red_intensity); */ -/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_green_intensity:%d\n", vo_gamma_green_intensity); */ -/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_blue_intensity:%d\n", vo_gamma_blue_intensity); */ -/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_mouse_timer_const:%d\n", vo_mouse_timer_const); */ - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_nomouse_input:%d\n", vo_nomouse_input); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_pts:%d\n", vo_pts); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_fps:%f\n", vo_fps); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_colorkey:%d\n", vo_colorkey); - mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: ================================\n"); -} diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h deleted file mode 100644 index 59cf58be26..0000000000 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h +++ /dev/null @@ -1,306 +0,0 @@ -/* -*- mode: c++; tab-width: 4 -*- */ - -/* $Id$ */ - -/* - * Copyright (C) 2003-2004 AGAWA Koji - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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-1307, USA. - */ - -/** - * @file w100api.h - * @brief - * - * - * - * @author AGAWA Koji - * @date $Date$ - * @version $Revision$ - */ - -#ifndef W100API_H_INCLUDED -#define W100API_H_INCLUDED - -#ifdef __cplusplus -# define EXTERN_C_BEGIN extern "C" { -# define EXTERN_C_END } -#else -# define EXTERN_C_BEGIN -# define EXTERN_C_END -#endif - -EXTERN_C_BEGIN - -#include - -typedef int8_t s8; -typedef int16_t s16; -typedef int32_t s32; -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; - -#include "vo_w100_fb.h" - -// DP_GUI_MASTER_CNTL.GMC_Dst_DataType -// DP_DATATYPE.Dp_Dst_DataType -/* #define DSTTYPE_8BPP 2 // 8 bpp grey scale */ -/* #define DSTTYPE_16BPP_1555 3 //16 bpp aRGB 1555 */ -/* #define DSTTYPE_16BPP_444 5 //16 bpp aRGB 4444 */ -#define DSTTYPE_8BPP 1 - -// DP_GUI_MASTER_CNTL.GMC_Src_DataType -// DP_DATATYPE.Dp_Src_DataType -#define SRCTYPE_1BPP_OPA 0 //mono (expanded to frgd, bkgd) -#define SRCTYPE_1BPP_TRA 1 //mono (expanded to frgd, leave_alone) -#define SRCTYPE_EQU_DST 3 //color (same as DST) -#define SRCTYPE_SOLID_COLOR_BLT 4 //solid color for Blt (use frgd) -#define SRCTYPE_4BPP 5 //4 bpp -#define SRCTYPE_12BPP_PACKED 6 //12 bpp packed - -#define ROP3_SRCCOPY 0xCC - -#define OVLTYPE_YUV420 0x07 - -#define INTERNAL_VRAM 0 -#define EXTERNAL_VRAM 1 - -#define VRAM_OFFSET_INTERNAL 0x00000000 -#define VRAM_OFFSET_EXTERNAL 0x0F000000 - -typedef struct { - /* 順序と型が未確定 */ - int16_t XCoord; - int16_t YCoord; -} ATI_POINT; - -typedef struct { - /* 順序と型が未確定 */ - int16_t XCoord; - int16_t YCoord; - int16_t Width; - int16_t Height; -} ATI_RECT; - -typedef struct { - /* 順序と型が未確定 */ - uint32_t Count; /* +0 */ - uint8_t ScaleXFactor; /* +4 確定 */ - uint8_t ScaleYFactor; /* +5 確定 */ - uint8_t BlendOn; /* +6 確定 */ - uint8_t dummy1; -} ATI_STRETCH; /* 8bytes? */ - -typedef struct { - uint32_t *lpSrcBitmap; - uint16_t XCoord; /* +4 確定 */ - uint16_t YCoord; /* +6 確定 */ - uint16_t SrcPitch; /* +8 確定 */ - uint16_t SrcHeight; /* +10 確定 */ - uint16_t OverlayWidth; - uint16_t OverlayHeight; - uint16_t *lpOverlayKey; /* +16 確定 */ - // uint16_t key[2] へのポインタ - uint8_t OverlayFormat; /* +20 確定 */ - uint8_t dummy1; - uint16_t dummy2; -} ATI_OVERLAYPROP; /* 24bytes? */ - -typedef struct { - int HInvert; - int VInvert; -} ATI_EXTVIDEOPROP; - -typedef struct { - ATI_EXTVIDEOPROP ExtVideoProp; -} ATI_UNKNOWN1; - -typedef struct { - ATI_UNKNOWN1 u1; // こっち？ - uint8_t HExpansion; /* +8 確定 */ - uint8_t VExpansion; /* +9 確定 */ - uint8_t RConversion; /* +12 確定 */ -/* ATI_UNKNOWN1 x; */ -} ATI_EXTENDEDOVERLAYPROP; /* 16byte? */ - -/** - * アクセラレーションの利用を開始する。 - * - * @return 1:success, 0:fail - */ -int AtiCore_ProcessAttach(void); -int AtiCore_ProcessAttachSpecialMode(uint32_t); - -/** - * アクセラレーションの利用を終了する。 - * - * @return *不明* - */ -int AtiCore_ProcessDetach(void); - -/** - * サーフェスをビデオメモリ上に作成する。 - * - * @arg handle (返値)サーフェスのハンドル - * @arg offset (返値)サーフェスのオフセット - * @arg size サーフェスのサイズ - * @arg direction (0:低位から高位へ, 1:高位から低位へ)向かって確保 - * @return 1:success, 0:fail - */ -int AtiCore_AllocateSurface(uint16_t *handle, uint32_t *offset, - uint32_t size, uint32_t direction); - -/** - * サーフェスを破棄する。 - * - * @arg handle サーフェスのハンドル - * @return 1:success, 0:fail - */ -int AtiCore_DestroySurface(uint16_t handle); - -/*8 - * @param rop 8ビットのフラグと思われる - */ -int AtiCore_SetRopOperation(uint32_t rop); - -int AtiCore_SetDstType(uint32_t); -int AtiCore_SetSrcType(uint32_t); -int AtiCore_SetSrcClippingRect(ATI_CLIPRECT *cliprect); -int AtiCore_SetDstClippingRect(ATI_CLIPRECT *cliprect); -int AtiCore_SetSrcPitchOffset(int pitch, int offset); -int AtiCore_SetDstPitchOffset(int pitch, int offset); - -int AtiCore_BitBltFilpRotate(int blt090Rotate, - ATI_RECT *dstRect, ATI_RECT *srcRect); -int AtiCore_StretchBlt(ATI_STRETCH *option, - ATI_POINT *point, ATI_RECT *srcRect); - - -/** - * (BitBltなどの)処理が完了するのを待つ。 - * - * @param nsec ウェイト時間(msec) - * @return 1:処理が完了した, 0:処理はまだ終わっていない - */ -int AtiCore_WaitComplete(int msec); - -/** - * オーバレイを作成する。 - * - * @param handle (返値)オーバレイのハンドル - * @return 1:success, 0:fail - */ -int AtiCore_AllocOverlay(uint16_t *handle); - -int AtiCore_ReleaseOverlay(uint16_t handle); - -/** - * @return 1:success, 0:fail - */ -int AtiCore_SetupOverlay(uint16_t handle, ATI_OVERLAYPROP *prop); - -int AtiCore_SetupOverlayExtended(uint16_t handle, ATI_EXTENDEDOVERLAYPROP *prop); - -/** - * @return 1:success, 0:fail - */ -int AtiCore_SetOverlayOnOff(uint16_t handle, int isEnable); - -int AtiCore_SetOverlayPos(uint16_t handle, uint16_t x, uint16_t y); - -int AtiCore_SetupMemoryTransfer(uint32_t offset, void **regdata); -int AtiCore_TerminateMemoryTransfer(void); - -int AtiCore_GetFrontBufferPitchOffset(uint32_t *pitch, uint32_t *offset); - -/** - * @return 1:success, 0:fail - */ -int AtiCore_SetDisplayBrightness(int brightness); - -/** - * @return 1:success, 0:fail - */ -int GetAvailableVideoMem(uint32_t *internal, uint32_t *external); - -/* - * 1 ; 0 - */ -int AtiCore_SetGraphicWindowOnOff(int ); - -int AtiCore_ReadReg(uint32_t reg, void *val); -int AtiCore_WriteReg(uint32_t reg, void *val); - -uint32_t GetRealMemAddr(uint32_t offset); - -int AtiCore_SetBkgColour(uint32_t); - -/* ================================================================ */ -/* from libqte.so.2.3.2 */ -/* -AtiCore_AlphaBlend -AtiCore_BitBlt -AtiCore_BrushType -AtiCore_CursorOnOff -AtiCore_DrawPixel -AtiCore_Flush -AtiCore_GammaCorrection -AtiCore_GetCRC -AtiCore_GetCursorPos -AtiCore_GetDeviceInfo -AtiCore_GetGPIO_Data -AtiCore_GetGraphicExtended -AtiCore_GetGraphicWindowPos -AtiCore_GetLargestVideoMemBlock -AtiCore_GetLastError -AtiCore_GetMultiCRC -AtiCore_GetOverlayPos -AtiCore_GetPitchOffsetProperty -AtiCore_Host -AtiCore_LoadCursorBitMap -AtiCore_PaintRect -AtiCore_PolyScanline -AtiCore_Polyline -AtiCore_ProcessAttachMinimal -AtiCore_ProcessAttachSpecialMode -AtiCore_ProcessDetachMinimal -AtiCore_ProcessDetachSpecialMode -AtiCore_ReadCfgReg -AtiCore_ScanlineShading -AtiCore_SetApertures -AtiCore_SetBkgColour -AtiCore_SetBytePixelOrder -AtiCore_SetCursorPos -AtiCore_SetDisplayParameters -AtiCore_SetDriverBehaviour -AtiCore_SetFrgColour -AtiCore_SetFrontBuffer -AtiCore_SetGPIO_Data -AtiCore_SetGraphicWindowPos -AtiCore_SetOverlayPosUsingGraphicWindowXY -AtiCore_SetPartialCursor -AtiCore_SetupGraphicExtended -AtiCore_SetupGraphicWindow -AtiCore_SetupPM4 -AtiCore_SmallText -AtiCore_SubmitPM4Packet -AtiCore_TransBitBlt -AtiCore_WriteCfgReg - */ - -EXTERN_C_END - -#endif /* W100API_H_INCLUDED */ diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h deleted file mode 100644 index 39318c645b..0000000000 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h +++ /dev/null @@ -1,4338 +0,0 @@ -/* - * linux/drivers/video/w100fb.h - * - * Frame Buffer Device for ATI w100 (Wallaby) - * - * Copyright (C) 2002, ATI Corp. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * ChangeLog: - * - */ - -#if !defined (_W100FB_H) -#define _W100FB_H - -/* Block CIF Start: */ -#define mmCHIP_ID 0x0000 -#define mmREVISION_ID 0x0004 -#define mmWRAP_BUF_A 0x0008 -#define mmWRAP_BUF_B 0x000C -#define mmWRAP_TOP_DIR 0x0010 -#define mmWRAP_START_DIR 0x0014 -#define mmCIF_CNTL 0x0018 -#define mmCFGREG_BASE 0x001C -#define mmCIF_IO 0x0020 -#define mmCIF_READ_DBG 0x0024 -#define mmCIF_WRITE_DBG 0x0028 -#define cfgIND_ADDR_A_0 0x0000 -#define cfgIND_ADDR_A_1 0x0001 -#define cfgIND_ADDR_A_2 0x0002 -#define cfgIND_DATA_A 0x0003 -#define cfgREG_BASE 0x0004 -#define cfgINTF_CNTL 0x0005 -#define cfgSTATUS 0x0006 -#define cfgCPU_DEFAULTS 0x0007 -#define cfgIND_ADDR_B_0 0x0008 -#define cfgIND_ADDR_B_1 0x0009 -#define cfgIND_ADDR_B_2 0x000A -#define cfgIND_DATA_B 0x000B -#define cfgPM4_RPTR 0x000C -#define cfgSCRATCH 0x000D -#define cfgPM4_WRPTR_0 0x000E -#define cfgPM4_WRPTR_1 0x000F -/* Block CIF End: */ - -/* Block CP Start: */ -#define mmCP_RB_CNTL 0x0210 -#define mmCP_RB_BASE 0x0214 -#define mmCP_RB_RPTR_ADDR 0x0218 -#define mmCP_RB_RPTR 0x021C -#define mmCP_RB_RPTR_WR 0x02F8 -#define mmCP_RB_WPTR 0x0220 -#define mmCP_IB_BASE 0x0228 -#define mmCP_IB_BUFSZ 0x022C -#define mmCP_CSQ_CNTL 0x0230 -#define mmCP_CSQ_APER_PRIMARY 0x0300 -#define mmCP_CSQ_APER_INDIRECT 0x0340 -#define mmCP_ME_CNTL 0x0240 -#define mmCP_ME_RAM_ADDR 0x0244 -#define mmCP_ME_RAM_RADDR 0x0248 -#define mmCP_ME_RAM_DATAH 0x024C -#define mmCP_ME_RAM_DATAL 0x0250 -#define mmCP_DEBUG 0x025C -#define mmSCRATCH_REG0 0x0260 -#define mmSCRATCH_REG1 0x0264 -#define mmSCRATCH_REG2 0x0268 -#define mmSCRATCH_REG3 0x026C -#define mmSCRATCH_REG4 0x0270 -#define mmSCRATCH_REG5 0x0274 -#define mmSCRATCH_UMSK 0x0280 -#define mmSCRATCH_ADDR 0x0284 -#define mmCP_CSQ_ADDR 0x02E4 -#define mmCP_CSQ_DATA 0x02E8 -#define mmCP_CSQ_STAT 0x02EC -#define mmCP_STAT 0x02F0 -#define mmGEN_INT_CNTL 0x0200 -#define mmGEN_INT_STATUS 0x0204 -/* Block CP End: */ - -/* Block DISPLAY Start: */ -#define mmLCD_FORMAT 0x0410 -#define mmGRAPHIC_CTRL 0x0414 -#define mmGRAPHIC_OFFSET 0x0418 -#define mmGRAPHIC_PITCH 0x041C -#define mmCRTC_TOTAL 0x0420 -#define mmACTIVE_H_DISP 0x0424 -#define mmACTIVE_V_DISP 0x0428 -#define mmGRAPHIC_H_DISP 0x042C -#define mmGRAPHIC_V_DISP 0x0430 -#define mmVIDEO_CTRL 0x0434 -#define mmGRAPHIC_KEY 0x0438 -#define mmVIDEO_Y_OFFSET 0x043C -#define mmVIDEO_Y_PITCH 0x0440 -#define mmVIDEO_U_OFFSET 0x0444 -#define mmVIDEO_U_PITCH 0x0448 -#define mmVIDEO_V_OFFSET 0x044C -#define mmVIDEO_V_PITCH 0x0450 -#define mmVIDEO_H_POS 0x0454 -#define mmVIDEO_V_POS 0x0458 -#define mmBRIGHTNESS_CNTL 0x045C -#define mmCURSOR1_OFFSET 0x0460 -#define mmCURSOR1_H_POS 0x0464 -#define mmCURSOR1_V_POS 0x0468 -#define mmCURSOR1_COLOR0 0x046C -#define mmCURSOR1_COLOR1 0x0470 -#define mmCURSOR2_OFFSET 0x0474 -#define mmCURSOR2_H_POS 0x0478 -#define mmCURSOR2_V_POS 0x047C -#define mmCURSOR2_COLOR0 0x0480 -#define mmCURSOR2_COLOR1 0x0484 -#define mmDISP_INT_CNTL 0x0488 -#define mmCRTC_SS 0x048C -#define mmCRTC_LS 0x0490 -#define mmCRTC_REV 0x0494 -#define mmCRTC_DCLK 0x049C -#define mmCRTC_GS 0x04A0 -#define mmCRTC_VPOS_GS 0x04A4 -#define mmCRTC_GCLK 0x04A8 -#define mmCRTC_GOE 0x04AC -#define mmCRTC_FRAME 0x04B0 -#define mmCRTC_FRAME_VPOS 0x04B4 -#define mmGPIO_DATA 0x04B8 -#define mmGPIO_CNTL1 0x04BC -#define mmGPIO_CNTL2 0x04C0 -#define mmLCDD_CNTL1 0x04C4 -#define mmLCDD_CNTL2 0x04C8 -#define mmGENLCD_CNTL1 0x04CC -#define mmGENLCD_CNTL2 0x04D0 -#define mmDISP_DEBUG 0x04D4 -#define mmDISP_DB_BUF_CNTL 0x04D8 -#define mmDISP_CRC_SIG 0x04DC -#define mmCRTC_DEFAULT_COUNT 0x04E0 -#define mmLCD_BACKGROUND_COLOR 0x04E4 -#define mmCRTC_PS2 0x04E8 -#define mmCRTC_PS2_VPOS 0x04EC -#define mmCRTC_PS1_ACTIVE 0x04F0 -#define mmCRTC_PS1_NACTIVE 0x04F4 -#define mmCRTC_GCLK_EXT 0x04F8 -#define mmCRTC_ALW 0x04FC -#define mmCRTC_ALW_VPOS 0x0500 -#define mmCRTC_PSK 0x0504 -#define mmCRTC_PSK_HPOS 0x0508 -#define mmCRTC_CV4_START 0x050C -#define mmCRTC_CV4_END 0x0510 -#define mmCRTC_CV4_HPOS 0x0514 -#define mmCRTC_ECK 0x051C -#define mmREFRESH_CNTL 0x0520 -#define mmGENLCD_CNTL3 0x0524 -#define mmGPIO_DATA2 0x0528 -#define mmGPIO_CNTL3 0x052C -#define mmGPIO_CNTL4 0x0530 -#define mmCHIP_STRAP 0x0534 -#define mmDISP_DEBUG2 0x0538 -#define mmDEBUG_BUS_CNTL 0x053C -#define mmGAMMA_VALUE1 0x0540 -#define mmGAMMA_VALUE2 0x0544 -#define mmGAMMA_SLOPE 0x0548 -#define mmGEN_STATUS 0x054C -#define mmHW_INT 0x0550 -/* Block DISPLAY End: */ - -/* Block GFX Start: */ -#define mmDST_OFFSET 0x1004 -#define mmDST_PITCH 0x1008 -#define mmDST_PITCH_OFFSET 0x102C -#define mmDST_X 0x101C -#define mmDST_Y 0x1020 -#define mmDST_X_Y 0x1194 -#define mmDST_Y_X 0x1038 -#define mmDST_WIDTH 0x100C -#define mmDST_HEIGHT 0x1010 -#define mmDST_WIDTH_HEIGHT 0x1198 -#define mmDST_HEIGHT_WIDTH 0x103C -#define mmDST_HEIGHT_WIDTH_8 0x118C -#define mmDST_HEIGHT_Y 0x11A0 -#define mmDST_WIDTH_X 0x1188 -#define mmDST_WIDTH_X_INCY 0x119C -#define mmDST_LINE_START 0x1090 -#define mmDST_LINE_END 0x1094 -#define mmBRUSH_OFFSET 0x108C -#define mmBRUSH_Y_X 0x1074 -#define mmDP_BRUSH_FRGD_CLR 0x107C -#define mmDP_BRUSH_BKGD_CLR 0x1078 -#define mmSRC2_OFFSET 0x1060 -#define mmSRC2_PITCH 0x1064 -#define mmSRC2_PITCH_OFFSET 0x1068 -#define mmSRC2_X 0x1050 -#define mmSRC2_Y 0x1054 -#define mmSRC2_X_Y 0x1058 -#define mmSRC2_WIDTH 0x1080 -#define mmSRC2_HEIGHT 0x1084 -#define mmSRC2_INC 0x1088 -#define mmSRC_OFFSET 0x11AC -#define mmSRC_PITCH 0x11B0 -#define mmSRC_PITCH_OFFSET 0x1028 -#define mmSRC_X 0x1014 -#define mmSRC_Y 0x1018 -#define mmSRC_X_Y 0x1190 -#define mmSRC_Y_X 0x1034 -#define mmSRC_WIDTH 0x1040 -#define mmSRC_HEIGHT 0x1044 -#define mmSRC_INC 0x1048 -#define mmHOST_DATA0 0x13C0 -#define mmHOST_DATA1 0x13C4 -#define mmHOST_DATA2 0x13C8 -#define mmHOST_DATA3 0x13CC -#define mmHOST_DATA4 0x13D0 -#define mmHOST_DATA5 0x13D4 -#define mmHOST_DATA6 0x13D8 -#define mmHOST_DATA7 0x13DC -#define mmHOST_DATA_LAST 0x13E0 -#define mmDP_SRC_FRGD_CLR 0x1240 -#define mmDP_SRC_BKGD_CLR 0x1244 -#define mmSC_LEFT 0x1140 -#define mmSC_RIGHT 0x1144 -#define mmSC_TOP 0x1148 -#define mmSC_BOTTOM 0x114C -#define mmSRC_SC_RIGHT 0x1154 -#define mmSRC_SC_BOTTOM 0x115C -#define mmDP_CNTL 0x11C8 -#define mmDP_CNTL_DST_DIR 0x11CC -#define mmDP_DATATYPE 0x12C4 -#define mmDP_MIX 0x12C8 -#define mmDP_WRITE_MSK 0x12CC -#define mmCLR_CMP_CLR_SRC 0x1234 -#define mmCLR_CMP_CLR_DST 0x1238 -#define mmCLR_CMP_CNTL 0x1230 -#define mmCLR_CMP_MSK 0x123C -#define mmDEFAULT_PITCH_OFFSET 0x10A0 -#define mmDEFAULT_SC_BOTTOM_RIGHT 0x10A8 -#define mmDEFAULT2_SC_BOTTOM_RIGHT 0x10AC -#define mmREF1_PITCH_OFFSET 0x10B8 -#define mmREF2_PITCH_OFFSET 0x10BC -#define mmREF3_PITCH_OFFSET 0x10C0 -#define mmREF4_PITCH_OFFSET 0x10C4 -#define mmREF5_PITCH_OFFSET 0x10C8 -#define mmREF6_PITCH_OFFSET 0x10CC -#define mmDP_GUI_MASTER_CNTL 0x106C -#define mmSC_TOP_LEFT 0x11BC -#define mmSC_BOTTOM_RIGHT 0x11C0 -#define mmSRC_SC_BOTTOM_RIGHT 0x11C4 -#define mmGLOBAL_ALPHA 0x1210 -#define mmFILTER_COEF 0x1214 -#define mmMVC_CNTL_START 0x11E0 -#define mmE2_ARITHMETIC_CNTL 0x1220 -#define mmDEBUG0 0x1280 -#define mmDEBUG1 0x1284 -#define mmDEBUG2 0x1288 -#define mmDEBUG3 0x128C -#define mmDEBUG4 0x1290 -#define mmDEBUG5 0x1294 -#define mmDEBUG6 0x1298 -#define mmDEBUG7 0x129C -#define mmDEBUG8 0x12A0 -#define mmDEBUG9 0x12A4 -#define mmDEBUG10 0x12A8 -#define mmDEBUG11 0x12AC -#define mmDEBUG12 0x12B0 -#define mmDEBUG13 0x12B4 -#define mmDEBUG14 0x12B8 -#define mmDEBUG15 0x12BC -#define mmENG_CNTL 0x13E8 -#define mmENG_PERF_CNT 0x13F0 -/* Block GFX End: */ - -/* Block IDCT Start: */ -#define mmIDCT_RUNS 0x0C00 -#define mmIDCT_LEVELS 0x0C04 -#define mmIDCT_CONTROL 0x0C3C -#define mmIDCT_AUTH_CONTROL 0x0C08 -#define mmIDCT_AUTH 0x0C0C -/* Block IDCT End: */ - -/* Block MC Start: */ -#define mmMEM_CNTL 0x0180 -#define mmMEM_ARB 0x0184 -#define mmMC_FB_LOCATION 0x0188 -#define mmMEM_EXT_CNTL 0x018C -#define mmMC_EXT_MEM_LOCATION 0x0190 -#define mmMEM_EXT_TIMING_CNTL 0x0194 -#define mmMEM_SDRAM_MODE_REG 0x0198 -#define mmMEM_IO_CNTL 0x019C -#define mmMC_DEBUG 0x01A0 -#define mmMC_BIST_CTRL 0x01A4 -#define mmMC_BIST_COLLAR_READ 0x01A8 -#define mmTC_MISMATCH 0x01AC -#define mmMC_PERF_MON_CNTL 0x01B0 -#define mmMC_PERF_COUNTERS 0x01B4 -/* Block MC End: */ - -/* Block RBBM Start: */ -#define mmWAIT_UNTIL 0x1400 -#define mmISYNC_CNTL 0x1404 -#define mmRBBM_GUICNTL 0x1408 -#define mmRBBM_STATUS 0x0140 -#define mmRBBM_STATUS_alt_1 0x140C -#define mmRBBM_CNTL 0x0144 -#define mmRBBM_SOFT_RESET 0x0148 -#define mmNQWAIT_UNTIL 0x0150 -#define mmRBBM_DEBUG 0x016C -#define mmRBBM_CMDFIFO_ADDR 0x0170 -#define mmRBBM_CMDFIFO_DATAL 0x0174 -#define mmRBBM_CMDFIFO_DATAH 0x0178 -#define mmRBBM_CMDFIFO_STAT 0x017C -/* Block RBBM End: */ - -/* Block CG Start: */ -#define mmCLK_PIN_CNTL 0x0080 -#define mmPLL_REF_FB_DIV 0x0084 -#define mmPLL_CNTL 0x0088 -#define mmSCLK_CNTL 0x008C -#define mmPCLK_CNTL 0x0090 -#define mmCLK_TEST_CNTL 0x0094 -#define mmPWRMGT_CNTL 0x0098 -#define mmPWRMGT_STATUS 0x009C -/* Block CG End: */ - -/* default value definitions */ -#define defCHIP_ID 0x00001002 -#define defREVISION_ID 0x00000000 -#define defWRAP_BUF_A 0x01000000 -#define defWRAP_BUF_B 0x01000000 -#define defWRAP_TOP_DIR 0x00000000 -#define defWRAP_START_DIR 0x00000000 -//#define defCIF_CNTL 0x00082900 -#define defCIF_CNTL 0x00182d00 //??updated by Tobey Z.for Sharp,Oct11,2002 -#define defCFGREG_BASE 0x00000000 -//#define defCIF_IO 0x000c0800 -#define defCIF_IO 0x000C0902 //??updated by Tobey Z.for Sharp,Oct11,2002 -#define defCIF_READ_DBG 0x00018223 -#define defCIF_WRITE_DBG 0x00002100 -#define defIND_ADDR_A_0 0x00000000 -#define defIND_ADDR_A_1 0x00000000 -#define defIND_ADDR_A_2 0x00000000 -#define defIND_DATA_A 0x00000000 -#define defREG_BASE 0x00000001 -#define defINTF_CNTL 0x00000011 -#define defSTATUS 0x00000000 -#define defCPU_DEFAULTS 0x00000006 -#define defIND_ADDR_B_0 0x00000000 -#define defIND_ADDR_B_1 0x00000000 -#define defIND_ADDR_B_2 0x00000000 -#define defIND_DATA_B 0x00000000 -#define defPM4_RPTR 0x00000000 -#define defSCRATCH 0x00000000 -#define defPM4_WRPTR_0 0x00000000 -#define defPM4_WRPTR_1 0x00000000 -#define defCP_RB_CNTL 0x00000000 -#define defCP_RB_BASE 0x00000000 -#define defCP_RB_RPTR_ADDR 0x00000000 -#define defCP_RB_RPTR 0x00000000 -#define defCP_RB_RPTR_WR 0x00000000 -#define defCP_RB_