зеркало из https://github.com/mozilla/gecko-dev.git
Bug 551277 - Fix comm-central breakage - r=roc
This commit is contained in:
Родитель
26f0abfc40
Коммит
9cccfea20c
|
@ -34,6 +34,7 @@ CPPSRCS += yuv_row_mac.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
DEFINES += -D_IMPL_NS_GFX
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
|
@ -17,3 +17,4 @@ picture_region.patch: Change Chromium code to allow a picture region.
|
||||||
remove_scale.patch: Removes Chromium scaling code.
|
remove_scale.patch: Removes Chromium scaling code.
|
||||||
|
|
||||||
yv24.patch: Adds YCbCr 4:4:4 support
|
yv24.patch: Adds YCbCr 4:4:4 support
|
||||||
|
breakage.patch: Export public function to fix seamonkey breakage and fix fast calls on ARM & PPC
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
diff --git a/gfx/ycbcr/yuv_convert.h b/gfx/ycbcr/yuv_convert.h
|
||||||
|
--- a/gfx/ycbcr/yuv_convert.h
|
||||||
|
+++ b/gfx/ycbcr/yuv_convert.h
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
#define MEDIA_BASE_YUV_CONVERT_H_
|
||||||
|
|
||||||
|
#include "chromium_types.h"
|
||||||
|
+#include "gfxCore.h"
|
||||||
|
|
||||||
|
namespace mozilla {
|
||||||
|
|
||||||
|
@@ -21,7 +22,7 @@
|
||||||
|
|
||||||
|
// Convert a frame of YUV to 32 bit ARGB.
|
||||||
|
// Pass in YV16/YV12 depending on source format
|
||||||
|
-void ConvertYCbCrToRGB32(const uint8* yplane,
|
||||||
|
+NS_GFX_(void) ConvertYCbCrToRGB32(const uint8* yplane,
|
||||||
|
const uint8* uplane,
|
||||||
|
const uint8* vplane,
|
||||||
|
uint8* rgbframe,
|
||||||
|
diff --git a/gfx/ycbcr/yuv_row_linux.cpp b/gfx/ycbcr/yuv_row_linux.cpp
|
||||||
|
--- a/gfx/ycbcr/yuv_row_linux.cpp
|
||||||
|
+++ b/gfx/ycbcr/yuv_row_linux.cpp
|
||||||
|
@@ -18,7 +18,7 @@
|
||||||
|
const uint8* v_buf,
|
||||||
|
uint8* rgb_buf,
|
||||||
|
int width) {
|
||||||
|
- FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width);
|
||||||
|
+ FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
diff --git a/gfx/ycbcr/yuv_row_mac.cpp b/gfx/ycbcr/yuv_row_mac.cpp
|
||||||
|
--- a/gfx/ycbcr/yuv_row_mac.cpp
|
||||||
|
+++ b/gfx/ycbcr/yuv_row_mac.cpp
|
||||||
|
@@ -15,7 +15,7 @@
|
||||||
|
const uint8* v_buf,
|
||||||
|
uint8* rgb_buf,
|
||||||
|
int width) {
|
||||||
|
- FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width);
|
||||||
|
+ FastConvertYUVToRGB32Row_C(y_buf, u_buf, v_buf, rgb_buf, width, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
|
@ -10,3 +10,4 @@ patch -p3 <convert.patch
|
||||||
patch -p3 <picture_region.patch
|
patch -p3 <picture_region.patch
|
||||||
patch -p3 <remove_scale.patch
|
patch -p3 <remove_scale.patch
|
||||||
patch -p3 <yv24.patch
|
patch -p3 <yv24.patch
|
||||||
|
patch -p3 <breakage.patch
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#define MEDIA_BASE_YUV_CONVERT_H_
|
#define MEDIA_BASE_YUV_CONVERT_H_
|
||||||
|
|
||||||
#include "chromium_types.h"
|
#include "chromium_types.h"
|
||||||
|
#include "gfxCore.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
|
||||||
|
@ -21,7 +22,7 @@ enum YUVType {
|
||||||
|
|
||||||
// Convert a frame of YUV to 32 bit ARGB.
|
// Convert a frame of YUV to 32 bit ARGB.
|
||||||
// Pass in YV16/YV12 depending on source format
|
// Pass in YV16/YV12 depending on source format
|
||||||
void ConvertYCbCrToRGB32(const uint8* yplane,
|
NS_GFX_(void) ConvertYCbCrToRGB32(const uint8* yplane,
|
||||||
const uint8* uplane,
|
const uint8* uplane,
|
||||||
const uint8* vplane,
|
const uint8* vplane,
|
||||||
uint8* rgbframe,
|
uint8* rgbframe,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче