mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpeg2000parse: sub-sampling parse should take component into account

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1653>
This commit is contained in:
Aaron Boxer 2020-03-24 09:18:28 -04:00 committed by Stéphane Cerveau
parent 7edff6e746
commit b2a0fd9e96
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/videoparsers/gstjpeg2000parse.c
View file

@ -57,19 +57,21 @@ gst_jpeg2000_parse_is_part_2 (guint16 rsiz)
static void
gst_jpeg2000_parse_get_subsampling (GstJPEG2000Sampling sampling, guint8 * dx,
guint8 * dy)
gst_jpeg2000_parse_get_subsampling (guint16 compno,
GstJPEG2000Sampling sampling, guint8 * dx, guint8 * dy)
{
*dx = 1;
*dy = 1;
if (sampling == GST_JPEG2000_SAMPLING_YBR422) {
*dx = 2;
} else if (sampling == GST_JPEG2000_SAMPLING_YBR420) {
*dx = 2;
*dy = 2;
} else if (sampling == GST_JPEG2000_SAMPLING_YBR410) {
*dx = 4;
*dy = 2;
if (compno == 1 || compno == 2) {
if (sampling == GST_JPEG2000_SAMPLING_YBR422) {
*dx = 2;
} else if (sampling == GST_JPEG2000_SAMPLING_YBR420) {
*dx = 2;
*dy = 2;
} else if (sampling == GST_JPEG2000_SAMPLING_YBR410) {
*dx = 4;
*dy = 2;
}
}
}
@ -590,7 +592,8 @@ gst_jpeg2000_parse_handle_frame (GstBaseParse * parse,
}
if (sink_sampling != GST_JPEG2000_SAMPLING_NONE) {
guint8 dx_caps, dy_caps;
gst_jpeg2000_parse_get_subsampling (sink_sampling, &dx_caps, &dy_caps);
gst_jpeg2000_parse_get_subsampling (compno, sink_sampling, &dx_caps,
&dy_caps);
if (dx_caps != dx[compno] || dy_caps != dy[compno]) {
GstJPEG2000Colorspace inferred_colorspace =
GST_JPEG2000_COLORSPACE_NONE;