mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegaudioparse: Remove dead assignment and duplicate code

Browse source
This commit is contained in:
Edward Hervey 2009-04-21 20:17:57 +02:00
parent 29b34e049c
commit 8dcbcd6645
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -1026,7 +1026,6 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse)
if (xing_flags & XING_VBR_SCALE_FLAG) { if (xing_flags & XING_VBR_SCALE_FLAG) {
mp3parse->xing_vbr_scale = GST_READ_UINT32_BE (data); mp3parse->xing_vbr_scale = GST_READ_UINT32_BE (data);
data += 4;
} else } else
mp3parse->xing_vbr_scale = 0; mp3parse->xing_vbr_scale = 0;
@ -1102,7 +1101,6 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse)
data += 2; data += 2;
seek_frames = GST_READ_UINT16_BE (data); seek_frames = GST_READ_UINT16_BE (data);
data += 2;
if (scale == 0 || seek_bytes == 0 || seek_bytes > 4 || seek_frames == 0) { if (scale == 0 || seek_bytes == 0 || seek_bytes > 4 || seek_frames == 0) {
GST_WARNING_OBJECT (mp3parse, "Unsupported VBRI seek table"); GST_WARNING_OBJECT (mp3parse, "Unsupported VBRI seek table");

14
gst/mpegaudioparse/gstxingmux.c
View file

@ -119,7 +119,7 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf,
gulong * ret_rate) gulong * ret_rate)
{ {
guint length, spf; guint length, spf;
gulong mode, samplerate, bitrate, layer, channels, padding; gulong samplerate, bitrate, layer, padding;
gint lsf, mpg25; gint lsf, mpg25;
if ((header & 0xffe00000) != 0xffe00000) { if ((header & 0xffe00000) != 0xffe00000) {
@ -160,14 +160,6 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf,
mpg25 = 1; mpg25 = 1;
} }
if (header & (1 << 20)) {
lsf = (header & (1 << 19)) ? 0 : 1;
mpg25 = 0;
} else {
lsf = 1;
mpg25 = 1;
}
layer = 4 - ((header >> 17) & 0x3); layer = 4 - ((header >> 17) & 0x3);
bitrate = (header >> 12) & 0xF; bitrate = (header >> 12) & 0xF;
@ -180,9 +172,6 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf,
padding = (header >> 9) & 0x1; padding = (header >> 9) & 0x1;
mode = (header >> 6) & 0x3;
channels = (mode == 3) ? 1 : 2;
switch (layer) { switch (layer) {
case 1: case 1:
length = 4 * ((bitrate * 12) / samplerate + padding); length = 4 * ((bitrate * 12) / samplerate + padding);
@ -601,7 +590,6 @@ gst_xing_mux_sink_event (GstPad * pad, GstEvent * event)
gboolean result; gboolean result;
xing = GST_XING_MUX (gst_pad_get_parent (pad)); xing = GST_XING_MUX (gst_pad_get_parent (pad));
result = FALSE;
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_NEWSEGMENT: case GST_EVENT_NEWSEGMENT: