summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2015-03-13 15:07:15 (GMT)
committerSebastian Dröge <sebastian@centricular.com>2015-05-04 07:34:29 (GMT)
commit8d41c3e3931aea6fd88cd527014b127eb8a7aab0 (patch)
treed844635df88d895cea9a8a2600ca270cf3de30de
parent0654442c8f56b268df0aeb314b26a85b6b93816c (diff)
downloadgst-plugins-bad-8d41c3e3931aea6fd88cd527014b127eb8a7aab0.tar.gz
gst-plugins-bad-8d41c3e3931aea6fd88cd527014b127eb8a7aab0.tar.xz
androidmedia: Add support for COLOR_FormatYUV420Flexible
https://bugzilla.gnome.org/show_bug.cgi?id=747126
-rw-r--r--sys/androidmedia/gstamc-constants.h1
-rw-r--r--sys/androidmedia/gstamc.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/androidmedia/gstamc-constants.h b/sys/androidmedia/gstamc-constants.h
index 4ea6443..dd139f5 100644
--- a/sys/androidmedia/gstamc-constants.h
+++ b/sys/androidmedia/gstamc-constants.h
@@ -102,6 +102,7 @@ enum
COLOR_QCOM_FormatYVU420SemiPlanar32m = 0x7fa30c04,
/* From hardware/ti/omap4xxx/domx/omx_core/inc/OMX_TI_IVCommon.h */
COLOR_TI_FormatYUV420PackedSemiPlanarInterlaced = 0x7f000001,
+ COLOR_FormatYUV420Flexible = 0x7f420888,
/* This format is Exynos specific from the OMX vendor-specific
* numeric range, but is defined in the Android OMX headers, so
* we shouldn't find incompatible usage and crash horribly... right?
diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c
index db78bf9..6555177 100644
--- a/sys/androidmedia/gstamc.c
+++ b/sys/androidmedia/gstamc.c
@@ -1775,6 +1775,7 @@ static const struct
} color_format_mapping_table[] = {
{
COLOR_FormatYUV420Planar, GST_VIDEO_FORMAT_I420}, {
+ COLOR_FormatYUV420Flexible, GST_VIDEO_FORMAT_I420}, {
COLOR_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
COLOR_TI_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
COLOR_TI_FormatYUV420PackedSemiPlanarInterlaced, GST_VIDEO_FORMAT_NV12}, {
@@ -1968,7 +1969,8 @@ gst_amc_color_format_info_set (GstAmcColorFormatInfo * color_format_info,
}
switch (color_format) {
- case COLOR_FormatYUV420Planar:{
+ case COLOR_FormatYUV420Planar:
+ case COLOR_FormatYUV420Flexible:{
if (stride == 0 || slice_height == 0) {
GST_ERROR ("Stride or slice height is 0");
return FALSE;