mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 03:56:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

sbc: Fix gtreamer payloader sending fragmented frames.

Browse source
This commit is contained in:
Luiz Augusto von Dentz 2008-01-24 14:25:29 +00:00 committed by Tim-Philipp Müller
parent 84dcb6bb34
commit ad24bafb62
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/sbc/gstsbcutil.c
View file

@ -107,8 +107,8 @@ gst_sbc_get_mode_from_list (const GValue * list)
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
value = gst_value_list_get_value (list, i); value = gst_value_list_get_value (list, i);
aux = g_value_get_string (value); aux = g_value_get_string (value);
if (strcmp ("stereo", aux) == 0) { if (strcmp ("joint", aux) == 0) {
return "stereo"; return "joint";
} }
} }
return g_value_get_string (gst_value_list_get_value (list, size - 1)); return g_value_get_string (gst_value_list_get_value (list, size - 1));
@ -144,6 +144,20 @@ gst_sbc_get_mode_int (const gchar * mode)
return -1; return -1;
} }
/* FIXME add dual when sbc_t supports it */
gboolean
gst_sbc_get_mode_int_for_sbc_t (const gchar * mode)
{
if (g_ascii_strcasecmp (mode, "joint") == 0)
return TRUE;
else if (g_ascii_strcasecmp (mode, "stereo") == 0)
return FALSE;
else if (g_ascii_strcasecmp (mode, "mono") == 0)
return FALSE;
else
return -1;
}
const gchar * const gchar *
gst_sbc_get_mode_string (int joint) gst_sbc_get_mode_string (int joint)
{ {
@ -195,6 +209,8 @@ gst_sbc_get_mode_string_from_sbc_t (int channels, int joint)
return "joint"; return "joint";
else if (channels == 2 && joint == 0) else if (channels == 2 && joint == 0)
return "stereo"; return "stereo";
else if (channels == 1 && joint == 0)
return "mono";
else else
return NULL; return NULL;
} }
@ -446,7 +462,7 @@ gst_sbc_util_fill_sbc_params (sbc_t * sbc, GstCaps * caps)
sbc->blocks = blocks; sbc->blocks = blocks;
sbc->subbands = subbands; sbc->subbands = subbands;
sbc->bitpool = bitpool; sbc->bitpool = bitpool;
sbc->joint = gst_sbc_get_mode_int (mode); sbc->joint = gst_sbc_get_mode_int_for_sbc_t (mode);
sbc->allocation = gst_sbc_get_allocation_mode_int (allocation); sbc->allocation = gst_sbc_get_allocation_mode_int (allocation);
return TRUE; return TRUE;