Attachment 1619 Details for Bug 9978 – патч

[patch] патч

ffmpeg-svn-r6191-swscale.patch (text/plain), 8.00 KB, created by led on 2006-09-11 14:25:22 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: led

Created: 2006-09-11 14:25:22 MSD

Size: 8.00 KB

patch

obsolete

>diff -urN ffmpeg-svn-r6191.orig/libavcodec/imgconvert.c ffmpeg-svn-r6191/libavcodec/imgconvert.c
>--- ffmpeg-svn-r6191.orig/libavcodec/imgconvert.c	2006-08-30 12:54:41 +0300
>+++ ffmpeg-svn-r6191/libavcodec/imgconvert.c	2006-09-11 12:46:20 +0300
>@@ -2187,7 +2187,6 @@
>     return 0;
> }
> 
>-#ifndef CONFIG_SWSCALER
> /* XXX: always use linesize. Return -1 if not supported */
> int img_convert(AVPicture *dst, int dst_pix_fmt,
>                 const AVPicture *src, int src_pix_fmt,
>@@ -2429,7 +2428,6 @@
>     avpicture_free(tmp);
>     return ret;
> }
>-#endif
> 
> /* NOTE: we scan all the pixels to have an exact information */
> static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
>diff -urN ffmpeg-svn-r6191.orig/libavcodec/Makefile ffmpeg-svn-r6191/libavcodec/Makefile
>--- ffmpeg-svn-r6191.orig/libavcodec/Makefile	2006-09-06 10:13:12 +0300
>+++ ffmpeg-svn-r6191/libavcodec/Makefile	2006-09-11 12:47:05 +0300
>@@ -282,9 +282,7 @@
> 
> OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
> 
>-ifneq ($(CONFIG_SWSCALER),yes)
> OBJS += imgresample.o
>-endif
> 
> # i386 mmx specific stuff
> ifeq ($(TARGET_MMX),yes)
>diff -urN ffmpeg-svn-r6191.orig/libswscale/img_format.h ffmpeg-svn-r6191/libswscale/img_format.h
>--- ffmpeg-svn-r6191.orig/libswscale/img_format.h	1970-01-01 03:00:00 +0300
>+++ ffmpeg-svn-r6191/libswscale/img_format.h	2006-09-11 12:46:20 +0300
>@@ -0,0 +1,120 @@
>+
>+#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_RGB1  (IMGFMT_RGB|1)
>+#define IMGFMT_RGB4  (IMGFMT_RGB|4)
>+#define IMGFMT_RGB4_CHAR  (IMGFMT_RGB|4|128) // RGB4 with 1 pixel per byte
>+#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_BGR1 (IMGFMT_BGR|1)
>+#define IMGFMT_BGR4 (IMGFMT_BGR|4)
>+#define IMGFMT_BGR4_CHAR (IMGFMT_BGR|4|128) // BGR4 with 1 pixel per byte
>+#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)
>+
>+#ifdef WORDS_BIGENDIAN
>+#define IMGFMT_ABGR IMGFMT_RGB32
>+#define IMGFMT_BGRA (IMGFMT_RGB32|64)
>+#define IMGFMT_ARGB IMGFMT_BGR32
>+#define IMGFMT_RGBA (IMGFMT_BGR32|64)
>+#else
>+#define IMGFMT_ABGR (IMGFMT_BGR32|64)
>+#define IMGFMT_BGRA IMGFMT_BGR32
>+#define IMGFMT_ARGB (IMGFMT_RGB32|64)
>+#define IMGFMT_RGBA IMGFMT_RGB32
>+#endif
>+
>+/* old names for compatibility */
>+#define IMGFMT_RG4B  IMGFMT_RGB4_CHAR
>+#define IMGFMT_BG4B  IMGFMT_BGR4_CHAR
>+
>+#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)&0x3F)
>+#define IMGFMT_BGR_DEPTH(fmt) ((fmt)&0x3F)
>+
>+
>+/* 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
>+#define IMGFMT_NV12 0x3231564E
>+#define IMGFMT_NV21 0x3132564E
>+
>+/* unofficial Planar Formats, FIXME if official 4CC exists */
>+#define IMGFMT_444P 0x50343434
>+#define IMGFMT_422P 0x50323234
>+#define IMGFMT_411P 0x50313134
>+#define IMGFMT_HM12 0x32314D48
>+
>+/* 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'))
>+/* Formats that are understood by zoran chips, we include
>+ * non-interlaced, interlaced top-first, interlaced bottom-first */
>+#define IMGFMT_ZRMJPEGNI  (('Z'<<24)|('R'<<16)|('N'<<8)|('I'))
>+#define IMGFMT_ZRMJPEGIT (('Z'<<24)|('R'<<16)|('I'<<8)|('T'))
>+#define IMGFMT_ZRMJPEGIB (('Z'<<24)|('R'<<16)|('I'<<8)|('B'))
>+
>+// I think that this code could not be used by any other codec/format
>+#define IMGFMT_XVMC 0x1DC70000
>+#define IMGFMT_XVMC_MASK 0xFFFF0000
>+#define IMGFMT_IS_XVMC(fmt) (((fmt)&IMGFMT_XVMC_MASK)==IMGFMT_XVMC)
>+//these are chroma420
>+#define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02)
>+#define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82)
>+#define IMGFMT_XVMC_VLD_MPEG2 (IMGFMT_XVMC|0x42)
>+
>+typedef struct {
>+    void* data;
>+    int size;
>+    int id;        // stream id. usually 0x1E0
>+    int timestamp; // pts, 90000 Hz counter based
>+} vo_mpegpes_t;
>+
>+const char *vo_format_name(int format);
>+
>+#endif
>diff -urN ffmpeg-svn-r6191.orig/libswscale/Makefile ffmpeg-svn-r6191/libswscale/Makefile
>--- ffmpeg-svn-r6191.orig/libswscale/Makefile	2006-08-21 19:37:33 +0300
>+++ ffmpeg-svn-r6191/libswscale/Makefile	2006-09-11 12:46:20 +0300
>@@ -18,6 +18,8 @@
> OBJS+=  yuv2rgb_altivec.o
> endif
> 
>+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
>+
> HEADERS = swscale.h rgb2rgb.h
> 
> include $(SRC_PATH)/common.mak
>diff -urN ffmpeg-svn-r6191.orig/libswscale/swscale.c ffmpeg-svn-r6191/libswscale/swscale.c
>--- ffmpeg-svn-r6191.orig/libswscale/swscale.c	2006-09-05 09:01:48 +0300
>+++ ffmpeg-svn-r6191/libswscale/swscale.c	2006-09-11 12:46:20 +0300
>@@ -74,7 +74,7 @@
> #include "swscale_internal.h"
> #include "x86_cpu.h"
> #include "bswap.h"
>-#include "libmpcodecs/img_format.h"
>+#include "img_format.h"
> #include "rgb2rgb.h"
> #ifdef USE_FASTMEMCPY
> #include "libvo/fastmemcpy.h"
>diff -urN ffmpeg-svn-r6191.orig/libswscale/swscale-example.c ffmpeg-svn-r6191/libswscale/swscale-example.c
>--- ffmpeg-svn-r6191.orig/libswscale/swscale-example.c	2006-08-18 20:54:24 +0300
>+++ ffmpeg-svn-r6191/libswscale/swscale-example.c	2006-09-11 12:46:20 +0300
>@@ -23,7 +23,7 @@
> #include <stdarg.h>
> 
> #include "swscale.h"
>-#include "libmpcodecs/img_format.h"
>+#include "img_format.h"
> 
> static int testFormat[]={
> IMGFMT_YVU9,
>diff -urN ffmpeg-svn-r6191.orig/libswscale/yuv2rgb_altivec.c ffmpeg-svn-r6191/libswscale/yuv2rgb_altivec.c
>--- ffmpeg-svn-r6191.orig/libswscale/yuv2rgb_altivec.c	2006-08-18 20:54:24 +0300
>+++ ffmpeg-svn-r6191/libswscale/yuv2rgb_altivec.c	2006-09-11 12:46:20 +0300
>@@ -74,7 +74,7 @@
> #include "rgb2rgb.h"
> #include "swscale.h"
> #include "swscale_internal.h"
>-#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
>+#include "img_format.h" //FIXME try to reduce dependency of such stuff
> 
> #undef PROFILE_THE_BEAST
> #undef INC_SCALING
>diff -urN ffmpeg-svn-r6191.orig/libswscale/yuv2rgb.c ffmpeg-svn-r6191/libswscale/yuv2rgb.c
>--- ffmpeg-svn-r6191.orig/libswscale/yuv2rgb.c	2006-08-18 20:54:24 +0300
>+++ ffmpeg-svn-r6191/libswscale/yuv2rgb.c	2006-09-11 12:46:20 +0300
>@@ -39,7 +39,7 @@
> #include "rgb2rgb.h"
> #include "swscale.h"
> #include "swscale_internal.h"
>-#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
>+#include "img_format.h" //FIXME try to reduce dependency of such stuff
> 
> #ifdef HAVE_MLIB
> #include "yuv2rgb_mlib.c"
>diff -urN ffmpeg-svn-r6191.orig/libswscale/yuv2rgb_mlib.c ffmpeg-svn-r6191/libswscale/yuv2rgb_mlib.c
>--- ffmpeg-svn-r6191.orig/libswscale/yuv2rgb_mlib.c	2006-08-18 20:54:24 +0300
>+++ ffmpeg-svn-r6191/libswscale/yuv2rgb_mlib.c	2006-09-11 12:46:20 +0300
>@@ -30,7 +30,7 @@
> #include <stdlib.h>
> #include <assert.h>
> 
>-#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
>+#include "img_format.h" //FIXME try to reduce dependency of such stuff
> #include "swscale.h"
> 
> static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,

Actions: View | Diff

Attachments on bug 9978: 1619