mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: port to new caps

Browse source
This commit is contained in:
Wim Taymans 2011-08-19 17:05:55 +02:00
parent 7a23448649
commit f870178234
2 changed files with 51 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
gst/adder/gstadder.c
View file

@ -44,7 +44,6 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstadder.h" #include "gstadder.h"
#include <gst/audio/audio.h>
#include <string.h> /* strcmp */ #include <string.h> /* strcmp */
#include "gstadderorc.h" #include "gstadderorc.h"
@ -224,8 +223,7 @@ setcapsfunc (const GValue * item, IterData * data)
static gboolean static gboolean
gst_adder_setcaps (GstAdder * adder, GstPad * pad, GstCaps * caps) gst_adder_setcaps (GstAdder * adder, GstPad * pad, GstCaps * caps)
{ {
GstStructure *structure; GstAudioInfo info;
const char *media_type;
GstIterator *it; GstIterator *it;
GstIteratorResult ires; GstIteratorResult ires;
IterData idata; IterData idata;
@ -256,79 +254,43 @@ gst_adder_setcaps (GstAdder * adder, GstPad * pad, GstCaps * caps)
} }
} }
/* parse caps now */ if (!gst_audio_info_from_caps (&info, caps))
structure = gst_caps_get_structure (caps, 0); goto invalid_format;
media_type = gst_structure_get_name (structure);
if (strcmp (media_type, "audio/x-raw-int") == 0) {
adder->format = GST_ADDER_FORMAT_INT;
gst_structure_get_int (structure, "width", &adder->width);
gst_structure_get_int (structure, "depth", &adder->depth);
gst_structure_get_int (structure, "endianness", &adder->endianness);
gst_structure_get_boolean (structure, "signed", &adder->is_signed);
GST_INFO_OBJECT (pad, "parse_caps sets adder to format int, %d bit", switch (GST_AUDIO_INFO_FORMAT (&info)) {
adder->width); case GST_AUDIO_FORMAT_S8:
adder->func = (GstAdderFunction) add_int8;
if (adder->endianness != G_BYTE_ORDER) break;
goto not_supported; case GST_AUDIO_FORMAT_U8:
adder->func = (GstAdderFunction) add_uint8;
switch (adder->width) { break;
case 8: case GST_AUDIO_FORMAT_S16:
adder->func = (adder->is_signed ? adder->func = (GstAdderFunction) add_int16;
(GstAdderFunction) add_int8 : (GstAdderFunction) add_uint8); break;
adder->sample_size = 1; case GST_AUDIO_FORMAT_U16:
break; adder->func = (GstAdderFunction) add_uint16;
case 16: break;
adder->func = (adder->is_signed ? case GST_AUDIO_FORMAT_S32:
(GstAdderFunction) add_int16 : (GstAdderFunction) add_uint16); adder->func = (GstAdderFunction) add_int32;
adder->sample_size = 2; break;
break; case GST_AUDIO_FORMAT_U32:
case 32: adder->func = (GstAdderFunction) add_uint32;
adder->func = (adder->is_signed ? break;
(GstAdderFunction) add_int32 : (GstAdderFunction) add_uint32); case GST_AUDIO_FORMAT_F32:
adder->sample_size = 4; adder->func = (GstAdderFunction) add_float32;
break; break;
default: case GST_AUDIO_FORMAT_F64:
goto not_supported; adder->func = (GstAdderFunction) add_float64;
} break;
} else if (strcmp (media_type, "audio/x-raw-float") == 0) { default:
adder->format = GST_ADDER_FORMAT_FLOAT; goto invalid_format;
gst_structure_get_int (structure, "width", &adder->width);
gst_structure_get_int (structure, "endianness", &adder->endianness);
GST_INFO_OBJECT (pad, "parse_caps sets adder to format float, %d bit",
adder->width);
if (adder->endianness != G_BYTE_ORDER)
goto not_supported;
switch (adder->width) {
case 32:
adder->func = (GstAdderFunction) add_float32;
adder->sample_size = 4;
break;
case 64:
adder->func = (GstAdderFunction) add_float64;
adder->sample_size = 8;
break;
default:
goto not_supported;
}
} else {
goto not_supported;
} }
gst_structure_get_int (structure, "channels", &adder->channels);
gst_structure_get_int (structure, "rate", &adder->rate);
/* precalc bps */
adder->bps = (adder->width / 8) * adder->channels;
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
not_supported: invalid_format:
{ {
GST_DEBUG_OBJECT (adder, "unsupported format set as caps"); GST_DEBUG_OBJECT (adder, "invalid format set as caps");
return FALSE; return FALSE;
} }
} }
@ -871,7 +833,7 @@ gst_adder_init (GstAdder * adder)
GST_DEBUG_FUNCPTR (gst_adder_src_event)); GST_DEBUG_FUNCPTR (gst_adder_src_event));
gst_element_add_pad (GST_ELEMENT (adder), adder->srcpad); gst_element_add_pad (GST_ELEMENT (adder), adder->srcpad);
adder->format = GST_ADDER_FORMAT_UNSET; gst_audio_info_init (&adder->info);
adder->padcount = 0; adder->padcount = 0;
adder->func = NULL; adder->func = NULL;
@ -1032,9 +994,12 @@ gst_adder_do_clip (GstCollectPads * pads, GstCollectData * data,
GstBuffer * buffer, gpointer user_data) GstBuffer * buffer, gpointer user_data)
{ {
GstAdder *adder = GST_ADDER (user_data); GstAdder *adder = GST_ADDER (user_data);
gint rate, bpf;
buffer = gst_audio_buffer_clip (buffer, &data->segment, adder->rate, rate = GST_AUDIO_INFO_RATE (&adder->info);
adder->bps); bpf = GST_AUDIO_INFO_BPF (&adder->info);
buffer = gst_audio_buffer_clip (buffer, &data->segment, rate, bpf);
return buffer; return buffer;
} }
@ -1066,6 +1031,7 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
guint outsize; guint outsize;
gint64 next_offset; gint64 next_offset;
gint64 next_timestamp; gint64 next_timestamp;
gint rate, bps, bpf;
adder = GST_ADDER (user_data); adder = GST_ADDER (user_data);
@ -1086,9 +1052,13 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
if (outsize == 0) if (outsize == 0)
goto eos; goto eos;
rate = GST_AUDIO_INFO_RATE (&adder->info);
bps = GST_AUDIO_INFO_BPS (&adder->info);
bpf = GST_AUDIO_INFO_BPF (&adder->info);
GST_LOG_OBJECT (adder, GST_LOG_OBJECT (adder,
"starting to cycle through channels, %d bytes available (bps = %d)", "starting to cycle through channels, %d bytes available (bps = %d)",
outsize, adder->bps); outsize, bpf);
for (collected = pads->data; collected; collected = next) { for (collected = pads->data; collected; collected = next) {
GstCollectData *collect_data; GstCollectData *collect_data;
@ -1148,8 +1118,7 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
" from data %p", collect_data, insize, indata); " from data %p", collect_data, insize, indata);
/* further buffers, need to add them */ /* further buffers, need to add them */
adder->func ((gpointer) outdata, (gpointer) indata, adder->func ((gpointer) outdata, (gpointer) indata, insize / bps);
insize / adder->sample_size);
gst_buffer_unmap (inbuf, indata, insize); gst_buffer_unmap (inbuf, indata, insize);
} else { } else {
/* skip gap buffer */ /* skip gap buffer */
@ -1192,7 +1161,7 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
adder->segment.position = adder->segment.stop; adder->segment.position = adder->segment.stop;
} }
adder->offset = gst_util_uint64_scale (adder->segment.position, adder->offset = gst_util_uint64_scale (adder->segment.position,
adder->rate, GST_SECOND); rate, GST_SECOND);
GST_INFO_OBJECT (adder, "seg_start %" G_GUINT64_FORMAT ", seg_end %" GST_INFO_OBJECT (adder, "seg_start %" G_GUINT64_FORMAT ", seg_end %"
G_GUINT64_FORMAT, adder->segment.start, adder->segment.stop); G_GUINT64_FORMAT, adder->segment.start, adder->segment.stop);
GST_INFO_OBJECT (adder, "timestamp %" G_GINT64_FORMAT ",new offset %" GST_INFO_OBJECT (adder, "timestamp %" G_GINT64_FORMAT ",new offset %"
@ -1226,11 +1195,11 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
/* for the next timestamp, use the sample counter, which will /* for the next timestamp, use the sample counter, which will
* never accumulate rounding errors */ * never accumulate rounding errors */
if (adder->segment.rate > 0.0) { if (adder->segment.rate > 0.0) {
next_offset = adder->offset + outsize / adder->bps; next_offset = adder->offset + outsize / bpf;
} else { } else {
next_offset = adder->offset - outsize / adder->bps; next_offset = adder->offset - outsize / bpf;
} }
next_timestamp = gst_util_uint64_scale (next_offset, GST_SECOND, adder->rate); next_timestamp = gst_util_uint64_scale (next_offset, GST_SECOND, rate);
/* set timestamps on the output buffer */ /* set timestamps on the output buffer */

21
gst/adder/gstadder.h
View file

@ -25,6 +25,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstcollectpads.h> #include <gst/base/gstcollectpads.h>
#include <gst/audio/audio.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -39,12 +40,6 @@ typedef struct _GstAdder GstAdder;
typedef struct _GstAdderClass GstAdderClass; typedef struct _GstAdderClass GstAdderClass;
typedef struct _GstAdderInputChannel GstAdderInputChannel; typedef struct _GstAdderInputChannel GstAdderInputChannel;
typedef enum {
GST_ADDER_FORMAT_UNSET,
GST_ADDER_FORMAT_INT,
GST_ADDER_FORMAT_FLOAT
} GstAdderFormat;
typedef void (*GstAdderFunction) (gpointer out, gpointer in, guint size); typedef void (*GstAdderFunction) (gpointer out, gpointer in, guint size);
/** /**
@ -61,19 +56,7 @@ struct _GstAdder {
gint padcount; gint padcount;
/* the next are valid for both int and float */ /* the next are valid for both int and float */
GstAdderFormat format; GstAudioInfo info;
gint rate;
gint channels;
gint width;
gint endianness;
int sample_size;
/* the next are valid only for format == GST_ADDER_FORMAT_INT */
gint depth;
gboolean is_signed;
/* number of bytes per sample, actually width/8 * channels */
gint bps;
/* function to add samples */ /* function to add samples */
GstAdderFunction func; GstAdderFunction func;