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

speexdec: silence warning message when appropriate

Browse source 
If we did not know how many frames to expect, then we get an unexpected
end of stream when trying to decode more frames that are there, if there
are leftover bits to pad to the next byte
This commit is contained in:
Vincent Penquerc'h 2011-03-15 19:36:01 +02:00 committed by Sebastian Dröge
parent a3ed3d9374
commit 56edbd0fa3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/speex/gstspeexdec.c
View file

@ -665,7 +665,8 @@ speex_dec_chain_parse_data (GstSpeexDec * dec, GstBuffer * buf,
fpp = dec->header->frames_per_packet; fpp = dec->header->frames_per_packet;
bits = &dec->bits; bits = &dec->bits;
GST_DEBUG_OBJECT (dec, "received buffer of size %u, fpp %d", size, fpp); GST_DEBUG_OBJECT (dec, "received buffer of size %u, fpp %d, %d bits", size,
fpp, speex_bits_remaining (bits));
} else { } else {
/* concealment data, pass NULL as the bits parameters */ /* concealment data, pass NULL as the bits parameters */
GST_DEBUG_OBJECT (dec, "creating concealment data"); GST_DEBUG_OBJECT (dec, "creating concealment data");
@ -680,7 +681,8 @@ speex_dec_chain_parse_data (GstSpeexDec * dec, GstBuffer * buf,
gint16 *out_data; gint16 *out_data;
gint ret; gint ret;
GST_LOG_OBJECT (dec, "decoding frame %d/%d", i, fpp); GST_LOG_OBJECT (dec, "decoding frame %d/%d, %d bits remaining", i, fpp,
bits ? speex_bits_remaining (bits) : -1);
res = gst_pad_alloc_buffer_and_set_caps (dec->srcpad, res = gst_pad_alloc_buffer_and_set_caps (dec->srcpad,
GST_BUFFER_OFFSET_NONE, dec->frame_size * dec->header->nb_channels * 2, GST_BUFFER_OFFSET_NONE, dec->frame_size * dec->header->nb_channels * 2,
@ -696,7 +698,12 @@ speex_dec_chain_parse_data (GstSpeexDec * dec, GstBuffer * buf,
ret = speex_decode_int (dec->state, bits, out_data); ret = speex_decode_int (dec->state, bits, out_data);
if (ret == -1) { if (ret == -1) {
/* uh? end of stream */ /* uh? end of stream */
if (fpp == 0 && speex_bits_remaining (bits) < 8) {
/* if we did not know how many frames to expect, then we get this
at the end if there are leftover bits to pad to the next byte */
} else {
GST_WARNING_OBJECT (dec, "Unexpected end of stream found"); GST_WARNING_OBJECT (dec, "Unexpected end of stream found");
}
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
outbuf = NULL; outbuf = NULL;
break; break;