Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-base
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-base
Commits
34cb2fa4
Commit
34cb2fa4
authored
Nov 03, 2010
by
Sebastian Dröge
Committed by
Wim Taymans
Jun 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MOVED FROM BAD 49/68] colorspace: Use GST_CHECK_PLUGINS_BASE_VERSION() instead of other hacks
parent
e857835f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
gst/colorspace/colorspace.c
gst/colorspace/colorspace.c
+5
-3
gst/colorspace/gstcolorspace.c
gst/colorspace/gstcolorspace.c
+7
-7
No files found.
gst/colorspace/colorspace.c
View file @
34cb2fa4
...
...
@@ -27,6 +27,8 @@
#include <string.h>
#include "gstcolorspaceorc.h"
/* For GST_CHECK_PLUGINS_BASE_VERSION() */
#include <gst/pbutils/pbutils.h>
static
void
colorspace_convert_generic
(
ColorspaceConvert
*
convert
,
guint8
*
dest
,
const
guint8
*
src
);
...
...
@@ -99,7 +101,7 @@ colorspace_convert_new (GstVideoFormat to_format, ColorSpaceColorSpec to_spec,
convert
->
tmpline
=
g_malloc
(
sizeof
(
guint32
)
*
width
*
2
);
#if
def GST_VIDEO_CAPS_RGB8_PALETTED
#if
GST_CHECK_PLUGINS_BASE_VERSION(0, 10, 32)
if
(
to_format
==
GST_VIDEO_FORMAT_RGB8_PALETTED
)
{
/* build poor man's palette, taken from ffmpegcolorspace */
static
const
guint8
pal_value
[
6
]
=
{
0x00
,
0x33
,
0x66
,
0x99
,
0xcc
,
0xff
};
...
...
@@ -882,7 +884,7 @@ putline_A420 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src,
FRAME_GET_LINE
(
dest
,
3
,
j
),
src
,
convert
->
width
/
2
);
}
#if
def GST_VIDEO_CAPS_RGB8_PALETTED
#if
GST_CHECK_PLUGINS_BASE_VERSION(0, 10, 32)
static
void
getline_RGB8P
(
ColorspaceConvert
*
convert
,
guint8
*
dest
,
const
guint8
*
src
,
int
j
)
...
...
@@ -961,7 +963,7 @@ static const ColorspaceLine lines[] = {
{
GST_VIDEO_FORMAT_BGR15
,
getline_BGR15
,
putline_BGR15
},
{
GST_VIDEO_FORMAT_UYVP
,
getline_UYVP
,
putline_UYVP
},
{
GST_VIDEO_FORMAT_A420
,
getline_A420
,
putline_A420
}
#if
def GST_VIDEO_CAPS_RGB8_PALETTED
#if
GST_CHECK_PLUGINS_BASE_VERSION(0, 10, 32)
,
{
GST_VIDEO_FORMAT_RGB8_PALETTED
,
getline_RGB8P
,
putline_RGB8P
}
#endif
};
...
...
gst/colorspace/gstcolorspace.c
View file @
34cb2fa4
...
...
@@ -40,18 +40,18 @@
#include "gstcolorspace.h"
#include <gst/video/video.h>
/* For GST_CHECK_PLUGINS_BASE_VERSION() */
#include <gst/pbutils/pbutils.h>
#include <string.h>
GST_DEBUG_CATEGORY
(
colorspace_debug
);
#define GST_CAT_DEFAULT colorspace_debug
GST_DEBUG_CATEGORY
(
colorspace_performance
);
#if
def GST_VIDEO_CAPS_RGB8_PALETTED
#if
!GST_CHECK_PLUGINS_BASE_VERSION(0, 10, 32)
#define VIDEO_CAPS_RGB8_PALETTED \
"video/x-raw-rgb, bpp = (int)8, depth = (int)8, " \
"width = "GST_VIDEO_SIZE_RANGE" , " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = "GST_VIDEO_FPS_RANGE "; "
GST_VIDEO_CAPS_RGB8_PALETTED "; "
#else
#define VIDEO_CAPS_RGB8_PALETTED
/* no-op */
#endif
...
...
@@ -315,7 +315,7 @@ gst_csp_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
if
(
space
->
convert
)
{
colorspace_convert_set_interlaced
(
space
->
convert
,
in_interlaced
);
}
#if
def GST_VIDEO_CAPS_RGB8_PALETTED
#if
GST_CHECK_PLUGINS_BASE_VERSION(0, 10, 32)
/* palette, only for from data */
if
(
space
->
from_format
==
GST_VIDEO_FORMAT_RGB8_PALETTED
&&
space
->
to_format
==
GST_VIDEO_FORMAT_RGB8_PALETTED
)
{
...
...
@@ -371,7 +371,7 @@ format_mismatch:
space
->
to_format
=
GST_VIDEO_FORMAT_UNKNOWN
;
return
FALSE
;
}
#if
def GST_VIDEO_CAPS_RGB8_PALETTED
#if
GST_CHECK_PLUGINS_BASE_VERSION(0, 10, 32)
invalid_palette:
{
GST_ERROR_OBJECT
(
space
,
"invalid palette"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment