mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpeg: Fixup frames without an EOI marker

Browse source 
Some cameras fail to send an end-of-image marker (EOI)
and can't be properly decoded by either JPEG or libjpeg.

This commit parses the frame, making sure it has an EOI.
If there isn't one, the EOI gets added to the buffer.

A similar fixup is done in the rtpjpegdepay element,
and it makes sense to do it in jpegdec as well.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

https://bugzilla.gnome.org/show_bug.cgi?id=791988
This commit is contained in:
Ezequiel Garcia 2017-09-28 18:00:38 -03:00 committed by Mathieu Duponchelle
parent 7d97bf2f81
commit 10ff3c8e14
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ext/jpeg/gstjpegdec.c
View file

@ -376,11 +376,13 @@ gst_jpeg_dec_parse (GstVideoDecoder * bdec, GstVideoCodecFrame * frame,
goto have_full_frame; goto have_full_frame;
} }
if (value == 0xd8) { if (value == 0xd8) {
/* Skip this frame if we found another SOI marker */ GST_DEBUG ("0x%08x: SOI marker before EOI marker", offset + 2);
GST_DEBUG ("0x%08x: SOI marker before EOI, skipping", offset + 2);
/* clear parse state */
dec->saw_header = FALSE;
dec->parse_resync = FALSE; dec->parse_resync = FALSE;
size = offset + 2; toadd = offset;
goto drop_frame; goto have_full_frame;
} }
@ -1192,10 +1194,38 @@ gst_jpeg_dec_handle_frame (GstVideoDecoder * bdec, GstVideoCodecFrame * frame)
gboolean need_unmap = TRUE; gboolean need_unmap = TRUE;
GstVideoCodecState *state = NULL; GstVideoCodecState *state = NULL;
gboolean release_frame = TRUE; gboolean release_frame = TRUE;
gboolean has_eoi;
guint8 *data;
gsize nbytes;
dec->current_frame = frame;
gst_buffer_map (frame->input_buffer, &dec->current_frame_map, GST_MAP_READ); gst_buffer_map (frame->input_buffer, &dec->current_frame_map, GST_MAP_READ);
data = dec->current_frame_map.data;
nbytes = dec->current_frame_map.size;
has_eoi = ((data[nbytes - 2] != 0xff) || (data[nbytes - 1] != 0xd9));
/* some cameras fail to send an end-of-image marker (EOI),
* add it if that is the case. */
if (!has_eoi) {
GstMapInfo map;
GstBuffer *eoibuf = gst_buffer_new_and_alloc (2);
/* unmap, will add EOI and remap at the end */
gst_buffer_unmap (frame->input_buffer, &dec->current_frame_map);
gst_buffer_map (eoibuf, &map, GST_MAP_WRITE);
map.data[0] = 0xff;
map.data[1] = 0xd9;
gst_buffer_unmap (eoibuf, &map);
/* append to input buffer, and remap */
frame->input_buffer = gst_buffer_append (frame->input_buffer, eoibuf);
gst_buffer_map (frame->input_buffer, &dec->current_frame_map, GST_MAP_READ);
GST_DEBUG ("fixup EOI marker added");
}
dec->current_frame = frame;
dec->cinfo.src->next_input_byte = dec->current_frame_map.data; dec->cinfo.src->next_input_byte = dec->current_frame_map.data;
dec->cinfo.src->bytes_in_buffer = dec->current_frame_map.size; dec->cinfo.src->bytes_in_buffer = dec->current_frame_map.size;