mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

video-converter: don't convert too much

Browse source 
Always convert the smallest width.
This commit is contained in:
Wim Taymans 2014-10-27 11:59:14 +01:00
parent fcc7fbd460
commit 9591e22fee
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/video/video-converter.c
View file

@ -702,9 +702,10 @@ gst_video_converter_frame (GstVideoConverter * convert,
static void static void
video_converter_matrix8 (GstVideoConverter * convert, gpointer pixels) video_converter_matrix8 (GstVideoConverter * convert, gpointer pixels)
{ {
gint width = MIN (convert->in_width, convert->out_width);
#if 1 #if 1
video_orc_matrix8 (pixels, pixels, convert->orc_p1, convert->orc_p2, video_orc_matrix8 (pixels, pixels, convert->orc_p1, convert->orc_p2,
convert->orc_p3, convert->in_width); convert->orc_p3, width);
#elif 0 #elif 0
/* FIXME we would like to set this as a backup function, it's faster than the /* FIXME we would like to set this as a backup function, it's faster than the
* orc generated one */ * orc generated one */
@ -1173,17 +1174,20 @@ do_convert_lines (GstLineCache * cache, gint line, GstVideoConverter * convert)
{ {
gpointer *lines; gpointer *lines;
guint in_bits, out_bits; guint in_bits, out_bits;
gint width;
lines = gst_line_cache_get_lines (convert->convert_lines, line, 1); lines = gst_line_cache_get_lines (convert->convert_lines, line, 1);
in_bits = convert->in_bits; in_bits = convert->in_bits;
out_bits = convert->out_bits; out_bits = convert->out_bits;
width = MIN (convert->in_width, convert->out_width);
GST_DEBUG ("convert line %d", line); GST_DEBUG ("convert line %d", line);
if (out_bits == 16 || in_bits == 16) { if (out_bits == 16 || in_bits == 16) {
/* FIXME, we can scale in the conversion matrix */ /* FIXME, we can scale in the conversion matrix */
if (in_bits == 8) if (in_bits == 8)
convert_to16 (lines[0], convert->out_width); convert_to16 (lines[0], width);
if (convert->matrix) if (convert->matrix)
convert->matrix (convert, lines[0]); convert->matrix (convert, lines[0]);
@ -1191,7 +1195,7 @@ do_convert_lines (GstLineCache * cache, gint line, GstVideoConverter * convert)
convert->dither16 (convert, lines[0], line); convert->dither16 (convert, lines[0], line);
if (out_bits == 8) if (out_bits == 8)
convert_to8 (lines[0], convert->out_width); convert_to8 (lines[0], width);
} else { } else {
if (convert->matrix) if (convert->matrix)
convert->matrix (convert, lines[0]); convert->matrix (convert, lines[0]);