mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 07:08:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

visual: port some more to new audio caps

Browse source
This commit is contained in:
Wim Taymans 2011-08-19 16:49:30 +02:00
parent 5e90085ca2
commit 34a94ddd6b
2 changed files with 57 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/libvisual/Makefile.am
View file

@ -2,7 +2,9 @@ plugin_LTLIBRARIES = libgstlibvisual.la
libgstlibvisual_la_SOURCES = visual.c libgstlibvisual_la_SOURCES = visual.c
libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
libgstlibvisual_la_LIBADD = $(GST_BASE_LIBS) $(LIBVISUAL_LIBS) libgstlibvisual_la_LIBADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_MAJORMINOR).la \
$(GST_BASE_LIBS) $(LIBVISUAL_LIBS)
libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static

96
ext/libvisual/visual.c
View file

@ -63,9 +63,7 @@ struct _GstVisual
VisActor *actor; VisActor *actor;
/* audio/video state */ /* audio/video state */
gint channels; GstAudioInfo info;
gint rate; /* Input samplerate */
gint bps;
/* framerate numerator & denominator */ /* framerate numerator & denominator */
gint fps_n; gint fps_n;
@ -113,11 +111,9 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw, "
"width = (int) 16, " "format = (string) " GST_AUDIO_NE (S16) ", "
"depth = (int) 16, " "channels = (int) { 1, 2 }, "
"endianness = (int) BYTE_ORDER, "
"signed = (boolean) TRUE, " "channels = (int) { 1, 2 }, "
#if defined(VISUAL_API_VERSION) && VISUAL_API_VERSION >= 4000 && VISUAL_API_VERSION < 5000 #if defined(VISUAL_API_VERSION) && VISUAL_API_VERSION >= 4000 && VISUAL_API_VERSION < 5000
"rate = (int) { 8000, 11250, 22500, 32000, 44100, 48000, 96000 }" "rate = (int) { 8000, 11250, 22500, 32000, 44100, 48000, 96000 }"
#else #else
@ -333,7 +329,7 @@ gst_visual_src_setcaps (GstVisual * visual, GstCaps * caps)
{ {
gboolean res; gboolean res;
GstStructure *structure; GstStructure *structure;
gint depth, pitch; gint depth, pitch, rate;
const gchar *fmt; const gchar *fmt;
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
@ -364,10 +360,11 @@ gst_visual_src_setcaps (GstVisual * visual, GstCaps * caps)
visual_video_set_pitch (visual->video, pitch); visual_video_set_pitch (visual->video, pitch);
visual_actor_video_negotiate (visual->actor, 0, FALSE, FALSE); visual_actor_video_negotiate (visual->actor, 0, FALSE, FALSE);
rate = GST_AUDIO_INFO_RATE (&visual->info);
/* precalc some values */ /* precalc some values */
visual->outsize = visual->video->height * pitch; visual->outsize = visual->video->height * pitch;
visual->spf = visual->spf = gst_util_uint64_scale_int (rate, visual->fps_d, visual->fps_n);
gst_util_uint64_scale_int (visual->rate, visual->fps_d, visual->fps_n);
visual->duration = visual->duration =
gst_util_uint64_scale_int (GST_SECOND, visual->fps_d, visual->fps_n); gst_util_uint64_scale_int (GST_SECOND, visual->fps_d, visual->fps_n);
@ -387,23 +384,34 @@ static gboolean
gst_visual_sink_setcaps (GstPad * pad, GstCaps * caps) gst_visual_sink_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstVisual *visual = GST_VISUAL (gst_pad_get_parent (pad)); GstVisual *visual = GST_VISUAL (gst_pad_get_parent (pad));
GstStructure *structure; GstAudioInfo info;
gint rate;
structure = gst_caps_get_structure (caps, 0); if (!gst_audio_info_from_caps (&info, caps))
goto invalid_caps;
gst_structure_get_int (structure, "channels", &visual->channels); visual->info = info;
gst_structure_get_int (structure, "rate", &visual->rate);
rate = GST_AUDIO_INFO_RATE (&info);
/* this is how many samples we need to fill one frame at the requested /* this is how many samples we need to fill one frame at the requested
* framerate. */ * framerate. */
if (visual->fps_n != 0) { if (visual->fps_n != 0) {
visual->spf = visual->spf =
gst_util_uint64_scale_int (visual->rate, visual->fps_d, visual->fps_n); gst_util_uint64_scale_int (rate, visual->fps_d, visual->fps_n);
} }
visual->bps = visual->channels * sizeof (gint16);
gst_object_unref (visual); gst_object_unref (visual);
return TRUE; return TRUE;
/* ERRORS */
invalid_caps:
{
GST_ERROR_OBJECT (visual, "invalid caps received");
gst_object_unref (visual);
return FALSE;
}
} }
static gboolean static gboolean
@ -441,7 +449,6 @@ gst_vis_src_negotiate (GstVisual * visual)
* 320x240x25 by convention. */ * 320x240x25 by convention. */
structure = gst_caps_get_structure (target, 0); structure = gst_caps_get_structure (target, 0);
gst_structure_fixate_field_nearest_int (structure, "width", DEFAULT_WIDTH); gst_structure_fixate_field_nearest_int (structure, "width", DEFAULT_WIDTH);
gst_structure_fixate_field_nearest_int (structure, "width", DEFAULT_WIDTH);
gst_structure_fixate_field_nearest_int (structure, "height", DEFAULT_HEIGHT); gst_structure_fixate_field_nearest_int (structure, "height", DEFAULT_HEIGHT);
gst_structure_fixate_field_nearest_fraction (structure, "framerate", gst_structure_fixate_field_nearest_fraction (structure, "framerate",
DEFAULT_FPS_N, DEFAULT_FPS_D); DEFAULT_FPS_N, DEFAULT_FPS_D);
@ -620,7 +627,8 @@ gst_visual_src_query (GstPad * pad, GstQuery * query)
/* the max samples we must buffer buffer */ /* the max samples we must buffer buffer */
max_samples = MAX (VISUAL_SAMPLES, visual->spf); max_samples = MAX (VISUAL_SAMPLES, visual->spf);
our_latency = our_latency =
gst_util_uint64_scale_int (max_samples, GST_SECOND, visual->rate); gst_util_uint64_scale_int (max_samples, GST_SECOND,
GST_AUDIO_INFO_RATE (&visual->info));
GST_DEBUG_OBJECT (visual, "Our latency: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (visual, "Our latency: %" GST_TIME_FORMAT,
GST_TIME_ARGS (our_latency)); GST_TIME_ARGS (our_latency));
@ -676,6 +684,7 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
GstVisual *visual = GST_VISUAL (gst_pad_get_parent (pad)); GstVisual *visual = GST_VISUAL (gst_pad_get_parent (pad));
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
guint avail; guint avail;
gint bpf, rate, channels;
GST_DEBUG_OBJECT (visual, "chain function called"); GST_DEBUG_OBJECT (visual, "chain function called");
@ -691,10 +700,13 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
gst_adapter_clear (visual->adapter); gst_adapter_clear (visual->adapter);
} }
rate = GST_AUDIO_INFO_RATE (&visual->info);
bpf = GST_AUDIO_INFO_BPF (&visual->info);
channels = GST_AUDIO_INFO_CHANNELS (&visual->info);
GST_DEBUG_OBJECT (visual, GST_DEBUG_OBJECT (visual,
"Input buffer has %d samples, time=%" G_GUINT64_FORMAT, "Input buffer has %d samples, time=%" G_GUINT64_FORMAT,
gst_buffer_get_size (buffer) / visual->bps, gst_buffer_get_size (buffer) / bpf, GST_BUFFER_TIMESTAMP (buffer));
GST_BUFFER_TIMESTAMP (buffer));
gst_adapter_push (visual->adapter, buffer); gst_adapter_push (visual->adapter, buffer);
@ -711,19 +723,19 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
GST_DEBUG_OBJECT (visual, "avail now %u", avail); GST_DEBUG_OBJECT (visual, "avail now %u", avail);
/* we need at least VISUAL_SAMPLES samples */ /* we need at least VISUAL_SAMPLES samples */
if (avail < VISUAL_SAMPLES * visual->bps) if (avail < VISUAL_SAMPLES * bpf)
break; break;
/* we need at least enough samples to make one frame */ /* we need at least enough samples to make one frame */
if (avail < visual->spf * visual->bps) if (avail < visual->spf * bpf)
break; break;
/* get timestamp of the current adapter byte */ /* get timestamp of the current adapter byte */
timestamp = gst_adapter_prev_timestamp (visual->adapter, &dist); timestamp = gst_adapter_prev_timestamp (visual->adapter, &dist);
if (GST_CLOCK_TIME_IS_VALID (timestamp)) { if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
/* convert bytes to time */ /* convert bytes to time */
dist /= visual->bps; dist /= bpf;
timestamp += gst_util_uint64_scale_int (dist, GST_SECOND, visual->rate); timestamp += gst_util_uint64_scale_int (dist, GST_SECOND, rate);
} }
if (timestamp != -1) { if (timestamp != -1) {
@ -751,18 +763,18 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
/* Read VISUAL_SAMPLES samples per channel */ /* Read VISUAL_SAMPLES samples per channel */
data = data =
(const guint16 *) gst_adapter_map (visual->adapter, (const guint16 *) gst_adapter_map (visual->adapter,
VISUAL_SAMPLES * visual->bps); VISUAL_SAMPLES * bpf);
#if defined(VISUAL_API_VERSION) && VISUAL_API_VERSION >= 4000 && VISUAL_API_VERSION < 5000 #if defined(VISUAL_API_VERSION) && VISUAL_API_VERSION >= 4000 && VISUAL_API_VERSION < 5000
{ {
VisBuffer *lbuf, *rbuf; VisBuffer *lbuf, *rbuf;
guint16 ldata[VISUAL_SAMPLES], rdata[VISUAL_SAMPLES]; guint16 ldata[VISUAL_SAMPLES], rdata[VISUAL_SAMPLES];
VisAudioSampleRateType rate; VisAudioSampleRateType vrate;
lbuf = visual_buffer_new_with_buffer (ldata, sizeof (ldata), NULL); lbuf = visual_buffer_new_with_buffer (ldata, sizeof (ldata), NULL);
rbuf = visual_buffer_new_with_buffer (rdata, sizeof (rdata), NULL); rbuf = visual_buffer_new_with_buffer (rdata, sizeof (rdata), NULL);
if (visual->channels == 2) { if (channels == 2) {
for (i = 0; i < VISUAL_SAMPLES; i++) { for (i = 0; i < VISUAL_SAMPLES; i++) {
ldata[i] = *data++; ldata[i] = *data++;
rdata[i] = *data++; rdata[i] = *data++;
@ -774,32 +786,32 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
} }
} }
switch (visual->rate) { switch (rate) {
case 8000: case 8000:
rate = VISUAL_AUDIO_SAMPLE_RATE_8000; vrate = VISUAL_AUDIO_SAMPLE_RATE_8000;
break; break;
case 11250: case 11250:
rate = VISUAL_AUDIO_SAMPLE_RATE_11250; vrate = VISUAL_AUDIO_SAMPLE_RATE_11250;
break; break;
case 22500: case 22500:
rate = VISUAL_AUDIO_SAMPLE_RATE_22500; vrate = VISUAL_AUDIO_SAMPLE_RATE_22500;
break; break;
case 32000: case 32000:
rate = VISUAL_AUDIO_SAMPLE_RATE_32000; vrate = VISUAL_AUDIO_SAMPLE_RATE_32000;
break; break;
case 44100: case 44100:
rate = VISUAL_AUDIO_SAMPLE_RATE_44100; vrate = VISUAL_AUDIO_SAMPLE_RATE_44100;
break; break;
case 48000: case 48000:
rate = VISUAL_AUDIO_SAMPLE_RATE_48000; vrate = VISUAL_AUDIO_SAMPLE_RATE_48000;
break; break;
case 96000: case 96000:
rate = VISUAL_AUDIO_SAMPLE_RATE_96000; vrate = VISUAL_AUDIO_SAMPLE_RATE_96000;
break; break;
default: default:
visual_object_unref (VISUAL_OBJECT (lbuf)); visual_object_unref (VISUAL_OBJECT (lbuf));
visual_object_unref (VISUAL_OBJECT (rbuf)); visual_object_unref (VISUAL_OBJECT (rbuf));
GST_ERROR_OBJECT (visual, "unsupported rate %d", visual->rate); GST_ERROR_OBJECT (visual, "unsupported rate %d", rate);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto beach; goto beach;
break; break;
@ -807,10 +819,10 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
visual_audio_samplepool_input_channel (visual->audio->samplepool, visual_audio_samplepool_input_channel (visual->audio->samplepool,
lbuf, lbuf,
rate, VISUAL_AUDIO_SAMPLE_FORMAT_S16, vrate, VISUAL_AUDIO_SAMPLE_FORMAT_S16,
(char *) VISUAL_AUDIO_CHANNEL_LEFT); (char *) VISUAL_AUDIO_CHANNEL_LEFT);
visual_audio_samplepool_input_channel (visual->audio->samplepool, rbuf, visual_audio_samplepool_input_channel (visual->audio->samplepool, rbuf,
rate, VISUAL_AUDIO_SAMPLE_FORMAT_S16, vrate, VISUAL_AUDIO_SAMPLE_FORMAT_S16,
(char *) VISUAL_AUDIO_CHANNEL_RIGHT); (char *) VISUAL_AUDIO_CHANNEL_RIGHT);
visual_object_unref (VISUAL_OBJECT (lbuf)); visual_object_unref (VISUAL_OBJECT (lbuf));
@ -862,7 +874,7 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer)
visual->spf); visual->spf);
/* Flush out the number of samples per frame */ /* Flush out the number of samples per frame */
gst_adapter_flush (visual->adapter, visual->spf * visual->bps); gst_adapter_flush (visual->adapter, visual->spf * bpf);
/* quit the loop if something was wrong */ /* quit the loop if something was wrong */
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
@ -888,8 +900,8 @@ gst_visual_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
visual->actor = visual->actor =
visual_actor_new (GST_VISUAL_GET_CLASS (visual)->plugin-> visual_actor_new (GST_VISUAL_GET_CLASS (visual)->plugin->info->
info->plugname); plugname);
visual->video = visual_video_new (); visual->video = visual_video_new ();
visual->audio = visual_audio_new (); visual->audio = visual_audio_new ();
/* can't have a play without actors */ /* can't have a play without actors */