diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-29 12:29:53 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-29 12:30:23 +0200 |
| commit | 977410bb8952bf62e20362aff41b861e745492e4 (patch) | |
| tree | de1dc21cae2d737ab288c8dd895b78863154746a | |
| parent | af6e1c70325871c45d8d155ea332cbb67473c89f (diff) | |
| download | gstreamer-plugins-bad-977410bb8952bf62e20362aff41b861e745492e4.tar.gz | |
openjpeg: Fix compilation without the single-include headers of 1.2
| -rw-r--r-- | ext/openjpeg/gstopenjpegdec.c | 15 | ||||
| -rw-r--r-- | ext/openjpeg/gstopenjpegdec.h | 1 | ||||
| -rw-r--r-- | ext/openjpeg/gstopenjpegenc.c | 7 | ||||
| -rw-r--r-- | ext/openjpeg/gstopenjpegenc.h | 1 |
4 files changed, 10 insertions, 14 deletions
diff --git a/ext/openjpeg/gstopenjpegdec.c b/ext/openjpeg/gstopenjpegdec.c index ca178e2cf..36c839d6c 100644 --- a/ext/openjpeg/gstopenjpegdec.c +++ b/ext/openjpeg/gstopenjpegdec.c @@ -24,6 +24,8 @@ #endif #include "gstopenjpegdec.h" +#include <gst/video/gstvideometa.h> +#include <gst/video/gstvideopool.h> GST_DEBUG_CATEGORY_STATIC (gst_openjpeg_dec_debug); #define GST_CAT_DEFAULT gst_openjpeg_dec_debug @@ -41,10 +43,10 @@ static gboolean gst_openjpeg_dec_decide_allocation (GstVideoDecoder * decoder, #if G_BYTE_ORDER == G_LITTLE_ENDIAN #define GRAY16 "GRAY16_LE" -#define YUV10 "Y444_10LE, I422_10LE, I420_10LE" +#define YUV10 "422_10LE, I420_10LE" #else #define GRAY16 "GRAY16_BE" -#define YUV10 "Y444_10BE, I422_10BE, I420_10BE" +#define YUV10 "I422_10BE, I420_10BE" #endif static GstStaticPadTemplate gst_openjpeg_dec_sink_template = @@ -804,14 +806,7 @@ gst_openjpeg_dec_negotiate (GstOpenJPEGDec * self, opj_image_t * image) } else if (get_highest_prec (image) <= 16) { if (image->comps[0].prec == 10 && image->comps[1].prec == 10 && image->comps[2].prec == 10) { - if (image->comps[1].dx == 1 && image->comps[1].dy == 1) { - self->fill_frame = fill_frame_planar16_3; -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - format = GST_VIDEO_FORMAT_Y444_10LE; -#else - format = GST_VIDEO_FORMAT_Y444_10BE; -#endif - } else if (image->comps[1].dx == 2 && image->comps[1].dy == 1) { + if (image->comps[1].dx == 2 && image->comps[1].dy == 1) { self->fill_frame = fill_frame_planar16_3; #if G_BYTE_ORDER == G_LITTLE_ENDIAN format = GST_VIDEO_FORMAT_I422_10LE; diff --git a/ext/openjpeg/gstopenjpegdec.h b/ext/openjpeg/gstopenjpegdec.h index c4a7cd942..c043485e1 100644 --- a/ext/openjpeg/gstopenjpegdec.h +++ b/ext/openjpeg/gstopenjpegdec.h @@ -24,6 +24,7 @@ #include <gst/gst.h> #include <gst/video/video.h> +#include <gst/video/gstvideodecoder.h> #include <openjpeg.h> diff --git a/ext/openjpeg/gstopenjpegenc.c b/ext/openjpeg/gstopenjpegenc.c index 24f08426f..841161586 100644 --- a/ext/openjpeg/gstopenjpegenc.c +++ b/ext/openjpeg/gstopenjpegenc.c @@ -24,6 +24,7 @@ #endif #include "gstopenjpegenc.h" +#include <gst/video/gstvideometa.h> GST_DEBUG_CATEGORY_STATIC (gst_openjpeg_enc_debug); #define GST_CAT_DEFAULT gst_openjpeg_enc_debug @@ -91,10 +92,10 @@ static gboolean gst_openjpeg_enc_propose_allocation (GstVideoEncoder * encoder, #if G_BYTE_ORDER == G_LITTLE_ENDIAN #define GRAY16 "GRAY16_LE" -#define YUV10 "Y444_10LE, I422_10LE, I420_10LE" +#define YUV10 "I422_10LE, I420_10LE" #else #define GRAY16 "GRAY16_BE" -#define YUV10 "Y444_10BE, I422_10BE, I420_10BE" +#define YUV10 "I422_10BE, I420_10BE" #endif static GstStaticPadTemplate gst_openjpeg_enc_sink_template = @@ -597,8 +598,6 @@ gst_openjpeg_enc_set_format (GstVideoEncoder * encoder, self->fill_image = fill_image_packed16_4; ncomps = 4; break; - case GST_VIDEO_FORMAT_Y444_10LE: - case GST_VIDEO_FORMAT_Y444_10BE: case GST_VIDEO_FORMAT_I422_10LE: case GST_VIDEO_FORMAT_I422_10BE: case GST_VIDEO_FORMAT_I420_10LE: diff --git a/ext/openjpeg/gstopenjpegenc.h b/ext/openjpeg/gstopenjpegenc.h index d1274b003..9df330b04 100644 --- a/ext/openjpeg/gstopenjpegenc.h +++ b/ext/openjpeg/gstopenjpegenc.h @@ -24,6 +24,7 @@ #include <gst/gst.h> #include <gst/video/video.h> +#include <gst/video/gstvideoencoder.h> #include <openjpeg.h> |