On Tue, Jun 01, 2010 at 10:14:07PM +0200, Robert Schwebel wrote:
While being there, reworked the option list from the configure --help
output.
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de
---
.../add-RGB666-Support-to-ffmpegcolorspace.patch | 296
.../add-rgb666-support-to-videotestsrc.patch | 82 --
patches/gst-plugins-base-0.10.25/series|1 -
.../add-RGB666-Support-to-ffmpegcolorspace.patch | 296
.../add-rgb666-support-to-videotestsrc.patch | 82 ++
patches/gst-plugins-base-0.10.29/series|1 +
rules/gst-plugins-base.in | 36 ++--
rules/gst-plugins-base.make| 58 +++--
rules/qt4.in |1 -
9 files changed, 432 insertions(+), 421 deletions(-)
delete mode 100644
patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
delete mode 100644
patches/gst-plugins-base-0.10.25/add-rgb666-support-to-videotestsrc.patch
delete mode 100644 patches/gst-plugins-base-0.10.25/series
create mode 100644
patches/gst-plugins-base-0.10.29/add-RGB666-Support-to-ffmpegcolorspace.patch
create mode 100644
patches/gst-plugins-base-0.10.29/add-rgb666-support-to-videotestsrc.patch
create mode 100644 patches/gst-plugins-base-0.10.29/series
diff --git
a/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
b/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
deleted file mode 100644
index b8e2b47..000
---
a/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From: Luotao Fu l...@pengutronix.de
-Date: Thu, 11 Dec 2008 17:02:52 +0100
-Subject: [PATCH] added RGB666 Support to ffmpegcolorspace
-
-This one adds RGB666 Support to ffmpegcolorspace
-Still very hacky, need to be enhanced before submitting to mainline
-
-Signed-off-by: Luotao Fu l...@pengutronix.de
- gst/ffmpegcolorspace/avcodec.h |1
- gst/ffmpegcolorspace/gstffmpegcodecmap.c | 26 ++-
- gst/ffmpegcolorspace/imgconvert.c| 70
+--
- 3 files changed, 90 insertions(+), 7 deletions(-)
-
-Index: gst/ffmpegcolorspace/avcodec.h
-===
gst/ffmpegcolorspace/avcodec.h.orig
-+++ gst/ffmpegcolorspace/avcodec.h
-@@ -87,6 +87,7 @@ enum PixelFormat {
- PIX_FMT_UYVY411, /// Packed pixel, Cb Y0 Y1 Cr Y2 Y3
-
- PIX_FMT_AYUV, /// Packed pixel, A0 Y0 Cb Cr
-+PIX_FMT_RGB666,
- PIX_FMT_NB
- };
-
-Index: gst/ffmpegcolorspace/imgconvert.c
-===
gst/ffmpegcolorspace/imgconvert.c.orig
-+++ gst/ffmpegcolorspace/imgconvert.c
-@@ -409,8 +409,18 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_N
- /* .x_chroma_shift = */ 0,
- /* .y_chroma_shift = */ 0,
- /*.depth = */ 8
-+ },
-+ /* [PIX_FMT_RGB666] = */ {
-+/* .format = */ PIX_FMT_RGB666,
-+/* .name = */ rgb666,
-+/* .nb_channels= */ 4,
-+/* .color_type = */ FF_COLOR_RGB,
-+/* .pixel_type = */ FF_PIXEL_PLANAR,
-+/* .is_alpha = */ 0,
-+/* .x_chroma_shift = */ 0,
-+/* .y_chroma_shift = */ 0,
-+/* .depth = */ 6,
- }
--
- };
-
- /* returns NULL if not found */
-@@ -419,7 +429,6 @@ PixFmtInfo *
- get_pix_fmt_info (enum PixelFormat format)
- {
- int i;
--
- for (i = 0; i sizeof (pix_fmt_info) / sizeof (pix_fmt_info[0]); i++) {
- if (pix_fmt_info[i].format == format) {
- return pix_fmt_info + i;
-@@ -594,6 +603,8 @@ avg_bits_per_pixel (int pix_fmt)
- case PIX_FMT_RGB555:
- bits = 16;
- break;
-+case PIX_FMT_RGB666:
-+ bits = 8 * pf-nb_channels;
- case PIX_FMT_UYVY411:
- bits = 12;
- break;
-@@ -603,7 +614,9 @@ avg_bits_per_pixel (int pix_fmt)
- }
- break;
- case FF_PIXEL_PLANAR:
-- if (pf-x_chroma_shift == 0 pf-y_chroma_shift == 0) {
-+ if(pix_fmt == PIX_FMT_RGB666) {
-+bits = 8 * pf-nb_channels;
-+ } else if (pf-x_chroma_shift == 0 pf-y_chroma_shift == 0) {
- bits = pf-depth * pf-nb_channels;
- } else {
- bits = pf-depth + ((2 * pf-depth)
-@@ -661,7 +674,6 @@ avcodec_find_best_pix_fmt (int pix_fmt_m
- ~FF_LOSS_DEPTH,
- 0,
- };
--
- /* try with successive loss */
- i = 0;
- for (;;) {
-@@ -1768,6 +1780,37 @@ bitcopy_n (unsigned int a, int n)
-
- #include imgconvert_template.h
-
-+/* rgb666 handling */
-+
-+#define RGB_NAME rgb666
-+#define FMT_RGB666
-+
-+#define RGB_IN(r, g, b, s)\
-+{\
-+unsigned int v = ((const uint32_t *)(s))[0];\
-+r =
