mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

flacdec: Improve debugging and add some FIXMEs

Browse source
This commit is contained in:
Sebastian Dröge 2010-03-26 14:55:53 +01:00
parent b139cad3aa
commit e9b267ae02
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/flac/gstflacdec.c
View file

@ -436,6 +436,10 @@ gst_flac_dec_scan_got_frame (GstFlacDec * flacdec, guint8 * data, guint size,
else if (sr == 0x0D || sr == 0x0E) else if (sr == 0x0D || sr == 0x0E)
sr_from_end = 16; sr_from_end = 16;
/* FIXME: This is can be 36 bit if variable block size is used,
* fortunately not encoder supports this yet and we check for that
* above.
*/
val = (guint32) g_utf8_get_char_validated ((gchar *) data + 4, -1); val = (guint32) g_utf8_get_char_validated ((gchar *) data + 4, -1);
if (val == (guint32) - 1 || val == (guint32) - 2) { if (val == (guint32) - 1 || val == (guint32) - 2) {
@ -446,16 +450,22 @@ gst_flac_dec_scan_got_frame (GstFlacDec * flacdec, guint8 * data, guint size,
headerlen = 4 + g_unichar_to_utf8 ((gunichar) val, NULL) + headerlen = 4 + g_unichar_to_utf8 ((gunichar) val, NULL) +
(bs_from_end / 8) + (sr_from_end / 8); (bs_from_end / 8) + (sr_from_end / 8);
if (gst_flac_calculate_crc8 (data, headerlen) != data[headerlen]) if (gst_flac_calculate_crc8 (data, headerlen) != data[headerlen]) {
GST_LOG_OBJECT (flacdec, "invalid checksum");
return FALSE; return FALSE;
}
if (flacdec->min_blocksize == flacdec->max_blocksize) { if (flacdec->min_blocksize == flacdec->max_blocksize) {
*last_sample_num = (val + 1) * flacdec->min_blocksize; *last_sample_num = (val + 1) * flacdec->min_blocksize;
} else { } else {
*last_sample_num = val; /* FIXME: + length of last block in samples */ *last_sample_num = 0; /* FIXME: + length of last block in samples */
} }
if (flacdec->sample_rate > 0) { /* FIXME: only valid for fixed block size streams */
GST_DEBUG_OBJECT (flacdec, "frame number: %" G_GINT64_FORMAT,
*last_sample_num);
if (flacdec->sample_rate > 0 && *last_sample_num != 0) {
GST_DEBUG_OBJECT (flacdec, "last sample %" G_GINT64_FORMAT " = %" GST_DEBUG_OBJECT (flacdec, "last sample %" G_GINT64_FORMAT " = %"
GST_TIME_FORMAT, *last_sample_num, GST_TIME_FORMAT, *last_sample_num,
GST_TIME_ARGS (*last_sample_num * GST_SECOND / flacdec->sample_rate)); GST_TIME_ARGS (*last_sample_num * GST_SECOND / flacdec->sample_rate));
@ -470,7 +480,6 @@ static void
gst_flac_dec_scan_for_last_block (GstFlacDec * flacdec, gint64 * samples) gst_flac_dec_scan_for_last_block (GstFlacDec * flacdec, gint64 * samples)
{ {
GstFormat format = GST_FORMAT_BYTES; GstFormat format = GST_FORMAT_BYTES;
gint64 file_size, offset; gint64 file_size, offset;
GST_INFO_OBJECT (flacdec, "total number of samples unknown, scanning file"); GST_INFO_OBJECT (flacdec, "total number of samples unknown, scanning file");
@ -480,6 +489,12 @@ gst_flac_dec_scan_for_last_block (GstFlacDec * flacdec, gint64 * samples)
return; return;
} }
if (flacdec->min_blocksize != flacdec->max_blocksize) {
GST_WARNING_OBJECT (flacdec, "scanning for last sample only works "
"for FLAC files with constant blocksize");
return;
}
GST_DEBUG_OBJECT (flacdec, "upstream size: %" G_GINT64_FORMAT, file_size); GST_DEBUG_OBJECT (flacdec, "upstream size: %" G_GINT64_FORMAT, file_size);
offset = file_size - 1; offset = file_size - 1;