mirror of https://github.com/mpv-player/mpv
mp_image.h and img_format.h moved to libmpcodecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5608 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
838aeb89fb
commit
2bea9b36a7
2
Makefile
2
Makefile
|
@ -38,7 +38,7 @@ MANDIR = ${prefix}/man
|
|||
INSTALL = install
|
||||
|
||||
SRCS_COMMON = xacodec.c cpudetect.c mp_msg.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c
|
||||
SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c
|
||||
SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c me-opt-reg.c
|
||||
SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c mp-opt-reg.c
|
||||
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
|
|
@ -18,7 +18,7 @@ ifeq ($(JPEG),yes)
|
|||
VIDEO_SRCS += vd_ijpg.c
|
||||
endif
|
||||
|
||||
SRCS=$(AUDIO_SRCS) $(VIDEO_SRCS) $(VFILTER_SRCS) $(NATIVE_SRCS)
|
||||
SRCS=$(AUDIO_SRCS) $(VIDEO_SRCS) $(VFILTER_SRCS) $(NATIVE_SRCS) img_format.c
|
||||
OBJS=$(SRCS:.c=.o)
|
||||
|
||||
SRCS2=$(ENCODER_SRCS)
|
||||
|
|
|
@ -0,0 +1,76 @@
|
|||
|
||||
#ifndef __IMG_FORMAT_H
|
||||
#define __IMG_FORMAT_H
|
||||
|
||||
/* RGB/BGR Formats */
|
||||
|
||||
#define IMGFMT_RGB_MASK 0xFFFFFF00
|
||||
#define IMGFMT_RGB (('R'<<24)|('G'<<16)|('B'<<8))
|
||||
#define IMGFMT_RGB8 (IMGFMT_RGB|8)
|
||||
#define IMGFMT_RGB15 (IMGFMT_RGB|15)
|
||||
#define IMGFMT_RGB16 (IMGFMT_RGB|16)
|
||||
#define IMGFMT_RGB24 (IMGFMT_RGB|24)
|
||||
#define IMGFMT_RGB32 (IMGFMT_RGB|32)
|
||||
|
||||
#define IMGFMT_BGR_MASK 0xFFFFFF00
|
||||
#define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))
|
||||
#define IMGFMT_BGR8 (IMGFMT_BGR|8)
|
||||
#define IMGFMT_BGR15 (IMGFMT_BGR|15)
|
||||
#define IMGFMT_BGR16 (IMGFMT_BGR|16)
|
||||
#define IMGFMT_BGR24 (IMGFMT_BGR|24)
|
||||
#define IMGFMT_BGR32 (IMGFMT_BGR|32)
|
||||
|
||||
#define IMGFMT_IS_RGB(fmt) ((fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB)
|
||||
#define IMGFMT_IS_BGR(fmt) ((fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
|
||||
|
||||
#define IMGFMT_RGB_DEPTH(fmt) (fmt&~IMGFMT_RGB)
|
||||
#define IMGFMT_BGR_DEPTH(fmt) (fmt&~IMGFMT_BGR)
|
||||
|
||||
|
||||
/* Planar YUV Formats */
|
||||
|
||||
#define IMGFMT_YVU9 0x39555659
|
||||
#define IMGFMT_IF09 0x39304649
|
||||
#define IMGFMT_YV12 0x32315659
|
||||
#define IMGFMT_I420 0x30323449
|
||||
#define IMGFMT_IYUV 0x56555949
|
||||
#define IMGFMT_CLPL 0x4C504C43
|
||||
#define IMGFMT_Y800 0x30303859
|
||||
#define IMGFMT_Y8 0x20203859
|
||||
|
||||
/* Packed YUV Formats */
|
||||
|
||||
#define IMGFMT_IUYV 0x56595549
|
||||
#define IMGFMT_IY41 0x31435949
|
||||
#define IMGFMT_IYU1 0x31555949
|
||||
#define IMGFMT_IYU2 0x32555949
|
||||
#define IMGFMT_UYVY 0x59565955
|
||||
#define IMGFMT_UYNV 0x564E5955
|
||||
#define IMGFMT_cyuv 0x76757963
|
||||
#define IMGFMT_Y422 0x32323459
|
||||
#define IMGFMT_YUY2 0x32595559
|
||||
#define IMGFMT_YUNV 0x564E5559
|
||||
#define IMGFMT_YVYU 0x55595659
|
||||
#define IMGFMT_Y41P 0x50313459
|
||||
#define IMGFMT_Y211 0x31313259
|
||||
#define IMGFMT_Y41T 0x54313459
|
||||
#define IMGFMT_Y42T 0x54323459
|
||||
#define IMGFMT_V422 0x32323456
|
||||
#define IMGFMT_V655 0x35353656
|
||||
#define IMGFMT_CLJR 0x524A4C43
|
||||
#define IMGFMT_YUVP 0x50565559
|
||||
#define IMGFMT_UYVP 0x50565955
|
||||
|
||||
/* Compressed Formats */
|
||||
#define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S'))
|
||||
|
||||
typedef struct {
|
||||
void* data;
|
||||
int size;
|
||||
int id; // stream id. usually 0x1E0
|
||||
int timestamp; // pts, 90000 Hz counter based
|
||||
} vo_mpegpes_t;
|
||||
|
||||
char *vo_format_name(int format);
|
||||
|
||||
#endif
|
|
@ -23,7 +23,7 @@
|
|||
#include "mp_msg.h"
|
||||
#include "bswap.h"
|
||||
|
||||
#include "libvo/img_format.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
|
||||
#define DBUG 0
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "codec-cfg.h"
|
||||
//#include "mp_image.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "img_format.h"
|
||||
|
||||
#include "stream.h"
|
||||
#include "demuxer.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#include "codec-cfg.h"
|
||||
#include "../libvo/img_format.h"
|
||||
#include "img_format.h"
|
||||
|
||||
#include "stream.h"
|
||||
#include "demuxer.h"
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
extern vf_info_t ve_info_divx4;
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
#include "aviwrite.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
//===========================================================================//
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
|
||||
#include "aviwrite.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "divx4_vbr.h"
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
#include "aviwrite.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include <libdv/dv.h>
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
#include "aviwrite.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
//===========================================================================//
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
#include "aviwrite.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
//===========================================================================//
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
extern vf_info_t vf_info_vo;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../mp_image.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
struct vf_priv_s {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../mp_image.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../libvo/fastmemcpy.h"
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
// 100=best >=80 very good >=50 fast
|
||||
#define QUALITY 90
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
//#include "../libvo/fastmemcpy.h"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../mp_image.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../libvo/fastmemcpy.h"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
struct vf_priv_s {
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../postproc/postprocess.h"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../libvo/fastmemcpy.h"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../libvo/fastmemcpy.h"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../mp_image.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../libvo/video_out.h"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../libvo/img_format.h"
|
||||
#include "../mp_image.h"
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "../libvo/fastmemcpy.h"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "wine/avifmt.h"
|
||||
#include "wine/vfw.h"
|
||||
|
||||
#include "../mp_image.h"
|
||||
#include "../libmpcodecs/mp_image.h"
|
||||
|
||||
typedef struct {
|
||||
demux_stream_t *ds;
|
||||
|
|
|
@ -3,7 +3,7 @@ include config.mak
|
|||
|
||||
LIBNAME = libvo.a
|
||||
|
||||
SRCS=aspect.c aclib.c osd.c font_load.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) img_format.c sub.c
|
||||
SRCS=aspect.c aclib.c osd.c font_load.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c
|
||||
OBJS=$(SRCS:.c=.o)
|
||||
|
||||
ifeq ($(VIDIX),yes)
|
||||
|
|
|
@ -1,76 +1,2 @@
|
|||
|
||||
#ifndef __IMG_FORMAT_H
|
||||
#define __IMG_FORMAT_H
|
||||
|
||||
/* RGB/BGR Formats */
|
||||
|
||||
#define IMGFMT_RGB_MASK 0xFFFFFF00
|
||||
#define IMGFMT_RGB (('R'<<24)|('G'<<16)|('B'<<8))
|
||||
#define IMGFMT_RGB8 (IMGFMT_RGB|8)
|
||||
#define IMGFMT_RGB15 (IMGFMT_RGB|15)
|
||||
#define IMGFMT_RGB16 (IMGFMT_RGB|16)
|
||||
#define IMGFMT_RGB24 (IMGFMT_RGB|24)
|
||||
#define IMGFMT_RGB32 (IMGFMT_RGB|32)
|
||||
|
||||
#define IMGFMT_BGR_MASK 0xFFFFFF00
|
||||
#define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))
|
||||
#define IMGFMT_BGR8 (IMGFMT_BGR|8)
|
||||
#define IMGFMT_BGR15 (IMGFMT_BGR|15)
|
||||
#define IMGFMT_BGR16 (IMGFMT_BGR|16)
|
||||
#define IMGFMT_BGR24 (IMGFMT_BGR|24)
|
||||
#define IMGFMT_BGR32 (IMGFMT_BGR|32)
|
||||
|
||||
#define IMGFMT_IS_RGB(fmt) ((fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB)
|
||||
#define IMGFMT_IS_BGR(fmt) ((fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
|
||||
|
||||
#define IMGFMT_RGB_DEPTH(fmt) (fmt&~IMGFMT_RGB)
|
||||
#define IMGFMT_BGR_DEPTH(fmt) (fmt&~IMGFMT_BGR)
|
||||
|
||||
|
||||
/* Planar YUV Formats */
|
||||
|
||||
#define IMGFMT_YVU9 0x39555659
|
||||
#define IMGFMT_IF09 0x39304649
|
||||
#define IMGFMT_YV12 0x32315659
|
||||
#define IMGFMT_I420 0x30323449
|
||||
#define IMGFMT_IYUV 0x56555949
|
||||
#define IMGFMT_CLPL 0x4C504C43
|
||||
#define IMGFMT_Y800 0x30303859
|
||||
#define IMGFMT_Y8 0x20203859
|
||||
|
||||
/* Packed YUV Formats */
|
||||
|
||||
#define IMGFMT_IUYV 0x56595549
|
||||
#define IMGFMT_IY41 0x31435949
|
||||
#define IMGFMT_IYU1 0x31555949
|
||||
#define IMGFMT_IYU2 0x32555949
|
||||
#define IMGFMT_UYVY 0x59565955
|
||||
#define IMGFMT_UYNV 0x564E5955
|
||||
#define IMGFMT_cyuv 0x76757963
|
||||
#define IMGFMT_Y422 0x32323459
|
||||
#define IMGFMT_YUY2 0x32595559
|
||||
#define IMGFMT_YUNV 0x564E5559
|
||||
#define IMGFMT_YVYU 0x55595659
|
||||
#define IMGFMT_Y41P 0x50313459
|
||||
#define IMGFMT_Y211 0x31313259
|
||||
#define IMGFMT_Y41T 0x54313459
|
||||
#define IMGFMT_Y42T 0x54323459
|
||||
#define IMGFMT_V422 0x32323456
|
||||
#define IMGFMT_V655 0x35353656
|
||||
#define IMGFMT_CLJR 0x524A4C43
|
||||
#define IMGFMT_YUVP 0x50565559
|
||||
#define IMGFMT_UYVP 0x50565955
|
||||
|
||||
/* Compressed Formats */
|
||||
#define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S'))
|
||||
|
||||
typedef struct {
|
||||
void* data;
|
||||
int size;
|
||||
int id; // stream id. usually 0x1E0
|
||||
int timestamp; // pts, 90000 Hz counter based
|
||||
} vo_mpegpes_t;
|
||||
|
||||
char *vo_format_name(int format);
|
||||
|
||||
#endif
|
||||
#include "../libmpcodecs/img_format.h"
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
#include "fastmemcpy.h"
|
||||
#include "../mmx_defs.h"
|
||||
#include "../mp_image.h"
|
||||
#include "../postproc/rgb2rgb.h"
|
||||
|
||||
// mga_vid drawing functions
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
*/
|
||||
|
||||
#include "../libmpcodecs/vfcap.h"
|
||||
#include "../libmpcodecs/mp_image.h"
|
||||
|
||||
static uint32_t control(uint32_t request, void *data, ...);
|
||||
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
|
|
|
@ -59,7 +59,6 @@
|
|||
#include "sub.h"
|
||||
#include "../postproc/rgb2rgb.h"
|
||||
#include "aspect.h"
|
||||
#include "../mp_image.h"
|
||||
|
||||
LIBVO_EXTERN(directfb)
|
||||
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include "config.h"
|
||||
#include "video_out.h"
|
||||
|
|
|
@ -114,7 +114,6 @@
|
|||
#include "fastmemcpy.h"
|
||||
#include "sub.h"
|
||||
#include "aspect.h"
|
||||
#include "../mp_image.h"
|
||||
|
||||
#ifdef HAVE_X11
|
||||
#include <X11/Xlib.h>
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
#include "fastmemcpy.h"
|
||||
#include "video_out.h"
|
||||
#include "video_out_internal.h"
|
||||
#include "mp_image.h"
|
||||
#include "drivers/3dfx.h"
|
||||
|
||||
LIBVO_EXTERN(tdfxfb)
|
||||
|
|
|
@ -45,8 +45,6 @@ LIBVO_EXTERN( x11 )
|
|||
|
||||
#include "../mp_msg.h"
|
||||
|
||||
#include "../mp_image.h"
|
||||
|
||||
static vo_info_t vo_info =
|
||||
{
|
||||
"X11 ( XImage/Shm )",
|
||||
|
|
|
@ -39,7 +39,6 @@ LIBVO_EXTERN(xv)
|
|||
#include "aspect.h"
|
||||
|
||||
#include "../postproc/rgb2rgb.h"
|
||||
#include "../mp_image.h"
|
||||
|
||||
static vo_info_t vo_info =
|
||||
{
|
||||
|
|
|
@ -29,9 +29,9 @@
|
|||
#include "fastmemcpy.h"
|
||||
#include "osd.h"
|
||||
#include "video_out.h"
|
||||
#include "../mp_image.h"
|
||||
|
||||
#include "../libmpcodecs/vfcap.h"
|
||||
#include "../libmpcodecs/mp_image.h"
|
||||
|
||||
#define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
|
||||
#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
|
||||
|
|
|
@ -42,8 +42,8 @@ static char* banner_text=
|
|||
|
||||
#include "libvo/video_out.h"
|
||||
|
||||
#include "dec_audio.h"
|
||||
#include "dec_video.h"
|
||||
#include "libmpcodecs/dec_audio.h"
|
||||
#include "libmpcodecs/dec_video.h"
|
||||
|
||||
#ifdef HAVE_MP3LAME
|
||||
#include <lame/lame.h>
|
||||
|
|
|
@ -19,7 +19,7 @@ OBJS += decode_MMX.o dct64_MMX.o tabinit_MMX.o
|
|||
#endif
|
||||
SRCS += dct36_3dnow.s dct64_3dnow.c
|
||||
OBJS += dct36_3dnow.o dct64_3dnow.o
|
||||
SRCS += dct36_k7.c dct64_k7.c
|
||||
SRCS += dct36_k7.s dct64_k7.c
|
||||
OBJS += dct36_k7.o dct64_k7.o
|
||||
endif
|
||||
|
||||
|
|
|
@ -140,8 +140,8 @@ static int max_framesize=0;
|
|||
#include "stheader.h"
|
||||
#include "parse_es.h"
|
||||
|
||||
#include "dec_audio.h"
|
||||
#include "dec_video.h"
|
||||
#include "libmpcodecs/dec_audio.h"
|
||||
#include "libmpcodecs/dec_video.h"
|
||||
|
||||
//**************************************************************************//
|
||||
//**************************************************************************//
|
||||
|
|
|
@ -105,7 +105,7 @@ distclean:
|
|||
dep: depend
|
||||
|
||||
depend:
|
||||
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
|
||||
echo "depend not supported"
|
||||
|
||||
install:
|
||||
mkdir -p $(BINDIR)
|
||||
|
|
Loading…
Reference in New Issue