update for memory api changes

This commit is contained in:
Wim Taymans 2012-03-15 13:36:17 +01:00
parent ad0af26eed
commit ecaea36c3d
22 changed files with 59 additions and 55 deletions

View file

@ -438,7 +438,7 @@ gst_cmml_dec_new_buffer (GstCmmlDec * dec,
{ {
GstFlowReturn res; GstFlowReturn res;
*buffer = gst_buffer_new_allocate (NULL, size, 0); *buffer = gst_buffer_new_allocate (NULL, size, NULL);
if (*buffer != NULL) { if (*buffer != NULL) {
if (data) if (data)
gst_buffer_fill (*buffer, 0, data, size); gst_buffer_fill (*buffer, 0, data, size);

View file

@ -294,7 +294,7 @@ gst_cmml_enc_new_buffer (GstCmmlEnc * enc,
{ {
GstFlowReturn res; GstFlowReturn res;
*buffer = gst_buffer_new_allocate (NULL, size, 0); *buffer = gst_buffer_new_allocate (NULL, size, NULL);
if (*buffer != NULL) { if (*buffer != NULL) {
if (data) if (data)
gst_buffer_fill (*buffer, 0, data, size); gst_buffer_fill (*buffer, 0, data, size);

View file

@ -611,7 +611,8 @@ gst_flac_dec_write (GstFlacDec * flacdec, const FLAC__Frame * frame,
} }
GST_LOG_OBJECT (flacdec, "alloc_buffer_and_set_caps"); GST_LOG_OBJECT (flacdec, "alloc_buffer_and_set_caps");
outbuf = gst_buffer_new_allocate (NULL, samples * channels * (width / 8), 0); outbuf =
gst_buffer_new_allocate (NULL, samples * channels * (width / 8), NULL);
gst_buffer_map (outbuf, &map, GST_MAP_WRITE); gst_buffer_map (outbuf, &map, GST_MAP_WRITE);
if (width == 8) { if (width == 8) {

View file

@ -162,6 +162,7 @@ ensure_memory (GstJpegEnc * jpegenc)
GstMapInfo map; GstMapInfo map;
gsize old_size, desired_size, new_size; gsize old_size, desired_size, new_size;
guint8 *new_data; guint8 *new_data;
static GstAllocationParams params = { 0, 0, 0, 3, };
old_size = jpegenc->output_map.size; old_size = jpegenc->output_map.size;
if (old_size == 0) if (old_size == 0)
@ -171,7 +172,7 @@ ensure_memory (GstJpegEnc * jpegenc)
/* Our output memory wasn't big enough. /* Our output memory wasn't big enough.
* Make a new memory that's twice the size, */ * Make a new memory that's twice the size, */
new_memory = gst_allocator_alloc (NULL, 0, desired_size, 0, desired_size, 3); new_memory = gst_allocator_alloc (NULL, desired_size, &params);
gst_memory_map (new_memory, &map, GST_MAP_READWRITE); gst_memory_map (new_memory, &map, GST_MAP_READWRITE);
new_data = map.data; new_data = map.data;
new_size = map.size; new_size = map.size;
@ -546,6 +547,7 @@ gst_jpegenc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
gint i, j, k; gint i, j, k;
GstBuffer *outbuf; GstBuffer *outbuf;
GstVideoFrame frame; GstVideoFrame frame;
static GstAllocationParams params = { 0, 0, 0, 3, };
jpegenc = GST_JPEGENC (parent); jpegenc = GST_JPEGENC (parent);
@ -567,8 +569,7 @@ gst_jpegenc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
end[i] = base[i] + GST_VIDEO_FRAME_COMP_HEIGHT (&frame, i) * stride[i]; end[i] = base[i] + GST_VIDEO_FRAME_COMP_HEIGHT (&frame, i) * stride[i];
} }
jpegenc->output_mem = jpegenc->output_mem = gst_allocator_alloc (NULL, jpegenc->bufsize, &params);
gst_allocator_alloc (NULL, 0, jpegenc->bufsize, 0, jpegenc->bufsize, 3);
gst_memory_map (jpegenc->output_mem, &jpegenc->output_map, GST_MAP_READWRITE); gst_memory_map (jpegenc->output_mem, &jpegenc->output_map, GST_MAP_READWRITE);
jpegenc->jdest.next_output_byte = jpegenc->output_map.data; jpegenc->jdest.next_output_byte = jpegenc->output_map.data;

View file

@ -410,7 +410,7 @@ gst_speex_dec_parse_data (GstSpeexDec * dec, GstBuffer * buf)
* could also use an allocator */ * could also use an allocator */
outbuf = outbuf =
gst_buffer_new_allocate (NULL, gst_buffer_new_allocate (NULL,
dec->frame_size * dec->header->nb_channels * 2, 0); dec->frame_size * dec->header->nb_channels * 2, NULL);
gst_buffer_map (outbuf, &map, GST_MAP_WRITE); gst_buffer_map (outbuf, &map, GST_MAP_WRITE);
ret = speex_decode_int (dec->state, bits, (spx_int16_t *) map.data); ret = speex_decode_int (dec->state, bits, (spx_int16_t *) map.data);

View file

@ -598,7 +598,7 @@ gst_speex_enc_encode (GstSpeexEnc * enc, GstBuffer * buf)
if ((GST_FLOW_OK != ret)) if ((GST_FLOW_OK != ret))
goto done; goto done;
#endif #endif
outbuf = gst_buffer_new_allocate (NULL, outsize, 0); outbuf = gst_buffer_new_allocate (NULL, outsize, NULL);
gst_buffer_map (outbuf, &map, GST_MAP_WRITE); gst_buffer_map (outbuf, &map, GST_MAP_WRITE);
written = speex_bits_write (&enc->bits, (gchar *) map.data, outsize); written = speex_bits_write (&enc->bits, (gchar *) map.data, outsize);

View file

@ -702,7 +702,7 @@ gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf)
/* Allocate buffers */ /* Allocate buffers */
for (srcs = self->srcpads, i = 0; srcs; srcs = srcs->next, i++) { for (srcs = self->srcpads, i = 0; srcs; srcs = srcs->next, i++) {
buffers_out[i] = gst_buffer_new_allocate (NULL, bufsize, 0); buffers_out[i] = gst_buffer_new_allocate (NULL, bufsize, NULL);
/* Make sure we got a correct buffer. The only other case we allow /* Make sure we got a correct buffer. The only other case we allow
* here is an unliked pad */ * here is an unliked pad */

View file

@ -1199,7 +1199,7 @@ gst_interleave_collected (GstCollectPads2 * pads, GstInterleave * self)
nsamples = size / width; nsamples = size / width;
outbuf = gst_buffer_new_allocate (NULL, size * self->channels, 0); outbuf = gst_buffer_new_allocate (NULL, size * self->channels, NULL);
if (outbuf == NULL || gst_buffer_get_size (outbuf) < size * self->channels) { if (outbuf == NULL || gst_buffer_get_size (outbuf) < size * self->channels) {
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);

View file

@ -8411,7 +8411,7 @@ qtdemux_tag_add_id32 (GstQTDemux * demux, const char *tag,
if (len < 12 + 2) if (len < 12 + 2)
return; return;
buf = gst_buffer_new_allocate (NULL, len - 14, 0); buf = gst_buffer_new_allocate (NULL, len - 14, NULL);
gst_buffer_fill (buf, 0, data + 14, len - 14); gst_buffer_fill (buf, 0, data + 14, len - 14);
taglist = gst_tag_list_from_id3v2_tag (buf); taglist = gst_tag_list_from_id3v2_tag (buf);

View file

@ -328,7 +328,7 @@ gst_alaw_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
linear_size = alaw_size * 2; linear_size = alaw_size * 2;
outbuf = gst_buffer_new_allocate (NULL, linear_size, 0); outbuf = gst_buffer_new_allocate (NULL, linear_size, NULL);
gst_buffer_map (outbuf, &outmap, GST_MAP_WRITE); gst_buffer_map (outbuf, &outmap, GST_MAP_WRITE);
linear_data = (gint16 *) outmap.data; linear_data = (gint16 *) outmap.data;

View file

@ -520,7 +520,7 @@ gst_alaw_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
GST_LOG_OBJECT (alawenc, "buffer with ts=%" GST_TIME_FORMAT, GST_LOG_OBJECT (alawenc, "buffer with ts=%" GST_TIME_FORMAT,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
outbuf = gst_buffer_new_allocate (NULL, alaw_size, 0); outbuf = gst_buffer_new_allocate (NULL, alaw_size, NULL);
if (duration == GST_CLOCK_TIME_NONE) { if (duration == GST_CLOCK_TIME_NONE) {
duration = gst_util_uint64_scale_int (alaw_size, duration = gst_util_uint64_scale_int (alaw_size,

View file

@ -259,7 +259,7 @@ gst_mulawdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
linear_size = mulaw_size * 2; linear_size = mulaw_size * 2;
outbuf = gst_buffer_new_allocate (NULL, linear_size, 0); outbuf = gst_buffer_new_allocate (NULL, linear_size, NULL);
gst_buffer_map (outbuf, &outmap, GST_MAP_WRITE); gst_buffer_map (outbuf, &outmap, GST_MAP_WRITE);
linear_data = (gint16 *) outmap.data; linear_data = (gint16 *) outmap.data;

View file

@ -263,7 +263,7 @@ gst_mulawenc_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
timestamp = GST_BUFFER_TIMESTAMP (buffer); timestamp = GST_BUFFER_TIMESTAMP (buffer);
duration = GST_BUFFER_DURATION (buffer); duration = GST_BUFFER_DURATION (buffer);
outbuf = gst_buffer_new_allocate (NULL, mulaw_size, 0); outbuf = gst_buffer_new_allocate (NULL, mulaw_size, NULL);
if (duration == -1) { if (duration == -1) {
duration = gst_util_uint64_scale_int (mulaw_size, duration = gst_util_uint64_scale_int (mulaw_size,

View file

@ -2744,7 +2744,7 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
wvh.ck_size = size + sizeof (Wavpack4Header) - 20; wvh.ck_size = size + sizeof (Wavpack4Header) - 20;
/* block_samples, flags and crc are already in the buffer */ /* block_samples, flags and crc are already in the buffer */
newbuf = gst_buffer_new_allocate (NULL, sizeof (Wavpack4Header) - 12, 0); newbuf = gst_buffer_new_allocate (NULL, sizeof (Wavpack4Header) - 12, NULL);
gst_buffer_map (newbuf, &outmap, GST_MAP_WRITE); gst_buffer_map (newbuf, &outmap, GST_MAP_WRITE);
data = outmap.data; data = outmap.data;
@ -2807,7 +2807,7 @@ gst_matroska_demux_add_wvpk_header (GstElement * element,
if (newbuf == NULL) { if (newbuf == NULL) {
out_size = sizeof (Wavpack4Header) + blocksize; out_size = sizeof (Wavpack4Header) + blocksize;
newbuf = gst_buffer_new_allocate (NULL, out_size, 0); newbuf = gst_buffer_new_allocate (NULL, out_size, NULL);
gst_buffer_copy_into (newbuf, *buf, gst_buffer_copy_into (newbuf, *buf,
GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS, 0, -1); GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS, 0, -1);
@ -3031,9 +3031,10 @@ gst_matroska_demux_align_buffer (GstMatroskaDemux * demux,
if (((guintptr) map.data) & (alignment - 1)) { if (((guintptr) map.data) & (alignment - 1)) {
GstBuffer *new_buffer; GstBuffer *new_buffer;
GstAllocationParams params = { 0, 0, 0, alignment - 1, };
new_buffer = gst_buffer_new_allocate (NULL, new_buffer = gst_buffer_new_allocate (NULL,
gst_buffer_get_size (buffer), alignment - 1); gst_buffer_get_size (buffer), &params);
/* Copy data "by hand", so ensure alignment is kept: */ /* Copy data "by hand", so ensure alignment is kept: */
gst_buffer_fill (new_buffer, 0, map.data, map.size); gst_buffer_fill (new_buffer, 0, map.data, map.size);
@ -5309,7 +5310,7 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
if (priv == NULL) { if (priv == NULL) {
GstMapInfo map; GstMapInfo map;
priv = gst_buffer_new_allocate (NULL, 5, 0); priv = gst_buffer_new_allocate (NULL, 5, NULL);
gst_buffer_map (priv, &map, GST_MAP_WRITE); gst_buffer_map (priv, &map, GST_MAP_WRITE);
data = map.data; data = map.data;
rate_idx = aac_rate_idx (audiocontext->samplerate); rate_idx = aac_rate_idx (audiocontext->samplerate);

View file

@ -487,7 +487,7 @@ gst_split_file_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
"%" G_GUINT64_FORMAT ", %s)", src->cur_part, cur_part.start, "%" G_GUINT64_FORMAT ", %s)", src->cur_part, cur_part.start,
cur_part.stop, cur_part.path); cur_part.stop, cur_part.path);
buf = gst_buffer_new_allocate (NULL, size, 0); buf = gst_buffer_new_allocate (NULL, size, NULL);
GST_BUFFER_OFFSET (buf) = offset; GST_BUFFER_OFFSET (buf) = offset;

View file

@ -395,6 +395,7 @@ gst_multipart_mux_collected (GstCollectPads2 * pads, GstMultipartMux * mux)
GstStructure *structure = NULL; GstStructure *structure = NULL;
GstCaps *caps; GstCaps *caps;
const gchar *mime; const gchar *mime;
static GstAllocationParams params = { 0, 0, 0, 1, };
GST_DEBUG_OBJECT (mux, "all pads are collected"); GST_DEBUG_OBJECT (mux, "all pads are collected");
@ -461,7 +462,7 @@ gst_multipart_mux_collected (GstCollectPads2 * pads, GstMultipartMux * mux)
mux->boundary, mime, gst_buffer_get_size (best->buffer)); mux->boundary, mime, gst_buffer_get_size (best->buffer));
headerlen = strlen (header); headerlen = strlen (header);
headerbuf = gst_buffer_new_allocate (NULL, headerlen, 1); headerbuf = gst_buffer_new_allocate (NULL, headerlen, &params);
gst_buffer_fill (headerbuf, 0, header, headerlen); gst_buffer_fill (headerbuf, 0, header, headerlen);
g_free (header); g_free (header);
@ -501,7 +502,7 @@ gst_multipart_mux_collected (GstCollectPads2 * pads, GstMultipartMux * mux)
* don't need to unref headerbuf here. */ * don't need to unref headerbuf here. */
goto beach; goto beach;
footerbuf = gst_buffer_new_allocate (NULL, 2, 1); footerbuf = gst_buffer_new_allocate (NULL, 2, &params);
gst_buffer_fill (footerbuf, 0, "\r\n", 2); gst_buffer_fill (footerbuf, 0, "\r\n", 2);
/* the footer has the same timestamp as the data buffer and has a /* the footer has the same timestamp as the data buffer and has a

View file

@ -872,7 +872,7 @@ gst_shape_wipe_video_sink_chain (GstPad * pad, GstObject * parent,
/* Try to blend inplace, if it's not possible /* Try to blend inplace, if it's not possible
* get a new buffer from downstream. */ * get a new buffer from downstream. */
if (!gst_buffer_is_writable (buffer)) { if (!gst_buffer_is_writable (buffer)) {
outbuf = gst_buffer_new_allocate (NULL, gst_buffer_get_size (buffer), 0); outbuf = gst_buffer_new_allocate (NULL, gst_buffer_get_size (buffer), NULL);
gst_buffer_copy_into (outbuf, buffer, GST_BUFFER_COPY_METADATA, 0, -1); gst_buffer_copy_into (outbuf, buffer, GST_BUFFER_COPY_METADATA, 0, -1);
new_outbuf = TRUE; new_outbuf = TRUE;
} else { } else {

View file

@ -818,10 +818,11 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
guint outsize; guint outsize;
BlendFunction composite; BlendFunction composite;
GstVideoFrame outframe; GstVideoFrame outframe;
static GstAllocationParams params = { 0, 0, 0, 15, };
outsize = GST_VIDEO_INFO_SIZE (&mix->info); outsize = GST_VIDEO_INFO_SIZE (&mix->info);
*outbuf = gst_buffer_new_allocate (NULL, outsize, 15); *outbuf = gst_buffer_new_allocate (NULL, outsize, &params);
GST_BUFFER_TIMESTAMP (*outbuf) = output_start_time; GST_BUFFER_TIMESTAMP (*outbuf) = output_start_time;
GST_BUFFER_DURATION (*outbuf) = output_end_time - output_start_time; GST_BUFFER_DURATION (*outbuf) = output_end_time - output_start_time;

View file

@ -147,7 +147,7 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
case GST_V4L2_IO_RW: case GST_V4L2_IO_RW:
{ {
newbuf = newbuf =
gst_buffer_new_allocate (pool->allocator, pool->size, pool->align); gst_buffer_new_allocate (pool->allocator, pool->size, &pool->params);
break; break;
} }
case GST_V4L2_IO_MMAP: case GST_V4L2_IO_MMAP:
@ -275,9 +275,10 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config)
pool->size = size; pool->size = size;
pool->max_buffers = MAX (min_buffers, max_buffers); pool->max_buffers = MAX (min_buffers, max_buffers);
pool->min_buffers = MIN (pool->max_buffers, min_buffers); pool->min_buffers = MIN (pool->max_buffers, min_buffers);
pool->prefix = prefix; gst_allocation_params_init (&pool->params);
pool->padding = padding; pool->params.prefix = prefix;
pool->align = align; pool->params.padding = padding;
pool->params.align = align;
gst_buffer_pool_config_set (config, caps, size, min_buffers, gst_buffer_pool_config_set (config, caps, size, min_buffers,
max_buffers, prefix, padding, align); max_buffers, prefix, padding, align);

View file

@ -52,12 +52,10 @@ struct _GstV4l2BufferPool
gint video_fd; /* a dup(2) of the v4l2object's video_fd */ gint video_fd; /* a dup(2) of the v4l2object's video_fd */
GstAllocator *allocator; GstAllocator *allocator;
GstAllocationParams params;
guint size; guint size;
guint min_buffers; guint min_buffers;
guint max_buffers; guint max_buffers;
guint prefix;
guint padding;
guint align;
gboolean add_videometa; gboolean add_videometa;
guint num_allocated; /* number of buffers allocated by the driver */ guint num_allocated; /* number of buffers allocated by the driver */

View file

@ -123,7 +123,7 @@ GST_START_TEST (test_type1_32_bp_0hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i++) for (i = 0; i < 1024; i++)
@ -185,7 +185,7 @@ GST_START_TEST (test_type1_32_bp_11025hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 4) { for (i = 0; i < 1024; i += 4) {
@ -251,7 +251,7 @@ GST_START_TEST (test_type1_32_bp_22050hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 2) { for (i = 0; i < 1024; i += 2) {
@ -315,7 +315,7 @@ GST_START_TEST (test_type1_32_br_0hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i++) for (i = 0; i < 1024; i++)
@ -377,7 +377,7 @@ GST_START_TEST (test_type1_32_br_11025hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 4) { for (i = 0; i < 1024; i += 4) {
@ -443,7 +443,7 @@ GST_START_TEST (test_type1_32_br_22050hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 2) { for (i = 0; i < 1024; i += 2) {
@ -891,7 +891,7 @@ GST_START_TEST (test_type2_32_bp_0hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i++) for (i = 0; i < 1024; i++)
@ -953,7 +953,7 @@ GST_START_TEST (test_type2_32_bp_11025hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 4) { for (i = 0; i < 1024; i += 4) {
@ -1019,7 +1019,7 @@ GST_START_TEST (test_type2_32_bp_22050hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 2) { for (i = 0; i < 1024; i += 2) {
@ -1083,7 +1083,7 @@ GST_START_TEST (test_type2_32_br_0hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i++) for (i = 0; i < 1024; i++)
@ -1145,7 +1145,7 @@ GST_START_TEST (test_type2_32_br_11025hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 4) { for (i = 0; i < 1024; i += 4) {
@ -1211,7 +1211,7 @@ GST_START_TEST (test_type2_32_br_22050hz)
44100 / 4.0 - 1000, NULL); 44100 / 4.0 - 1000, NULL);
g_object_set (G_OBJECT (audiochebband), "upper-frequency", g_object_set (G_OBJECT (audiochebband), "upper-frequency",
44100 / 4.0 + 1000, NULL); 44100 / 4.0 + 1000, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 1024 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 1024; i += 2) { for (i = 0; i < 1024; i += 2) {

View file

@ -120,7 +120,7 @@ GST_START_TEST (test_type1_32_lp_0hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
@ -179,7 +179,7 @@ GST_START_TEST (test_type1_32_lp_22050hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i += 2) { for (i = 0; i < 128; i += 2) {
@ -240,7 +240,7 @@ GST_START_TEST (test_type1_32_hp_0hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
@ -299,7 +299,7 @@ GST_START_TEST (test_type1_32_hp_22050hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i += 2) { for (i = 0; i < 128; i += 2) {
@ -360,7 +360,7 @@ GST_START_TEST (test_type1_64_lp_0hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gdouble *) map.data; in = (gdouble *) map.data;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
@ -419,7 +419,7 @@ GST_START_TEST (test_type1_64_lp_22050hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gdouble *) map.data; in = (gdouble *) map.data;
for (i = 0; i < 128; i += 2) { for (i = 0; i < 128; i += 2) {
@ -480,7 +480,7 @@ GST_START_TEST (test_type1_64_hp_0hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gdouble *) map.data; in = (gdouble *) map.data;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
@ -539,7 +539,7 @@ GST_START_TEST (test_type1_64_hp_22050hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gdouble), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gdouble *) map.data; in = (gdouble *) map.data;
for (i = 0; i < 128; i += 2) { for (i = 0; i < 128; i += 2) {
@ -600,7 +600,7 @@ GST_START_TEST (test_type2_32_lp_0hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
@ -659,7 +659,7 @@ GST_START_TEST (test_type2_32_lp_22050hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i += 2) { for (i = 0; i < 128; i += 2) {
@ -720,7 +720,7 @@ GST_START_TEST (test_type2_32_hp_0hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
@ -779,7 +779,7 @@ GST_START_TEST (test_type2_32_hp_22050hz)
"could not set to playing"); "could not set to playing");
g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL); g_object_set (G_OBJECT (audiocheblimit), "cutoff", 44100 / 4.0, NULL);
inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), 0); inbuffer = gst_buffer_new_allocate (NULL, 128 * sizeof (gfloat), NULL);
gst_buffer_map (inbuffer, &map, GST_MAP_WRITE); gst_buffer_map (inbuffer, &map, GST_MAP_WRITE);
in = (gfloat *) map.data; in = (gfloat *) map.data;
for (i = 0; i < 128; i += 2) { for (i = 0; i < 128; i += 2) {