mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 18:52:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegaudioparse: fix up after merge

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-02-27 00:55:38 +00:00
parent 61d3a215a0
commit 4ba15ca5d2
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/audioparsers/gstmpegaudioparse.c
View file

@ -497,7 +497,7 @@ gst_mpeg_audio_parse_head_check (GstMpegAudioParse * mp3parse,
* If not enough data, returns FALSE. * If not enough data, returns FALSE.
*/ */
static gboolean static gboolean
gst_mp3parse_find_freerate (GstMpegAudioParse * mp3parse, GstBuffer * buf, gst_mp3parse_find_freerate (GstMpegAudioParse * mp3parse, GstMapInfo * map,
guint32 header, gboolean at_eos, gint * _rate) guint32 header, gboolean at_eos, gint * _rate)
{ {
guint32 next_header; guint32 next_header;
@ -508,8 +508,8 @@ gst_mp3parse_find_freerate (GstMpegAudioParse * mp3parse, GstBuffer * buf,
gboolean valid; gboolean valid;
gint lsf, mpg25; gint lsf, mpg25;
available = GST_BUFFER_SIZE (buf); available = map->size;
data = GST_BUFFER_DATA (buf); data = map->data;
*_rate = 0; *_rate = 0;
@ -665,9 +665,10 @@ gst_mpeg_audio_parse_handle_frame (GstBaseParse * parse,
GST_LOG_OBJECT (mp3parse, "possibly free format"); GST_LOG_OBJECT (mp3parse, "possibly free format");
if (lost_sync || mp3parse->freerate == 0) { if (lost_sync || mp3parse->freerate == 0) {
GST_DEBUG_OBJECT (mp3parse, "finding free format rate"); GST_DEBUG_OBJECT (mp3parse, "finding free format rate");
if (!gst_mp3parse_find_freerate (mp3parse, buf, header, draining, &valid)) { if (!gst_mp3parse_find_freerate (mp3parse, &map, header, draining,
&valid)) {
/* not enough data */ /* not enough data */
*framesize = G_MAXUINT; gst_base_parse_set_min_frame_size (parse, valid);
*skipsize = 0; *skipsize = 0;
return FALSE; return FALSE;
} else { } else {