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

22 files changed, 110 insertions, 34 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 5fdffb5890..cc2381c8b5 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -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)
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
new file mode 100644
index 0000000000..6dd00a2060
--- /dev/null
+++ b/libmpcodecs/img_format.h
@@ -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
diff --git a/libmpcodecs/native/cinepak.c b/libmpcodecs/native/cinepak.c
index 10a5f7255b..b29d78cbb5 100644
--- a/libmpcodecs/native/cinepak.c
+++ b/libmpcodecs/native/cinepak.c
@@ -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
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 0ac34486f0..415d49927b 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -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"
diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h
index 780e2473d1..a2eed4fb65 100644
--- a/libmpcodecs/vd_internal.h
+++ b/libmpcodecs/vd_internal.h
@@ -1,6 +1,6 @@
 
 #include "codec-cfg.h"
-#include "../libvo/img_format.h"
+#include "img_format.h"
 
 #include "stream.h"
 #include "demuxer.h"
diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c
index 717f83d5cc..00b559de70 100644
--- a/libmpcodecs/ve.c
+++ b/libmpcodecs/ve.c
@@ -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;
diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c
index c990ca4117..c5480c4c0a 100644
--- a/libmpcodecs/ve_divx4.c
+++ b/libmpcodecs/ve_divx4.c
@@ -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"
 
 //===========================================================================//
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index a7a4289f8d..b9a64fb502 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -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"
diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c
index c857343be8..d06b514d24 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -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>
diff --git a/libmpcodecs/ve_rawrgb.c b/libmpcodecs/ve_rawrgb.c
index 2d67519174..ebc4906c25 100644
--- a/libmpcodecs/ve_rawrgb.c
+++ b/libmpcodecs/ve_rawrgb.c
@@ -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"
 
 //===========================================================================//
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index 9f39bf7272..cd60d66992 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -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"
 
 //===========================================================================//
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 5e65033582..5455df4599 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -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;
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c
index 5938ec7d4c..1b1f057f4f 100644
--- a/libmpcodecs/vf_crop.c
+++ b/libmpcodecs/vf_crop.c
@@ -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 {
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index cbd29beb18..3c5eb2904f 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -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"
diff --git a/libmpcodecs/vf_fame.c b/libmpcodecs/vf_fame.c
index c62bef21b2..90f3ec6c56 100644
--- a/libmpcodecs/vf_fame.c
+++ b/libmpcodecs/vf_fame.c
@@ -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"
diff --git a/libmpcodecs/vf_flip.c b/libmpcodecs/vf_flip.c
index ef2366a8e2..edd9c65d78 100644
--- a/libmpcodecs/vf_flip.c
+++ b/libmpcodecs/vf_flip.c
@@ -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"
diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c
index d620ad5f4a..589f0b9eaa 100644
--- a/libmpcodecs/vf_format.c
+++ b/libmpcodecs/vf_format.c
@@ -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 {
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index 8bc3f3a3d8..b1b1d81e8f 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -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"
diff --git a/libmpcodecs/vf_rgb2bgr.c b/libmpcodecs/vf_rgb2bgr.c
index 95b329c872..251c4c88a9 100644
--- a/libmpcodecs/vf_rgb2bgr.c
+++ b/libmpcodecs/vf_rgb2bgr.c
@@ -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"
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index bbb577b54b..ca951d9544 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -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"
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 6abd004e91..69586aa369 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -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"
diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c
index ae7c669941..8af60aac12 100644
--- a/libmpcodecs/vf_yuy2.c
+++ b/libmpcodecs/vf_yuy2.c
@@ -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"