Merge branch 'android-color-modes' into 'master'

Android color modes

See merge request mer-core/gst-plugins-bad!10

rpm/0007-Add-android-color-tone-modes.patch

@@ -0,0 +1,36 @@
+diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/photography.h
+index 0475d71aa..5352ba868 100644
+--- a/gst-libs/gst/interfaces/photography.h
++++ b/gst-libs/gst/interfaces/photography.h
+@@ -25,7 +25,7 @@
+
+ #ifndef GST_USE_UNSTABLE_API
+ #warning "The GstPhotography interface is unstable API and may change in future."
+-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning." 
++#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+ #endif
+
+ #include <gst/gst.h>
+@@ -215,6 +215,10 @@ typedef enum
+  * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_WHITEBOARD: Whiteboard (Since 1.2)
+  * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_BLACKBOARD: Blackboard (Since 1.2)
+  * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA: Aqua (Since 1.2)
++ * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_EMBOSS: Aqua (Since 1.?)
++ * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKETCH: Aqua (Since 1.?)
++ * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEON: Aqua (Since 1.?)
++ *
+  *
+  * Modes for special color effects.
+  */
+@@ -235,7 +239,10 @@ typedef enum
+   GST_PHOTOGRAPHY_COLOR_TONE_MODE_POSTERIZE,
+   GST_PHOTOGRAPHY_COLOR_TONE_MODE_WHITEBOARD,
+   GST_PHOTOGRAPHY_COLOR_TONE_MODE_BLACKBOARD,
+-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA
++  GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA,
++  GST_PHOTOGRAPHY_COLOR_TONE_MODE_EMBOSS,
++  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKETCH,
++  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEON
+ } GstPhotographyColorToneMode;
+
+ /**

rpm/0008-Add-android-scene-modes.patch

@@ -0,0 +1,31 @@
+diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/photography.h
+index 0475d71aa..56537cb0b 100644
+--- a/gst-libs/gst/interfaces/photography.h
++++ b/gst-libs/gst/interfaces/photography.h
+@@ -264,6 +264,12 @@ typedef enum
+  *     of scenes lit by candles (Since 1.2)
+  * @GST_PHOTOGRAPHY_SCENE_MODE_BARCODE: Applications are looking for
+  *     a barcode (Since 1.2)
++ * @GST_PHOTOGRAPHY_SCENE_MODE_ASD: Automatic Scene Detection (Since 1.?)
++ * @GST_PHOTOGRAPHY_SCENE_MODE_BACKLIGHT: Backlit photos (Since 1.?)
++ * @GST_PHOTOGRAPHY_SCENE_MODE_FLOWERS: For shooting flowers (Since 1.?)
++ * @GST_PHOTOGRAPHY_SCENE_MODE_AR: Specific for Augmented Reality (Since 1.?)
++ * @GST_PHOTOGRAPHY_SCENE_MODE_HDR: High Dynamic Range photography (Since 1.?)
++ *
+  *
+  * Each mode contains preset #GstPhotography options in order to produce
+  * good capturing result in certain scene.
+@@ -287,7 +293,12 @@ typedef enum
+   GST_PHOTOGRAPHY_SCENE_MODE_FIREWORKS,
+   GST_PHOTOGRAPHY_SCENE_MODE_PARTY,
+   GST_PHOTOGRAPHY_SCENE_MODE_CANDLELIGHT,
+-  GST_PHOTOGRAPHY_SCENE_MODE_BARCODE
++  GST_PHOTOGRAPHY_SCENE_MODE_BARCODE,
++  GST_PHOTOGRAPHY_SCENE_MODE_ASD,
++  GST_PHOTOGRAPHY_SCENE_MODE_BACKLIGHT,
++  GST_PHOTOGRAPHY_SCENE_MODE_FLOWERS,
++  GST_PHOTOGRAPHY_SCENE_MODE_AR,
++  GST_PHOTOGRAPHY_SCENE_MODE_HDR
+ } GstPhotographySceneMode;
+
+ /**

rpm/gst-plugins-bad.spec

@@ -15,6 +15,8 @@ Patch3:      0003-photography-add-missing-vmethods.patch
 Patch4:      0004-camerabin-install-GST_PHOTOGRAPHY_PROP_EXPOSURE_MODE.patch
 Patch5:      0005-Downgrade-mpeg4videoparse-to-prevent-it-from-being-p.patch
 Patch6:      0006-jifmux-cope-with-missing-EOI-marker.patch
+Patch7:      0007-Add-android-color-tone-modes.patch
+Patch8:      0008-Add-android-scene-modes.patch
 
 %define sonamever %(echo %{version} | cut -d '+' -f 1)
 
@@ -65,6 +67,7 @@ are not tested well enough, or the code is not of good enough quality.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -103,7 +106,7 @@ NOCONFIGURE=1 ./autogen.sh
   --disable-decklink --disable-accurip --disable-audiofxbad --disable-ivtc \
   --disable-midi --disable-yadif --disable-mpegtsmux \
   --disable-accurip --disable-autoconvert --disable-gdp \
-  --disable-qt --disable-curl --disable-bz2 --disable-dash --disable-smoothstreaming 
+  --disable-qt --disable-curl --disable-bz2 --disable-dash --disable-smoothstreaming
 
 make %{?jobs:-j%jobs}