mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

mplayer2: armv7a fixes

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-11-04 17:40:49 +01:00
parent 54458a43c8
commit 7f5ca6706a
2 changed files with 19 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

691
meta-oe/recipes-multimedia/mplayer/mplayer2/0001-video-out-for-omapfb-support.patch
View File

@@ -1,26 +1,25 @@
From 23eb4c4051c7acb2babd4b224ef85cc8ee8fa511 Mon Sep 17 00:00:00 2001
From 2a42cec41a018008d07ea33b2b91dca191d78481 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 25 Nov 2010 16:49:53 +0100
Subject: [PATCH] video out for omapfb support
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
Makefile | 2 +-
libvo/video_out.c | 2 +
libvo/video_out.c.orig | 654 ++++++++++++++++++++++++++++++++++++++++++++++++
libvo/vo_omapfb.c | 591 +++++++++++++++++++++++++++++++++++++++++++
libvo/yuv.S | 170 +++++++++++++
5 files changed, 1418 insertions(+), 1 deletions(-)
create mode 100644 libvo/video_out.c.orig
Makefile | 2 +-
libvo/video_out.c | 2 +
libvo/vo_omapfb.c | 591 +++++++++++++++++++++++++++++++++++++++++++++++++++++
libvo/yuv.S | 170 +++++++++++++++
4 files changed, 764 insertions(+), 1 deletions(-)
create mode 100644 libvo/vo_omapfb.c
create mode 100644 libvo/yuv.S
diff --git a/Makefile b/Makefile
index 28c6383..b023136 100644
index 83304a2..1e88d40 100644
--- a/Makefile
+++ b/Makefile
@@ -451,7 +451,7 @@ SRCS_MPLAYER-$(DIRECTFB) += libvo/vo_directfb2.c libvo/vo_dfbmga.c
@@ -450,7 +450,7 @@ SRCS_MPLAYER-$(DIRECTFB) += libvo/vo_directfb2.c libvo/vo_dfbmga.c
SRCS_MPLAYER-$(DIRECTX) += libao2/ao_dsound.c libvo/vo_directx.c
SRCS_MPLAYER-$(DXR3) += libvo/vo_dxr3.c
SRCS_MPLAYER-$(ESD) += libao2/ao_esd.c
@@ -30,7 +29,7 @@ index 28c6383..b023136 100644
SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c
SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 2ed0c86..fc9a1cd 100644
index e796784..1433834 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -95,6 +95,7 @@ extern struct vo_driver video_out_null;
@@ -41,7 +40,7 @@ index 2ed0c86..fc9a1cd 100644
extern struct vo_driver video_out_svga;
extern struct vo_driver video_out_png;
extern struct vo_driver video_out_ggi;
@@ -194,6 +195,7 @@ const struct vo_driver *video_out_drivers[] =
@@ -193,6 +194,7 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_FBDEV
&video_out_fbdev,
&video_out_fbdev2,
@@ -49,669 +48,9 @@ index 2ed0c86..fc9a1cd 100644
#endif
#ifdef CONFIG_SVGALIB
&video_out_svga,
diff --git a/libvo/video_out.c.orig b/libvo/video_out.c.orig
new file mode 100644
index 0000000..2ed0c86
--- /dev/null
+++ b/libvo/video_out.c.orig
@@ -0,0 +1,654 @@
+/*
+ * libvo common functions, variables used by many/all drivers.
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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.
+ *
+ * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdbool.h>
+
+#include <unistd.h>
+//#include <sys/mman.h>
+
+#include "config.h"
+#include "options.h"
+#include "talloc.h"
+#include "video_out.h"
+#include "aspect.h"
+#include "geometry.h"
+#include "old_vo_wrapper.h"
+#include "input/input.h"
+#include "mp_fifo.h"
+
+
+#include "mp_msg.h"
+
+#include "osdep/shmem.h"
+#ifdef CONFIG_X11
+#include "x11_common.h"
+#endif
+
+int xinerama_screen = -1;
+int xinerama_x;
+int xinerama_y;
+
+int vo_nomouse_input = 0;
+int vo_grabpointer = 1;
+int vo_doublebuffering = 1;
+int vo_vsync = 0;
+int vo_fs = 0;
+int vo_fsmode = 0;
+float vo_panscan = 0.0f;
+int vo_adapter_num=0;
+int vo_refresh_rate=0;
+int vo_keepaspect=1;
+int vo_rootwin=0;
+int vo_border=1;
+int64_t WinID = -1;
+
+int vo_pts=0; // for hw decoding
+float vo_fps=0;
+
+char *vo_subdevice = NULL;
+int vo_directrendering=0;
+
+int vo_colorkey = 0x0000ff00; // default colorkey is green
+ // (0xff000000 means that colorkey has been disabled)
+
+
+//
+// Externally visible list of all vo drivers
+//
+extern struct vo_driver video_out_mga;
+extern struct vo_driver video_out_xmga;
+extern struct vo_driver video_out_x11;
+extern struct vo_driver video_out_xover;
+extern struct vo_driver video_out_vdpau;
+extern struct vo_driver video_out_xv;
+extern struct vo_driver video_out_gl_nosw;
+extern struct vo_driver video_out_gl;
+extern struct vo_driver video_out_gl_sdl;
+extern struct vo_driver video_out_dga;
+extern struct vo_driver video_out_sdl;
+extern struct vo_driver video_out_3dfx;
+extern struct vo_driver video_out_tdfxfb;
+extern struct vo_driver video_out_s3fb;
+extern struct vo_driver video_out_wii;
+extern struct vo_driver video_out_null;
+extern struct vo_driver video_out_bl;
+extern struct vo_driver video_out_fbdev;
+extern struct vo_driver video_out_fbdev2;
+extern struct vo_driver video_out_svga;
+extern struct vo_driver video_out_png;
+extern struct vo_driver video_out_ggi;
+extern struct vo_driver video_out_aa;
+extern struct vo_driver video_out_caca;
+extern struct vo_driver video_out_mpegpes;
+extern struct vo_driver video_out_yuv4mpeg;
+extern struct vo_driver video_out_direct3d;
+extern struct vo_driver video_out_directx;
+extern struct vo_driver video_out_kva;
+extern struct vo_driver video_out_dxr3;
+extern struct vo_driver video_out_ivtv;
+extern struct vo_driver video_out_v4l2;
+extern struct vo_driver video_out_jpeg;
+extern struct vo_driver video_out_gif89a;
+extern struct vo_driver video_out_vesa;
+extern struct vo_driver video_out_directfb;
+extern struct vo_driver video_out_dfbmga;
+extern struct vo_driver video_out_tdfx_vid;
+extern struct vo_driver video_out_xvr100;
+extern struct vo_driver video_out_tga;
+extern struct vo_driver video_out_corevideo;
+extern struct vo_driver video_out_quartz;
+extern struct vo_driver video_out_pnm;
+extern struct vo_driver video_out_md5sum;
+extern struct vo_driver video_out_glamo;
+
+const struct vo_driver *video_out_drivers[] =
+{
+#ifdef CONFIG_XVR100
+ &video_out_xvr100,
+#endif
+#ifdef CONFIG_TDFX_VID
+ &video_out_tdfx_vid,
+#endif
+#ifdef CONFIG_DIRECTX
+ &video_out_directx,
+#endif
+#ifdef CONFIG_DIRECT3D
+ &video_out_direct3d,
+#endif
+#ifdef CONFIG_KVA
+ &video_out_kva,
+#endif
+#ifdef CONFIG_COREVIDEO
+ &video_out_corevideo,
+#endif
+#ifdef CONFIG_QUARTZ
+ &video_out_quartz,
+#endif
+#ifdef CONFIG_XMGA
+ &video_out_xmga,
+#endif
+#ifdef CONFIG_MGA
+ &video_out_mga,
+#endif
+#ifdef CONFIG_TDFXFB
+ &video_out_tdfxfb,
+#endif
+#ifdef CONFIG_S3FB
+ &video_out_s3fb,
+#endif
+#ifdef CONFIG_WII
+ &video_out_wii,
+#endif
+#ifdef CONFIG_3DFX
+ &video_out_3dfx,
+#endif
+#if CONFIG_VDPAU
+ &video_out_vdpau,
+#endif
+#ifdef CONFIG_XV
+ &video_out_xv,
+#endif
+#ifdef CONFIG_X11
+#ifdef CONFIG_GL
+ &video_out_gl_nosw,
+#endif
+ &video_out_x11,
+ &video_out_xover,
+#endif
+#ifdef CONFIG_SDL
+ &video_out_sdl,
+#endif
+#ifdef CONFIG_GL
+ &video_out_gl,
+#endif
+#ifdef CONFIG_GL_SDL
+ &video_out_gl_sdl,
+#endif
+#ifdef CONFIG_DGA
+ &video_out_dga,
+#endif
+#ifdef CONFIG_GGI
+ &video_out_ggi,
+#endif
+#ifdef CONFIG_FBDEV
+ &video_out_fbdev,
+ &video_out_fbdev2,
+#endif
+#ifdef CONFIG_SVGALIB
+ &video_out_svga,
+#endif
+#ifdef CONFIG_AA
+ &video_out_aa,
+#endif
+#ifdef CONFIG_CACA
+ &video_out_caca,
+#endif
+#ifdef CONFIG_DXR3
+ &video_out_dxr3,
+#endif
+#ifdef CONFIG_IVTV
+ &video_out_ivtv,
+#endif
+#ifdef CONFIG_V4L2_DECODER
+ &video_out_v4l2,
+#endif
+#ifdef CONFIG_BL
+ &video_out_bl,
+#endif
+#ifdef CONFIG_VESA
+ &video_out_vesa,
+#endif
+#ifdef CONFIG_DIRECTFB
+ &video_out_dfbmga,
+#endif
+ &video_out_null,
+ // should not be auto-selected
+#ifdef CONFIG_DIRECTFB
+ // vo directfb can call exit() if initialization fails
+ &video_out_directfb,
+#endif
+ &video_out_mpegpes,
+#ifdef CONFIG_YUV4MPEG
+ &video_out_yuv4mpeg,
+#endif
+#ifdef CONFIG_FFMPEG
+ &video_out_png,
+#endif
+#ifdef CONFIG_JPEG
+ &video_out_jpeg,
+#endif
+#ifdef CONFIG_GIF
+ &video_out_gif89a,
+#endif
+#ifdef CONFIG_TGA
+ &video_out_tga,
+#endif
+#ifdef CONFIG_PNM
+ &video_out_pnm,
+#endif
+#ifdef CONFIG_MD5SUM
+ &video_out_md5sum,
+#endif
+#ifdef CONFIG_GLAMO
+ &video_out_glamo,
+#endif
+ NULL
+};
+
+
+static int vo_preinit(struct vo *vo, const char *arg)
+{
+ return vo->driver->preinit(vo, arg);
+}
+
+int vo_control(struct vo *vo, uint32_t request, void *data)
+{
+ return vo->driver->control(vo, request, data);
+}
+
+// Return -1 if driver appears not to support a draw_image interface,
+// 0 otherwise (whether the driver actually drew something or not).
+int vo_draw_image(struct vo *vo, struct mp_image *mpi, double pts)
+{
+ if (!vo->config_ok)
+ return 0;
+ if (vo->driver->buffer_frames) {
+ vo->driver->draw_image(vo, mpi, pts);
+ return 0;
+ }
+ vo->frame_loaded = true;
+ vo->next_pts = pts;
+ if (vo_control(vo, VOCTRL_DRAW_IMAGE, mpi) == VO_NOTIMPL)
+ return -1;
+ return 0;
+}
+
+int vo_get_buffered_frame(struct vo *vo, bool eof)
+{
+ if (!vo->config_ok)
+ return -1;
+ if (vo->frame_loaded)
+ return 0;
+ if (!vo->driver->buffer_frames)
+ return -1;
+ vo->driver->get_buffered_frame(vo, eof);
+ return vo->frame_loaded ? 0 : -1;
+}
+
+void vo_skip_frame(struct vo *vo)
+{
+ vo->frame_loaded = false;
+}
+
+int vo_draw_frame(struct vo *vo, uint8_t *src[])
+{
+ assert(!vo->driver->is_new);
+ if (!vo->config_ok)
+ return 0;
+ return old_vo_draw_frame(vo, src);
+}
+
+int vo_draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y)
+{
+ return vo->driver->draw_slice(vo, src, stride, w, h, x, y);
+}
+
+void vo_draw_osd(struct vo *vo, struct osd_state *osd)
+{
+ if (!vo->config_ok)
+ return;
+ vo->driver->draw_osd(vo, osd);
+}
+
+void vo_flip_page(struct vo *vo, unsigned int pts_us, int duration)
+{
+ if (!vo->config_ok)
+ return;
+ vo->frame_loaded = false;
+ vo->next_pts = MP_NOPTS_VALUE;
+ if (vo->driver->flip_page_timed)
+ vo->driver->flip_page_timed(vo, pts_us, duration);
+ else
+ vo->driver->flip_page(vo);
+}
+
+void vo_check_events(struct vo *vo)
+{
+ if (!vo->config_ok) {
+ if (vo->registered_fd != -1)
+ mp_input_rm_key_fd(vo->input_ctx, vo->registered_fd);
+ vo->registered_fd = -1;
+ return;
+ }
+ vo->driver->check_events(vo);
+}
+
+void vo_seek_reset(struct vo *vo)
+{
+ vo_control(vo, VOCTRL_RESET, NULL);
+ vo->frame_loaded = false;
+}
+
+void vo_destroy(struct vo *vo)
+{
+ if (vo->registered_fd != -1)
+ mp_input_rm_key_fd(vo->input_ctx, vo->registered_fd);
+ vo->driver->uninit(vo);
+ talloc_free(vo);
+}
+
+void list_video_out(void)
+{
+ int i = 0;
+ mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Available video output drivers:\n");
+ mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_OUTPUTS\n");
+ while (video_out_drivers[i]) {
+ const vo_info_t *info = video_out_drivers[i++]->info;
+ mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name);
+ }
+ mp_msg(MSGT_GLOBAL, MSGL_INFO,"\n");
+}
+
+struct vo *init_best_video_out(struct MPOpts *opts, struct vo_x11_state *x11,
+ struct mp_fifo *key_fifo,
+ struct input_ctx *input_ctx)
+{
+ char **vo_list = opts->video_driver_list;
+ int i;
+ struct vo *vo = talloc_ptrtype(NULL, vo);
+ struct vo initial_values = {
+ .opts = opts,
+ .x11 = x11,
+ .key_fifo = key_fifo,
+ .input_ctx = input_ctx,
+ .event_fd = -1,
+ .registered_fd = -1,
+ };
+ // first try the preferred drivers, with their optional subdevice param:
+ if (vo_list && vo_list[0])
+ while (vo_list[0][0]) {
+ char *name = strdup(vo_list[0]);
+ vo_subdevice = strchr(name,':');
+ if (!strcmp(name, "pgm"))
+ mp_tmsg(MSGT_CPLAYER, MSGL_ERR, "The pgm video output driver has been replaced by -vo pnm:pgmyuv.\n");
+ if (!strcmp(name, "md5"))
+ mp_tmsg(MSGT_CPLAYER, MSGL_ERR, "The md5 video output driver has been replaced by -vo md5sum.\n");
+ if (vo_subdevice) {
+ vo_subdevice[0] = 0;
+ ++vo_subdevice;
+ }
+ for (i = 0; video_out_drivers[i]; i++) {
+ const struct vo_driver *video_driver = video_out_drivers[i];
+ const vo_info_t *info = video_driver->info;
+ if (!strcmp(info->short_name, name)) {
+ // name matches, try it
+ *vo = initial_values;
+ vo->driver = video_driver;
+ if (!vo_preinit(vo, vo_subdevice)) {
+ free(name);
+ return vo; // success!
+ }
+ talloc_free_children(vo);
+ }
+ }
+ // continue...
+ free(name);
+ ++vo_list;
+ if (!(vo_list[0]))
+ return NULL; // do NOT fallback to others
+ }
+ // now try the rest...
+ vo_subdevice = NULL;
+ for (i = 0; video_out_drivers[i]; i++) {
+ const struct vo_driver *video_driver = video_out_drivers[i];
+ *vo = initial_values;
+ vo->driver = video_driver;
+ if (!vo_preinit(vo, vo_subdevice))
+ return vo; // success!
+ talloc_free_children(vo);
+ }
+ free(vo);
+ return NULL;
+}
+
+static int event_fd_callback(void *ctx, int fd)
+{
+ struct vo *vo = ctx;
+ vo_check_events(vo);
+ return MP_INPUT_NOTHING;
+}
+
+int vo_config(struct vo *vo, uint32_t width, uint32_t height,
+ uint32_t d_width, uint32_t d_height, uint32_t flags,
+ char *title, uint32_t format)
+{
+ struct MPOpts *opts = vo->opts;
+ panscan_init(vo);
+ aspect_save_orig(vo, width, height);
+ aspect_save_prescale(vo, d_width, d_height);
+
+ if (vo_control(vo, VOCTRL_UPDATE_SCREENINFO, NULL) == VO_TRUE) {
+ aspect(vo, &d_width, &d_height, A_NOZOOM);
+ vo->dx = (int)(opts->vo_screenwidth - d_width) / 2;
+ vo->dy = (int)(opts->vo_screenheight - d_height) / 2;
+ geometry(&vo->dx, &vo->dy, &d_width, &d_height,
+ opts->vo_screenwidth, opts->vo_screenheight);
+ geometry_xy_changed |= xinerama_screen >= 0;
+ vo->dx += xinerama_x;
+ vo->dy += xinerama_y;
+ vo->dwidth = d_width;
+ vo->dheight = d_height;
+ }
+
+ int ret = vo->driver->config(vo, width, height, d_width, d_height, flags,
+ title, format);
+ vo->config_ok = (ret == 0);
+ vo->config_count += vo->config_ok;
+ if (vo->registered_fd == -1 && vo->event_fd != -1 && vo->config_ok) {
+ mp_input_add_key_fd(vo->input_ctx, vo->event_fd, 1, event_fd_callback,
+ NULL, vo);
+ vo->registered_fd = vo->event_fd;
+ }
+ return ret;
+}
+
+/**
+ * \brief lookup an integer in a table, table must have 0 as the last key
+ * \param key key to search for
+ * \result translation corresponding to key or "to" value of last mapping
+ * if not found.
+ */
+int lookup_keymap_table(const struct mp_keymap *map, int key) {
+ while (map->from && map->from != key) map++;
+ return map->to;
+}
+
+/**
+ * \brief helper function for the kind of panscan-scaling that needs a source
+ * and destination rectangle like Direct3D and VDPAU
+ */
+static void src_dst_split_scaling(int src_size, int dst_size, int scaled_src_size,
+ int *src_start, int *src_end, int *dst_start, int *dst_end) {
+ if (scaled_src_size > dst_size) {
+ int border = src_size * (scaled_src_size - dst_size) / scaled_src_size;
+ // round to a multiple of 2, this is at least needed for vo_direct3d and ATI cards
+ border = (border / 2 + 1) & ~1;
+ *src_start = border;
+ *src_end = src_size - border;
+ *dst_start = 0;
+ *dst_end = dst_size;
+ } else {
+ *src_start = 0;
+ *src_end = src_size;
+ *dst_start = (dst_size - scaled_src_size) / 2;
+ *dst_end = *dst_start + scaled_src_size;
+ }
+}
+
+/**
+ * Calculate the appropriate source and destination rectangle to
+ * get a correctly scaled picture, including pan-scan.
+ * Can be extended to take future cropping support into account.
+ *
+ * \param crop specifies the cropping border size in the left, right, top and bottom members, may be NULL
+ * \param borders the border values as e.g. EOSD (ASS) and properly placed DVD highlight support requires,
+ * may be NULL and only left and top are currently valid.
+ */
+void calc_src_dst_rects(struct vo *vo, int src_width, int src_height,
+ struct vo_rect *src, struct vo_rect *dst,
+ struct vo_rect *borders, const struct vo_rect *crop)
+{
+ static const struct vo_rect no_crop = {0, 0, 0, 0, 0, 0};
+ int scaled_width = 0;
+ int scaled_height = 0;
+ if (!crop) crop = &no_crop;
+ src_width -= crop->left + crop->right;
+ src_height -= crop->top + crop->bottom;
+ if (src_width < 2) src_width = 2;
+ if (src_height < 2) src_height = 2;
+ dst->left = 0; dst->right = vo->dwidth;
+ dst->top = 0; dst->bottom = vo->dheight;
+ src->left = 0; src->right = src_width;
+ src->top = 0; src->bottom = src_height;
+ if (borders) {
+ borders->left = 0; borders->top = 0;
+ }
+ if (aspect_scaling()) {
+ aspect(vo, &scaled_width, &scaled_height, A_WINZOOM);
+ panscan_calc_windowed(vo);
+ scaled_width += vo->panscan_x;
+ scaled_height += vo->panscan_y;
+ if (borders) {
+ borders->left = (vo->dwidth - scaled_width ) / 2;
+ borders->top = (vo->dheight - scaled_height) / 2;
+ }
+ src_dst_split_scaling(src_width, vo->dwidth, scaled_width,
+ &src->left, &src->right, &dst->left, &dst->right);
+ src_dst_split_scaling(src_height, vo->dheight, scaled_height,
+ &src->top, &src->bottom, &dst->top, &dst->bottom);
+ }
+ src->left += crop->left; src->right += crop->left;
+ src->top += crop->top; src->bottom += crop->top;
+ src->width = src->right - src->left;
+ src->height = src->bottom - src->top;
+ dst->width = dst->right - dst->left;
+ dst->height = dst->bottom - dst->top;
+}
+
+/**
+ * Generates a mouse movement message if those are enable and sends it
+ * to the "main" MPlayer.
+ *
+ * \param posx new x position of mouse
+ * \param posy new y position of mouse
+ */
+void vo_mouse_movement(struct vo *vo, int posx, int posy)
+{
+ char cmd_str[40];
+ if (!enable_mouse_movements)
+ return;
+ snprintf(cmd_str, sizeof(cmd_str), "set_mouse_pos %i %i", posx, posy);
+ mp_input_queue_cmd(vo->input_ctx, mp_input_parse_cmd(cmd_str));
+}
+
+#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
+/* Borrowed from vo_fbdev.c
+Monitor ranges related functions*/
+
+char *monitor_hfreq_str = NULL;
+char *monitor_vfreq_str = NULL;
+char *monitor_dotclock_str = NULL;
+
+float range_max(range_t *r)
+{
+float max = 0;
+
+ for (/* NOTHING */; (r->min != -1 && r->max != -1); r++)
+ if (max < r->max) max = r->max;
+ return max;
+}
+
+
+int in_range(range_t *r, float f)
+{
+ for (/* NOTHING */; (r->min != -1 && r->max != -1); r++)
+ if (f >= r->min && f <= r->max)
+ return 1;
+ return 0;
+}
+
+range_t *str2range(char *s)
+{
+ float tmp_min, tmp_max;
+ char *endptr = s; // to start the loop
+ range_t *r = NULL;
+ int i;
+
+ if (!s)
+ return NULL;
+ for (i = 0; *endptr; i++) {
+ if (*s == ',')
+ goto out_err;
+ if (!(r = realloc(r, sizeof(*r) * (i + 2)))) {
+ mp_msg(MSGT_GLOBAL, MSGL_WARN,"can't realloc 'r'\n");
+ return NULL;
+ }
+ tmp_min = strtod(s, &endptr);
+ if (*endptr == 'k' || *endptr == 'K') {
+ tmp_min *= 1000.0;
+ endptr++;
+ } else if (*endptr == 'm' || *endptr == 'M') {
+ tmp_min *= 1000000.0;
+ endptr++;
+ }
+ if (*endptr == '-') {
+ tmp_max = strtod(endptr + 1, &endptr);
+ if (*endptr == 'k' || *endptr == 'K') {
+ tmp_max *= 1000.0;
+ endptr++;
+ } else if (*endptr == 'm' || *endptr == 'M') {
+ tmp_max *= 1000000.0;
+ endptr++;
+ }
+ if (*endptr != ',' && *endptr)
+ goto out_err;
+ } else if (*endptr == ',' || !*endptr) {
+ tmp_max = tmp_min;
+ } else
+ goto out_err;
+ r[i].min = tmp_min;
+ r[i].max = tmp_max;
+ if (r[i].min < 0 || r[i].max < 0)
+ goto out_err;
+ s = endptr + 1;
+ }
+ r[i].min = r[i].max = -1;
+ return r;
+out_err:
+ free(r);
+ return NULL;
+}
+
+/* Borrowed from vo_fbdev.c END */
+#endif
diff --git a/libvo/vo_omapfb.c b/libvo/vo_omapfb.c
new file mode 100644
index 0000000..8c927b7
index 0000000..7bd8927
--- /dev/null
+++ b/libvo/vo_omapfb.c
@@ -0,0 +1,591 @@
@@ -827,7 +166,7 @@ index 0000000..8c927b7
+static void omapfb_update(int x, int y, int out_w, int out_h, int show);
+
+extern void mplayer_put_key( int code );
+#include "osdep/keycodes.h"
+#include "input/keycodes.h"
+
+#define TRANSPARENT_COLOR_KEY 0xff0
+
@@ -1273,7 +612,7 @@ index 0000000..8c927b7
+}
+
+
+static int control(uint32_t request, void *data)
+static int control(uint32_t request, void *data, ...)
+{
+ switch (request) {
+ case VOCTRL_QUERY_FORMAT:
@@ -1483,5 +822,5 @@ index 0000000..1cd2c1d
+ofb_pixconv_neon_p:
+ .word ofb_pixconv_neon
--
1.7.7.1
1.7.2.5

7
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
View File

@@ -17,7 +17,7 @@ SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=master \
file://cross.compile.codec-cfg.patch \
"
SRC_URI_append_armv7a = " \
SRC_URI_append_aarmv7a = " \
file://0001-video-out-for-omapfb-support.patch \
"
@@ -143,9 +143,10 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
do_configure_prepend_armv7a() {
cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S}/libvo/omapfb.h || true
cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S}/libvo/omapfb.h || true
cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S}/libvo/omapfb.h || true
cp ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ${S}/libvo/omapfb.h || true
sed -e 's/__user//g' -i ${S}/libvo/omapfb.h || true
cp ${STAGING_DIR_TARGET}/kernel/include/linux/omapfb.h ${S}/libvo/omapfb.h || true
sed -e 's/__user//g' -i ${S}/libvo/omapfb.h || true
}
CFLAGS_append = " -I${S}/libdvdread4 "