mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/theora/theoradec.c: Fix ilog mask range overflow.

Browse source 
Original commit message from CVS:
* ext/theora/theoradec.c: (theora_dec_chain):
Fix ilog mask range overflow.
This commit is contained in:
Ronald S. Bultje 2004-11-26 12:25:44 +00:00
parent e71527d6d9
commit f74ad551ef
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-11-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/theora/theoradec.c: (theora_dec_chain):
Fix ilog mask range overflow.
2004-11-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-11-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsa.c: (gst_alsa_get_caps): * ext/alsa/gstalsa.c: (gst_alsa_get_caps):

41
ext/theora/theoradec.c
View file

@ -543,7 +543,6 @@ theora_dec_chain (GstPad * pad, GstData * data)
/* granulepos to time */ /* granulepos to time */
outtime = GST_SECOND * theora_granule_time (&dec->state, dec->granulepos); outtime = GST_SECOND * theora_granule_time (&dec->state, dec->granulepos);
dec->granulepos++;
} else { } else {
/* we don't know yet */ /* we don't know yet */
outtime = -1; outtime = -1;
@ -564,15 +563,13 @@ theora_dec_chain (GstPad * pad, GstData * data)
if (packet.packet[0] & 0x80) { if (packet.packet[0] & 0x80) {
if (packet.packetno > 3) { if (packet.packetno > 3) {
GST_WARNING_OBJECT (GST_OBJECT (dec), "Ignoring header"); GST_WARNING_OBJECT (GST_OBJECT (dec), "Ignoring header");
gst_data_unref (data); goto done;
return;
} }
/* header packet */ /* header packet */
if (theora_decode_header (&dec->info, &dec->comment, &packet)) { if (theora_decode_header (&dec->info, &dec->comment, &packet)) {
GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE, GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
(NULL), ("couldn't read header packet")); (NULL), ("couldn't read header packet"));
gst_data_unref (data); goto done;
return;
} }
if (packet.packetno == 0) { if (packet.packetno == 0) {
@ -678,32 +675,48 @@ theora_dec_chain (GstPad * pad, GstData * data)
dec->packetno++; dec->packetno++;
if (!dec->initialized) { if (!dec->initialized) {
gst_data_unref (data); goto done;
return;
} }
/* the second most significant bit of the first data byte is cleared /* the second most significant bit of the first data byte is cleared
* for keyframes */ * for keyframes */
keyframe = (packet.packet[0] & 0x40) == 0; keyframe = (packet.packet[0] & 0x40) == 0;
if (keyframe) { if (keyframe) {
guint ilog;
guint64 framecount;
gboolean add_one = FALSE;
dec->need_keyframe = FALSE; dec->need_keyframe = FALSE;
ilog = _theora_ilog (dec->info.keyframe_frequency_force - 1);
if (dec->granulepos % (1 << ilog) == 0 &&
dec->granulepos > 0 && GST_BUFFER_OFFSET_END (buf) == -1) {
dec->granulepos--;
add_one = TRUE;
}
framecount = dec->granulepos >> ilog;
framecount += dec->granulepos - (framecount << ilog);
if (add_one) {
framecount++;
}
dec->granulepos = framecount << ilog;
if (add_one) {
outtime = GST_SECOND * theora_granule_time (&dec->state,
dec->granulepos);
}
} else if (dec->need_keyframe) { } else if (dec->need_keyframe) {
GST_WARNING_OBJECT (dec, "dropping frame because we need a keyframe"); GST_WARNING_OBJECT (dec, "dropping frame because we need a keyframe");
/* drop frames if we're looking for a keyframe */ /* drop frames if we're looking for a keyframe */
gst_data_unref (data); goto done;
return;
} }
if (theora_decode_packetin (&dec->state, &packet)) { if (theora_decode_packetin (&dec->state, &packet)) {
GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE, GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
(NULL), ("theora decoder did not read data packet")); (NULL), ("theora decoder did not read data packet"));
gst_data_unref (data); goto done;
return;
} }
if (theora_decode_YUVout (&dec->state, &yuv) < 0) { if (theora_decode_YUVout (&dec->state, &yuv) < 0) {
GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE, GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
(NULL), ("couldn't read out YUV image")); (NULL), ("couldn't read out YUV image"));
gst_data_unref (data); goto done;
return;
} }
g_return_if_fail (yuv.y_width == dec->info.width); g_return_if_fail (yuv.y_width == dec->info.width);
@ -774,7 +787,9 @@ theora_dec_chain (GstPad * pad, GstData * data)
gst_pad_push (dec->srcpad, GST_DATA (out)); gst_pad_push (dec->srcpad, GST_DATA (out));
} }
done:
gst_data_unref (data); gst_data_unref (data);
dec->granulepos++;
} }
static GstElementStateReturn static GstElementStateReturn