From 8dcbcd6645751ae520ecf54bae0a83bc61d02997 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 21 Apr 2009 20:17:57 +0200 Subject: [PATCH] mpegaudioparse: Remove dead assignment and duplicate code --- gst/mpegaudioparse/gstmpegaudioparse.c | 2 -- gst/mpegaudioparse/gstxingmux.c | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 1d5d1fac8c..c162513251 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -1026,7 +1026,6 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse) if (xing_flags & XING_VBR_SCALE_FLAG) { mp3parse->xing_vbr_scale = GST_READ_UINT32_BE (data); - data += 4; } else mp3parse->xing_vbr_scale = 0; @@ -1102,7 +1101,6 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse) data += 2; seek_frames = GST_READ_UINT16_BE (data); - data += 2; if (scale == 0 || seek_bytes == 0 || seek_bytes > 4 || seek_frames == 0) { GST_WARNING_OBJECT (mp3parse, "Unsupported VBRI seek table"); diff --git a/gst/mpegaudioparse/gstxingmux.c b/gst/mpegaudioparse/gstxingmux.c index 58c0860ba5..9b852f809d 100644 --- a/gst/mpegaudioparse/gstxingmux.c +++ b/gst/mpegaudioparse/gstxingmux.c @@ -119,7 +119,7 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf, gulong * ret_rate) { guint length, spf; - gulong mode, samplerate, bitrate, layer, channels, padding; + gulong samplerate, bitrate, layer, padding; gint lsf, mpg25; if ((header & 0xffe00000) != 0xffe00000) { @@ -160,14 +160,6 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf, mpg25 = 1; } - if (header & (1 << 20)) { - lsf = (header & (1 << 19)) ? 0 : 1; - mpg25 = 0; - } else { - lsf = 1; - mpg25 = 1; - } - layer = 4 - ((header >> 17) & 0x3); bitrate = (header >> 12) & 0xF; @@ -180,9 +172,6 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf, padding = (header >> 9) & 0x1; - mode = (header >> 6) & 0x3; - channels = (mode == 3) ? 1 : 2; - switch (layer) { case 1: length = 4 * ((bitrate * 12) / samplerate + padding); @@ -601,7 +590,6 @@ gst_xing_mux_sink_event (GstPad * pad, GstEvent * event) gboolean result; xing = GST_XING_MUX (gst_pad_get_parent (pad)); - result = FALSE; switch (GST_EVENT_TYPE (event)) { case GST_EVENT_NEWSEGMENT: