mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

exiftag: handle GST_TAG_CAPTURING_FOCAL_LENGTH_35_MM tag

Browse source 
This tag match the EXIF_TAG_FOCAL_LENGTH_IN_35_MM_FILM exif tag and is
stored on a short. Hence there is a precision loss compared to the
GstTag which is a double value.

https://bugzilla.gnome.org/show_bug.cgi?id=753930
This commit is contained in:
Aurélien Zanelli 2015-08-21 10:40:33 +02:00 committed by Thiago Santos
parent c5a4a83828
commit 928bb3b6f4
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst-libs/gst/tag/gstexiftag.c
View file

@ -311,6 +311,7 @@ EXIF_DESERIALIZATION_FUNC (add_to_pending_tags);
#define EXIF_TAG_EXPOSURE_MODE 0xA402
#define EXIF_TAG_WHITE_BALANCE 0xA403
#define EXIF_TAG_DIGITAL_ZOOM_RATIO 0xA404
#define EXIF_TAG_FOCAL_LENGTH_IN_35_MM_FILM 0xa405
#define EXIF_TAG_SCENE_CAPTURE_TYPE 0xA406
#define EXIF_TAG_GAIN_CONTROL 0xA407
#define EXIF_TAG_CONTRAST 0xA408
@ -411,6 +412,8 @@ static const GstExifTagMatch tag_map_exif[] = {
{GST_TAG_CAPTURING_DIGITAL_ZOOM_RATIO, EXIF_TAG_DIGITAL_ZOOM_RATIO,
EXIF_TYPE_RATIONAL, 0, NULL,
NULL},
{GST_TAG_CAPTURING_FOCAL_LENGTH_35_MM, EXIF_TAG_FOCAL_LENGTH_IN_35_MM_FILM,
EXIF_TYPE_SHORT, 0, NULL, NULL},
{GST_TAG_CAPTURING_SCENE_CAPTURE_TYPE, EXIF_TAG_SCENE_CAPTURE_TYPE,
EXIF_TYPE_SHORT, 0, serialize_scene_capture_type,
deserialize_scene_capture_type},
@ -1048,6 +1051,9 @@ write_exif_integer_tag_from_taglist (GstExifWriter * writer,
case G_TYPE_INT:
num = g_value_get_int (value);
break;
case G_TYPE_DOUBLE:
num = (gint) g_value_get_double (value);
break;
default:
GST_WARNING ("Conversion from %s to int not supported",
G_VALUE_TYPE_NAME (value));
@ -1313,6 +1319,37 @@ parse_exif_ascii_tag (GstExifReader * reader, const GstExifTagMatch * tag,
g_free (utfstr);
}
static void
parse_exif_short_tag (GstExifReader * reader, const GstExifTagMatch * tag,
guint32 count, guint32 offset, const guint8 * offset_as_data)
{
GType tagtype;
guint16 value;
if (count > 1) {
GST_WARNING ("Short tags with more than one value are not supported");
return;
}
/* value is encoded into offset */
if (reader->byte_order == G_LITTLE_ENDIAN)
value = GST_READ_UINT16_LE (offset_as_data);
else
value = GST_READ_UINT16_BE (offset_as_data);
tagtype = gst_tag_get_type (tag->gst_tag);
if (tagtype == G_TYPE_INT) {
gst_tag_list_add (reader->taglist, GST_TAG_MERGE_REPLACE, tag->gst_tag,
value, NULL);
} else if (tagtype == G_TYPE_DOUBLE) {
gst_tag_list_add (reader->taglist, GST_TAG_MERGE_REPLACE, tag->gst_tag,
(gdouble) value, NULL);
} else {
GST_WARNING ("No parsing function associated to %x(%s)", tag->exif_tag,
tag->gst_tag);
}
}
static void
parse_exif_long_tag (GstExifReader * reader, const GstExifTagMatch * tag,
guint32 count, guint32 offset, const guint8 * offset_as_data)
@ -1763,6 +1800,10 @@ parse_exif_ifd (GstExifReader * exif_reader, gint buf_offset,
parse_exif_long_tag (exif_reader, &tag_map[map_index],
tagdata.count, tagdata.offset, tagdata.offset_as_data);
break;
case EXIF_TYPE_SHORT:
parse_exif_short_tag (exif_reader, &tag_map[map_index],
tagdata.count, tagdata.offset, tagdata.offset_as_data);
break;
default:
GST_WARNING ("Unhandled tag type: %u", tagdata.tag_type);
break;

4
tests/check/libs/tag.c
View file

@ -1775,6 +1775,10 @@ GST_START_TEST (test_exif_tags_serialization_deserialization)
g_value_set_double (&value, -2.5);
do_simple_exif_tag_serialization_deserialization
(GST_TAG_CAPTURING_EXPOSURE_COMPENSATION, &value);
g_value_set_double (&value, 50.0);
do_simple_exif_tag_serialization_deserialization
(GST_TAG_CAPTURING_FOCAL_LENGTH_35_MM, &value);
g_value_unset (&value);
g_value_init (&value, G_TYPE_INT);