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

tag: exif: Refactor byte-order handling

Browse source 
Only check for valid byte-order values when creating the
exif readers and writers
This commit is contained in:
Thiago Santos 2010-06-09 15:58:32 -03:00
parent 491d025530
commit ccfb6e3c02
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -201,6 +201,12 @@ gst_exif_reader_init (GstExifReader * reader, gint byte_order,
reader->buffer = buf; reader->buffer = buf;
reader->base_offset = base_offset; reader->base_offset = base_offset;
reader->byte_order = byte_order; reader->byte_order = byte_order;
if (reader->byte_order != G_LITTLE_ENDIAN &&
reader->byte_order != G_BIG_ENDIAN) {
GST_WARNING ("Unexpected byte order %d, using system default: %d",
reader->byte_order, G_BYTE_ORDER);
reader->byte_order = G_BYTE_ORDER;
}
} }
/* GstExifWriter functions */ /* GstExifWriter functions */
@ -213,6 +219,12 @@ gst_exif_writer_init (GstExifWriter * writer, gint byte_order)
writer->byte_order = byte_order; writer->byte_order = byte_order;
writer->tags_total = 0; writer->tags_total = 0;
if (writer->byte_order != G_LITTLE_ENDIAN &&
writer->byte_order != G_BIG_ENDIAN) {
GST_WARNING ("Unexpected byte order %d, using system default: %d",
writer->byte_order, G_BYTE_ORDER);
writer->byte_order = G_BYTE_ORDER;
}
} }
static GstBuffer * static GstBuffer *
@ -474,16 +486,13 @@ gst_exif_tag_rewrite_offsets (GstExifWriter * writer, guint32 base_offset)
break; break;
if (!gst_byte_reader_get_uint32_le (reader, &count)) if (!gst_byte_reader_get_uint32_le (reader, &count))
break; break;
} else if (writer->byte_order == G_BIG_ENDIAN) { } else {
if (!gst_byte_reader_get_uint16_be (reader, &tag_id)) if (!gst_byte_reader_get_uint16_be (reader, &tag_id))
break; break;
if (!gst_byte_reader_get_uint16_be (reader, &type)) if (!gst_byte_reader_get_uint16_be (reader, &type))
break; break;
if (!gst_byte_reader_get_uint32_be (reader, &count)) if (!gst_byte_reader_get_uint32_be (reader, &count))
break; break;
} else {
GST_WARNING ("Unexpected endianness");
break;
} }
switch (type) { switch (type) {
@ -515,13 +524,11 @@ gst_exif_tag_rewrite_offsets (GstExifWriter * writer, guint32 base_offset)
gst_byte_writer_put_uint32_le (&writer->tagwriter, gst_byte_writer_put_uint32_le (&writer->tagwriter,
cur_offset + offset + base_offset); cur_offset + offset + base_offset);
} }
} else if (writer->byte_order == G_BIG_ENDIAN) { } else {
if (gst_byte_reader_peek_uint32_be (reader, &cur_offset)) { if (gst_byte_reader_peek_uint32_be (reader, &cur_offset)) {
gst_byte_writer_put_uint32_be (&writer->tagwriter, gst_byte_writer_put_uint32_be (&writer->tagwriter,
cur_offset + offset + base_offset); cur_offset + offset + base_offset);
} }
} else {
GST_WARNING ("Unexpected endianness");
} }
GST_DEBUG ("Rewriting tag offset from %u to (%u + %u + %u) %u", GST_DEBUG ("Rewriting tag offset from %u to (%u + %u + %u) %u",
cur_offset, cur_offset, offset, base_offset, cur_offset, cur_offset, offset, base_offset,