diff options
author | Wim Taymans <wtaymans@redhat.com> | 2015-02-24 10:01:18 +0100 |
---|---|---|
committer | Wim Taymans <wtaymans@redhat.com> | 2015-02-24 17:29:18 +0100 |
commit | cb5ec197da5fb4087020a01cf9c4a6699bf0803f (patch) | |
tree | a8de0fb8c002ea164ad1a7e2b45316b9f8e0f354 | |
parent | bf916a244d9162f2c572ce3ded73bf79cfc3f450 (diff) |
video-converter: disable fastpath when scaling and gamma
Disable the fastpath when scaling and doing gamma remap.
-rw-r--r-- | gst-libs/gst/video/video-converter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c index 9eaf5a913..097364e01 100644 --- a/gst-libs/gst/video/video-converter.c +++ b/gst-libs/gst/video/video-converter.c @@ -4282,11 +4282,13 @@ video_converter_lookup_fastpath (GstVideoConverter * convert) /* we don't do gamma conversion in fastpath */ in_transf = convert->in_info.colorimetry.transfer; out_transf = convert->out_info.colorimetry.transfer; - if (CHECK_GAMMA_REMAP (convert) && in_transf != out_transf) - return FALSE; same_size = (width == convert->out_width && height == convert->out_height); + /* fastpaths don't do gamma */ + if (CHECK_GAMMA_REMAP (convert) && (!same_size || in_transf != out_transf)) + return FALSE; + in_format = GST_VIDEO_INFO_FORMAT (&convert->in_info); out_format = GST_VIDEO_INFO_FORMAT (&convert->out_info); |