diff --git a/libavfilter/libmpcodecs/av_helpers.h b/libavfilter/libmpcodecs/av_helpers.h deleted file mode 100644 index 90b67d5a0f..0000000000 --- a/libavfilter/libmpcodecs/av_helpers.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Generic libav* helpers - * - * 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. - */ - -#ifndef MPLAYER_AV_HELPERS_H -#define MPLAYER_AV_HELPERS_H - -void ff_init_avcodec(void); -void ff_init_avformat(void); - -#endif /* MPLAYER_AV_HELPERS_H */ diff --git a/libavfilter/libmpcodecs/libvo/video_out.h b/libavfilter/libmpcodecs/libvo/video_out.h deleted file mode 100644 index 49d30987ff..0000000000 --- a/libavfilter/libmpcodecs/libvo/video_out.h +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (C) Aaron Holtzman - Aug 1999 - * Strongly modified, most parts rewritten: A'rpi/ESP-team - 2000-2001 - * (C) MPlayer developers - * - * 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. - */ - -#ifndef MPLAYER_VIDEO_OUT_H -#define MPLAYER_VIDEO_OUT_H - -#include -#include - -//#include "sub/font_load.h" -#include "../img_format.h" -//#include "vidix/vidix.h" - - -#define ROTATE(t, x, y) do { \ - t rot_tmp = x; \ - x = y; \ - y = -rot_tmp; \ -} while(0) - -#define VO_EVENT_EXPOSE 1 -#define VO_EVENT_RESIZE 2 -#define VO_EVENT_KEYPRESS 4 -#define VO_EVENT_REINIT 8 -#define VO_EVENT_MOVE 16 -#define VO_EVENT_MOUSE 32 - -/* Obsolete: VOCTRL_QUERY_VAA 1 */ -/* does the device support the required format */ -#define VOCTRL_QUERY_FORMAT 2 -/* signal a device reset seek */ -#define VOCTRL_RESET 3 -/* true if vo driver can use GUI created windows */ -#define VOCTRL_GUISUPPORT 4 -/* used to switch to fullscreen */ -#define VOCTRL_FULLSCREEN 5 -/* signal a device pause */ -#define VOCTRL_PAUSE 7 -/* start/resume playback */ -#define VOCTRL_RESUME 8 -/* libmpcodecs direct rendering: */ -#define VOCTRL_GET_IMAGE 9 -#define VOCTRL_DRAW_IMAGE 13 -#define VOCTRL_SET_SPU_PALETTE 14 -/* decoding ahead: */ -#define VOCTRL_GET_NUM_FRAMES 10 -#define VOCTRL_GET_FRAME_NUM 11 -#define VOCTRL_SET_FRAME_NUM 12 -#define VOCTRL_GET_PANSCAN 15 -#define VOCTRL_SET_PANSCAN 16 -/* equalizer controls */ -#define VOCTRL_SET_EQUALIZER 17 -#define VOCTRL_GET_EQUALIZER 18 -/* Frame duplication */ -#define VOCTRL_DUPLICATE_FRAME 20 -// ... 21 -#define VOCTRL_START_SLICE 21 - -#define VOCTRL_ONTOP 25 -#define VOCTRL_ROOTWIN 26 -#define VOCTRL_BORDER 27 -#define VOCTRL_DRAW_EOSD 28 -#define VOCTRL_GET_EOSD_RES 29 - -#define VOCTRL_SET_DEINTERLACE 30 -#define VOCTRL_GET_DEINTERLACE 31 - -#define VOCTRL_UPDATE_SCREENINFO 32 - -// Vo can be used by xover -#define VOCTRL_XOVERLAY_SUPPORT 22 - -#define VOCTRL_XOVERLAY_SET_COLORKEY 24 -typedef struct { - uint32_t x11; // The raw x11 color - uint16_t r,g,b; -} mp_colorkey_t; - -#define VOCTRL_XOVERLAY_SET_WIN 23 -typedef struct { - int x,y; - int w,h; -} mp_win_t; - -#define VO_TRUE 1 -#define VO_FALSE 0 -#define VO_ERROR -1 -#define VO_NOTAVAIL -2 -#define VO_NOTIMPL -3 - -#define VOFLAG_FULLSCREEN 0x01 -#define VOFLAG_MODESWITCHING 0x02 -#define VOFLAG_SWSCALE 0x04 -#define VOFLAG_FLIPPING 0x08 -#define VOFLAG_HIDDEN 0x10 //< Use to create a hidden window -#define VOFLAG_STEREO 0x20 //< Use to create a stereo-capable window -#define VOFLAG_DEPTH 0x40 //< Request a depth buffer -#define VOFLAG_XOVERLAY_SUB_VO 0x10000 - -typedef struct vo_info_s -{ - /* driver name ("Matrox Millennium G200/G400" */ - const char *name; - /* short name (for config strings) ("mga") */ - const char *short_name; - /* author ("Aaron Holtzman ") */ - const char *author; - /* any additional comments */ - const char *comment; -} vo_info_t; - -typedef struct vo_functions_s -{ - const vo_info_t *info; - /* - * Preinitializes driver (real INITIALIZATION) - * arg - currently it's vo_subdevice - * returns: zero on successful initialization, non-zero on error. - */ - int (*preinit)(const char *arg); - /* - * Initialize (means CONFIGURE) the display driver. - * params: - * width,height: image source size - * d_width,d_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. - */ - int (*config)(uint32_t width, uint32_t height, uint32_t d_width, - uint32_t d_height, uint32_t fullscreen, char *title, - uint32_t format); - - /* - * Control interface - */ - int (*control)(uint32_t request, void *data, ...); - - /* - * 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[]); - - /* - * 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); - - /* - * Draws OSD to the screen buffer - */ - void (*draw_osd)(void); - - /* - * Blit/Flip buffer to the screen. Must be called after each frame! - */ - void (*flip_page)(void); - - /* - * This func is called after every frames to handle keyboard and - * other events. It's called in PAUSE mode too! - */ - void (*check_events)(void); - - /* - * Closes driver. Should restore the original state of the system. - */ - void (*uninit)(void); -} vo_functions_t; - -const vo_functions_t* init_best_video_out(char** vo_list); -int config_video_out(const vo_functions_t *vo, uint32_t width, uint32_t height, - uint32_t d_width, uint32_t d_height, uint32_t flags, - char *title, uint32_t format); -void list_video_out(void); - -// NULL terminated array of all drivers -extern const vo_functions_t* const video_out_drivers[]; - -extern int vo_flags; - -extern int vo_config_count; - -extern int xinerama_screen; -extern int xinerama_x; -extern int xinerama_y; - -// correct resolution/bpp on screen: (should be autodetected by vo_init()) -extern int vo_depthonscreen; -extern int vo_screenwidth; -extern int vo_screenheight; - -// requested resolution/bpp: (-x -y -bpp options) -extern int vo_dx; -extern int vo_dy; -extern int vo_dwidth; -extern int vo_dheight; -extern int vo_dbpp; - -extern int vo_grabpointer; -extern int vo_doublebuffering; -extern int vo_directrendering; -extern int vo_vsync; -extern int vo_fsmode; -extern float vo_panscan; -extern float vo_border_pos_x; -extern float vo_border_pos_y; -extern int vo_rotate; -extern int vo_adapter_num; -extern int vo_refresh_rate; -extern int vo_keepaspect; -extern int vo_rootwin; -extern int vo_ontop; -extern int vo_border; - -extern int vo_gamma_gamma; -extern int vo_gamma_brightness; -extern int vo_gamma_saturation; -extern int vo_gamma_contrast; -extern int vo_gamma_hue; -extern int vo_gamma_red_intensity; -extern int vo_gamma_green_intensity; -extern int vo_gamma_blue_intensity; - -extern int vo_nomouse_input; -extern int enable_mouse_movements; - -extern int vo_pts; -extern float vo_fps; - -extern char *vo_subdevice; - -extern int vo_colorkey; - -extern char *vo_winname; -extern char *vo_wintitle; - -extern int64_t WinID; - -typedef struct { - float min; - float max; - } range_t; - -float range_max(range_t *r); -int in_range(range_t *r, float f); -range_t *str2range(char *s); -extern char *monitor_hfreq_str; -extern char *monitor_vfreq_str; -extern char *monitor_dotclock_str; - -struct mp_keymap { - int from; - int to; -}; -int lookup_keymap_table(const struct mp_keymap *map, int key); -struct vo_rect { - int left, right, top, bottom, width, height; -}; -void calc_src_dst_rects(int src_width, int src_height, struct vo_rect *src, struct vo_rect *dst, - struct vo_rect *borders, const struct vo_rect *crop); -void vo_mouse_movement(int posx, int posy); - -static inline int apply_border_pos(int full, int part, float pos) { - if (pos >= 0.0 && pos <= 1.0) { - return pos*(full - part); - } - if (pos < 0) - return pos * part; - return full - part + (pos - 1) * part; -} - -#endif /* MPLAYER_VIDEO_OUT_H */ diff --git a/libavfilter/libmpcodecs/mpc_info.h b/libavfilter/libmpcodecs/mpc_info.h deleted file mode 100644 index 8554699120..0000000000 --- a/libavfilter/libmpcodecs/mpc_info.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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. - */ - -#ifndef MPLAYER_MPC_INFO_H -#define MPLAYER_MPC_INFO_H - -typedef struct mp_codec_info_s -{ - /* codec long name ("Autodesk FLI/FLC Animation decoder" */ - const char *name; - /* short name (same as driver name in codecs.conf) ("dshow") */ - const char *short_name; - /* interface author/maintainer */ - const char *maintainer; - /* codec author ("Aaron Holtzman ") */ - const char *author; - /* any additional comments */ - const char *comment; -} mp_codec_info_t; - -#define CONTROL_OK 1 -#define CONTROL_TRUE 1 -#define CONTROL_FALSE 0 -#define CONTROL_UNKNOWN -1 -#define CONTROL_ERROR -2 -#define CONTROL_NA -3 - -#endif /* MPLAYER_MPC_INFO_H */ diff --git a/libavfilter/libmpcodecs/vf.h b/libavfilter/libmpcodecs/vf.h index d8fc66be47..7cda60b473 100644 --- a/libavfilter/libmpcodecs/vf.h +++ b/libavfilter/libmpcodecs/vf.h @@ -87,8 +87,6 @@ typedef struct vf_instance { } vf_instance_t; // control codes: -#include "mpc_info.h" - typedef struct vf_seteq_s { const char *item; diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 2cca04808f..63fdedd699 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -37,7 +37,6 @@ #include "libmpcodecs/vf.h" #include "libmpcodecs/img_format.h" #include "libmpcodecs/cpudetect.h" -#include "libmpcodecs/av_helpers.h" #include "libmpcodecs/libvo/fastmemcpy.h" #include "libswscale/swscale.h" @@ -194,11 +193,6 @@ int ff_mp_msg_test(int mod, int lev){ return 123; } -void ff_init_avcodec(void) -{ - //we maybe should init but its kinda 1. unneeded 2. a bit impolite from here -} - //Exact copy of vf.c void ff_vf_clone_mpi_attributes(mp_image_t* dst, mp_image_t* src){ dst->pict_type= src->pict_type;