Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'mer1976' into 'master'
[photo] Drop unneeded ASD mode definition. MER#1976

See merge request mer-core/gst-plugins-bad!12
  • Loading branch information
Andrew Branson committed Nov 28, 2018
2 parents 8bba100 + 9d83171 commit ce4fca2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions rpm/0006-jifmux-cope-with-missing-EOI-marker.patch
Expand Up @@ -12,23 +12,23 @@ diff --git a/gst/jpegformat/gstjifmux.c b/gst/jpegformat/gstjifmux.c
index 28638b7..4c66591 100644
--- a/gst/jpegformat/gstjifmux.c
+++ b/gst/jpegformat/gstjifmux.c
@@ -328,6 +328,7 @@ gst_jif_mux_parse_image (GstJifMux * self, GstBuffer * buf)
@@ -327,6 +327,7 @@ gst_jif_mux_parse_image (GstJifMux * self, GstBuffer * buf)

if (marker == SOS) {
gint eoi_pos = -1;
+ gboolean eoi_found = FALSE;
gint i;

/* search the last 5 bytes for the EOI marker */
@@ -335,6 +336,7 @@ gst_jif_mux_parse_image (GstJifMux * self, GstBuffer * buf)
@@ -334,6 +335,7 @@ gst_jif_mux_parse_image (GstJifMux * self, GstBuffer * buf)
for (i = 5; i >= 2; i--) {
if (map.data[map.size - i] == 0xFF && map.data[map.size - i + 1] == EOI) {
eoi_pos = map.size - i;
+ eoi_found = TRUE;
break;
}
}
@@ -350,6 +352,10 @@ gst_jif_mux_parse_image (GstJifMux * self, GstBuffer * buf)
@@ -349,6 +351,10 @@ gst_jif_mux_parse_image (GstJifMux * self, GstBuffer * buf)
goto error;

GST_DEBUG_OBJECT (self, "scan data, size = %u", self->priv->scan_size);
Expand Down
6 changes: 2 additions & 4 deletions rpm/0007-Add-colour-tone-and-scene-modes.patch
Expand Up @@ -30,11 +30,10 @@ index 0475d71..0720d6d 100644
} GstPhotographyColorToneMode;

/**
@@ -264,6 +271,12 @@
@@ -264,6 +271,11 @@
* 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.?)
Expand All @@ -43,13 +42,12 @@ index 0475d71..0720d6d 100644
*
* Each mode contains preset #GstPhotography options in order to produce
* good capturing result in certain scene.
@@ -287,7 +300,12 @@
@@ -287,7 +300,11 @@
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,
Expand Down

0 comments on commit ce4fca2

Please sign in to comment.