filter newlines out of GST_DEBUG statements to reflect new core behavior fixes to adder's caps, again
Original commit message from CVS: * filter newlines out of GST_DEBUG statements to reflect new core behavior * fixes to adder's caps, again
This commit is contained in:
parent
12bac12e5c
commit
3e882a4bf3
@ -1302,7 +1302,7 @@ gst_alsa_get_channel_addresses (GstAlsa *this)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG(0, "got %d mmap'd frames\n", (int)this->avail);
|
GST_DEBUG(0, "got %d mmap'd frames", (int)this->avail);
|
||||||
|
|
||||||
/* g_print ("snd_pcm_mmap_begin() sets avail = %d\n", this->avail); */
|
/* g_print ("snd_pcm_mmap_begin() sets avail = %d\n", this->avail); */
|
||||||
|
|
||||||
@ -1333,7 +1333,7 @@ gst_alsa_release_channel_addresses (GstAlsa *this)
|
|||||||
|
|
||||||
g_return_if_fail (this->mmap_open == TRUE);
|
g_return_if_fail (this->mmap_open == TRUE);
|
||||||
|
|
||||||
GST_DEBUG(0, "releasing mmap'd data region: %d frames\n", (int)this->avail);
|
GST_DEBUG(0, "releasing mmap'd data region: %d frames", (int)this->avail);
|
||||||
|
|
||||||
if ((err = snd_pcm_mmap_commit (this->handle, this->offset, this->avail)) < 0) {
|
if ((err = snd_pcm_mmap_commit (this->handle, this->offset, this->avail)) < 0) {
|
||||||
g_warning("gstalsa: mmap commit failed: %s", snd_strerror(err));
|
g_warning("gstalsa: mmap commit failed: %s", snd_strerror(err));
|
||||||
|
@ -449,7 +449,7 @@ cdparanoia_get (GstPad *pad)
|
|||||||
src->cur_sector++;
|
src->cur_sector++;
|
||||||
|
|
||||||
if (src->cur_sector == src->end_sector) {
|
if (src->cur_sector == src->end_sector) {
|
||||||
GST_DEBUG (0,"setting EOS\n");
|
GST_DEBUG (0,"setting EOS");
|
||||||
gst_element_set_eos(GST_ELEMENT(src));
|
gst_element_set_eos(GST_ELEMENT(src));
|
||||||
|
|
||||||
buf = GST_BUFFER (gst_event_new (GST_EVENT_EOS));
|
buf = GST_BUFFER (gst_event_new (GST_EVENT_EOS));
|
||||||
@ -492,7 +492,7 @@ cdparanoia_open (CDParanoia *src)
|
|||||||
|
|
||||||
/* fail if the device couldn't be found */
|
/* fail if the device couldn't be found */
|
||||||
if (src->d == NULL) {
|
if (src->d == NULL) {
|
||||||
GST_DEBUG (0,"couldn't open device\n");
|
GST_DEBUG (0,"couldn't open device");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -502,7 +502,7 @@ cdparanoia_open (CDParanoia *src)
|
|||||||
/* set various other parameters */
|
/* set various other parameters */
|
||||||
if (src->default_sectors != -1) {
|
if (src->default_sectors != -1) {
|
||||||
if ((src->default_sectors < 0) || (src->default_sectors > 100)) {
|
if ((src->default_sectors < 0) || (src->default_sectors > 100)) {
|
||||||
GST_DEBUG (0,"default sector read size must be 1 <= n <= 100\n");
|
GST_DEBUG (0,"default sector read size must be 1 <= n <= 100");
|
||||||
cdda_close (src->d);
|
cdda_close (src->d);
|
||||||
src->d = NULL;
|
src->d = NULL;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -513,7 +513,7 @@ cdparanoia_open (CDParanoia *src)
|
|||||||
}
|
}
|
||||||
if (src->search_overlap != -1) {
|
if (src->search_overlap != -1) {
|
||||||
if ((src->search_overlap < 0) || (src->search_overlap > 75)) {
|
if ((src->search_overlap < 0) || (src->search_overlap > 75)) {
|
||||||
GST_DEBUG (0,"search overlap must be 0 <= n <= 75\n");
|
GST_DEBUG (0,"search overlap must be 0 <= n <= 75");
|
||||||
cdda_close (src->d);
|
cdda_close (src->d);
|
||||||
src->d = NULL;
|
src->d = NULL;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -522,7 +522,7 @@ cdparanoia_open (CDParanoia *src)
|
|||||||
|
|
||||||
/* open the disc */
|
/* open the disc */
|
||||||
if (cdda_open (src->d)) {
|
if (cdda_open (src->d)) {
|
||||||
GST_DEBUG (0,"couldn't open disc\n");
|
GST_DEBUG (0,"couldn't open disc");
|
||||||
cdda_close (src->d);
|
cdda_close (src->d);
|
||||||
src->d = NULL;
|
src->d = NULL;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -561,7 +561,7 @@ cdparanoia_open (CDParanoia *src)
|
|||||||
/* create the paranoia struct and set it up */
|
/* create the paranoia struct and set it up */
|
||||||
src->p = paranoia_init (src->d);
|
src->p = paranoia_init (src->d);
|
||||||
if (src->p == NULL) {
|
if (src->p == NULL) {
|
||||||
GST_DEBUG (0,"couldn't create paranoia struct\n");
|
GST_DEBUG (0,"couldn't create paranoia struct");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -577,7 +577,7 @@ cdparanoia_open (CDParanoia *src)
|
|||||||
|
|
||||||
src->cur_sector = src->start_sector;
|
src->cur_sector = src->start_sector;
|
||||||
paranoia_seek (src->p, src->cur_sector, SEEK_SET);
|
paranoia_seek (src->p, src->cur_sector, SEEK_SET);
|
||||||
GST_DEBUG (0,"successfully seek'd to beginning of disk\n");
|
GST_DEBUG (0,"successfully seek'd to beginning of disk");
|
||||||
|
|
||||||
GST_FLAG_SET (src, CDPARANOIA_OPEN);
|
GST_FLAG_SET (src, CDPARANOIA_OPEN);
|
||||||
|
|
||||||
|
@ -254,7 +254,7 @@ gst_gnomevfssink_open_file (GstGnomeVFSSink *sink)
|
|||||||
GNOME_VFS_OPEN_WRITE, sink->erase,
|
GNOME_VFS_OPEN_WRITE, sink->erase,
|
||||||
GNOME_VFS_PERM_USER_READ | GNOME_VFS_PERM_USER_WRITE
|
GNOME_VFS_PERM_USER_READ | GNOME_VFS_PERM_USER_WRITE
|
||||||
| GNOME_VFS_PERM_GROUP_READ);
|
| GNOME_VFS_PERM_GROUP_READ);
|
||||||
GST_DEBUG (0, "open: %s\n", gnome_vfs_result_to_string(result));
|
GST_DEBUG (0, "open: %s", gnome_vfs_result_to_string(result));
|
||||||
if (result != GNOME_VFS_OK) {
|
if (result != GNOME_VFS_OK) {
|
||||||
if (sink->erase == FALSE) {
|
if (sink->erase == FALSE) {
|
||||||
g_signal_emit (G_OBJECT (sink),
|
g_signal_emit (G_OBJECT (sink),
|
||||||
@ -316,7 +316,7 @@ gst_gnomevfssink_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
if (GST_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN))
|
if (GST_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN))
|
||||||
{
|
{
|
||||||
result = gnome_vfs_write(sink->handle, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE (buf), &bytes_written);
|
result = gnome_vfs_write(sink->handle, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE (buf), &bytes_written);
|
||||||
GST_DEBUG (0, "write: %s, written_bytes: %Lu\n", gnome_vfs_result_to_string(result), bytes_written);
|
GST_DEBUG (0, "write: %s, written_bytes: %Lu", gnome_vfs_result_to_string(result), bytes_written);
|
||||||
if (bytes_written < GST_BUFFER_SIZE (buf))
|
if (bytes_written < GST_BUFFER_SIZE (buf))
|
||||||
{
|
{
|
||||||
printf ("gnomevfssink : Warning : %d bytes should be written, only %Lu bytes written\n",
|
printf ("gnomevfssink : Warning : %d bytes should be written, only %Lu bytes written\n",
|
||||||
|
@ -342,7 +342,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||||||
if (src->new_seek)
|
if (src->new_seek)
|
||||||
{
|
{
|
||||||
/* FIXME do a discont, flush event */
|
/* FIXME do a discont, flush event */
|
||||||
GST_DEBUG (0,"new seek\n");
|
GST_DEBUG (0,"new seek");
|
||||||
src->new_seek = FALSE;
|
src->new_seek = FALSE;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -354,7 +354,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||||||
{
|
{
|
||||||
result = gnome_vfs_seek(src->handle,
|
result = gnome_vfs_seek(src->handle,
|
||||||
GNOME_VFS_SEEK_START, src->curoffset);
|
GNOME_VFS_SEEK_START, src->curoffset);
|
||||||
GST_DEBUG(0, "new_seek: %s\n",
|
GST_DEBUG(0, "new_seek: %s",
|
||||||
gnome_vfs_result_to_string(result));
|
gnome_vfs_result_to_string(result));
|
||||||
/* FIXME do a discont, flush event */
|
/* FIXME do a discont, flush event */
|
||||||
src->new_seek = FALSE;
|
src->new_seek = FALSE;
|
||||||
@ -363,7 +363,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||||||
result = gnome_vfs_read(src->handle, GST_BUFFER_DATA(buf),
|
result = gnome_vfs_read(src->handle, GST_BUFFER_DATA(buf),
|
||||||
src->bytes_per_read, &readbytes);
|
src->bytes_per_read, &readbytes);
|
||||||
|
|
||||||
GST_DEBUG(0, "read: %s, readbytes: %Lu\n",
|
GST_DEBUG(0, "read: %s, readbytes: %Lu",
|
||||||
gnome_vfs_result_to_string(result), readbytes);
|
gnome_vfs_result_to_string(result), readbytes);
|
||||||
/* deal with EOS */
|
/* deal with EOS */
|
||||||
if (readbytes == 0)
|
if (readbytes == 0)
|
||||||
@ -466,7 +466,7 @@ static gboolean gst_gnomevfssrc_open_file(GstGnomeVFSSrc *src)
|
|||||||
gnome_vfs_file_info_unref(info);
|
gnome_vfs_file_info_unref(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG(0, "open %s\n", gnome_vfs_result_to_string(result));
|
GST_DEBUG(0, "open %s", gnome_vfs_result_to_string(result));
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_FLAG_SET(src, GST_GNOMEVFSSRC_OPEN);
|
GST_FLAG_SET(src, GST_GNOMEVFSSRC_OPEN);
|
||||||
|
@ -155,7 +155,7 @@ gst_vorbisdec_pull (VorbisDec * vorbisdec, ogg_sync_state * oy)
|
|||||||
GstBuffer *buf;
|
GstBuffer *buf;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
GST_DEBUG (0, "vorbisdec: pull \n");
|
GST_DEBUG (0, "vorbisdec: pull ");
|
||||||
|
|
||||||
buf = gst_pad_pull (vorbisdec->sinkpad);
|
buf = gst_pad_pull (vorbisdec->sinkpad);
|
||||||
|
|
||||||
@ -172,7 +172,7 @@ gst_vorbisdec_pull (VorbisDec * vorbisdec, ogg_sync_state * oy)
|
|||||||
}
|
}
|
||||||
} while (buf == NULL);
|
} while (buf == NULL);
|
||||||
|
|
||||||
GST_DEBUG (0, "vorbisdec: pull done\n");
|
GST_DEBUG (0, "vorbisdec: pull done");
|
||||||
|
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
@ -429,9 +429,9 @@ gst_vorbisdec_loop (GstElement * element)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG (0, "vorbisdec: push\n");
|
GST_DEBUG (0, "vorbisdec: push");
|
||||||
gst_pad_push (vorbisdec->srcpad, outbuf);
|
gst_pad_push (vorbisdec->srcpad, outbuf);
|
||||||
GST_DEBUG (0, "vorbisdec: push done\n");
|
GST_DEBUG (0, "vorbisdec: push done");
|
||||||
|
|
||||||
vorbis_synthesis_read (&vd, bout); /* tell libvorbis how
|
vorbis_synthesis_read (&vd, bout); /* tell libvorbis how
|
||||||
many samples we
|
many samples we
|
||||||
|
@ -287,7 +287,7 @@ gst_vorbisenc_chain (GstPad * pad, GstBuffer * buf)
|
|||||||
memcpy (GST_BUFFER_DATA (outbuf) + vorbisenc->og.header_len, vorbisenc->og.body,
|
memcpy (GST_BUFFER_DATA (outbuf) + vorbisenc->og.header_len, vorbisenc->og.body,
|
||||||
vorbisenc->og.body_len);
|
vorbisenc->og.body_len);
|
||||||
|
|
||||||
GST_DEBUG (0, "vorbisenc: encoded buffer of %d bytes\n", GST_BUFFER_SIZE (outbuf));
|
GST_DEBUG (0, "vorbisenc: encoded buffer of %d bytes", GST_BUFFER_SIZE (outbuf));
|
||||||
|
|
||||||
gst_pad_push (vorbisenc->srcpad, outbuf);
|
gst_pad_push (vorbisenc->srcpad, outbuf);
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ GstRiff *gst_riff_encoder_new(guint32 type) {
|
|||||||
GstRiff *riff;
|
GstRiff *riff;
|
||||||
gst_riff_list *list;
|
gst_riff_list *list;
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_encoder: making %4.4s encoder\n", (char *)&type);
|
GST_DEBUG (0,"gst_riff_encoder: making %4.4s encoder", (char *)&type);
|
||||||
riff = (GstRiff *)g_malloc(sizeof(GstRiff));
|
riff = (GstRiff *)g_malloc(sizeof(GstRiff));
|
||||||
g_return_val_if_fail(riff != NULL, NULL);
|
g_return_val_if_fail(riff != NULL, NULL);
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ gint gst_riff_encoder_avih(GstRiff *riff, gst_riff_avih *head, gulong size) {
|
|||||||
|
|
||||||
g_return_val_if_fail(riff->state == GST_RIFF_STATE_INITIAL, GST_RIFF_EINVAL);
|
g_return_val_if_fail(riff->state == GST_RIFF_STATE_INITIAL, GST_RIFF_EINVAL);
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_encoder: add avih\n");
|
GST_DEBUG (0,"gst_riff_encoder: add avih");
|
||||||
|
|
||||||
ADD_LIST(riff, 0xB8, GST_RIFF_LIST_hdrl);
|
ADD_LIST(riff, 0xB8, GST_RIFF_LIST_hdrl);
|
||||||
|
|
||||||
@ -96,7 +96,7 @@ gint gst_riff_encoder_strh(GstRiff *riff, guint32 fcc_type, gst_riff_strh *head,
|
|||||||
g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASAVIH ||
|
g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASAVIH ||
|
||||||
riff->state == GST_RIFF_STATE_HASSTRF, GST_RIFF_EINVAL);
|
riff->state == GST_RIFF_STATE_HASSTRF, GST_RIFF_EINVAL);
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_encoder: add strh type %08x (%4.4s)\n", fcc_type, (char *)&fcc_type);
|
GST_DEBUG (0,"gst_riff_encoder: add strh type %08x (%4.4s)", fcc_type, (char *)&fcc_type);
|
||||||
|
|
||||||
ADD_LIST(riff, 108, GST_RIFF_LIST_strl);
|
ADD_LIST(riff, 108, GST_RIFF_LIST_strl);
|
||||||
|
|
||||||
@ -117,7 +117,7 @@ gint gst_riff_encoder_strf(GstRiff *riff, void *format, gulong size) {
|
|||||||
|
|
||||||
g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASSTRH, GST_RIFF_EINVAL);
|
g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASSTRH, GST_RIFF_EINVAL);
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_encoder: add strf\n");
|
GST_DEBUG (0,"gst_riff_encoder: add strf");
|
||||||
|
|
||||||
ADD_CHUNK(riff, GST_RIFF_TAG_strf, size);
|
ADD_CHUNK(riff, GST_RIFF_TAG_strf, size);
|
||||||
|
|
||||||
@ -140,7 +140,7 @@ gint gst_riff_encoder_chunk(GstRiff *riff, guint32 chunk_type, void *chunkdata,
|
|||||||
riff->state = GST_RIFF_STATE_MOVI;
|
riff->state = GST_RIFF_STATE_MOVI;
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_encoder: add chunk type %08x (%4.4s)\n", chunk_type, (char *)&chunk_type);
|
GST_DEBUG (0,"gst_riff_encoder: add chunk type %08x (%4.4s)", chunk_type, (char *)&chunk_type);
|
||||||
|
|
||||||
ADD_CHUNK(riff, chunk_type, size);
|
ADD_CHUNK(riff, chunk_type, size);
|
||||||
|
|
||||||
|
@ -56,12 +56,12 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
size = GST_BUFFER_SIZE(buf);
|
size = GST_BUFFER_SIZE(buf);
|
||||||
last = off + size;
|
last = off + size;
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_parser: offset new buffer 0x%08lx size 0x%08x\n", off, GST_BUFFER_SIZE(buf));
|
GST_DEBUG (0,"gst_riff_parser: offset new buffer 0x%08lx size 0x%08x", off, GST_BUFFER_SIZE(buf));
|
||||||
|
|
||||||
if (riff->dataleft) {
|
if (riff->dataleft) {
|
||||||
gulong newsize;
|
gulong newsize;
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_parser: recovering left data\n");
|
GST_DEBUG (0,"gst_riff_parser: recovering left data");
|
||||||
newsize = riff->dataleft_size + size;
|
newsize = riff->dataleft_size + size;
|
||||||
riff->dataleft = g_realloc(riff->dataleft, newsize);
|
riff->dataleft = g_realloc(riff->dataleft, newsize);
|
||||||
memcpy(riff->dataleft+riff->dataleft_size, GST_BUFFER_DATA(buf), size);
|
memcpy(riff->dataleft+riff->dataleft_size, GST_BUFFER_DATA(buf), size);
|
||||||
@ -100,10 +100,10 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
/* if we have an incomplete chunk from the previous buffer */
|
/* if we have an incomplete chunk from the previous buffer */
|
||||||
if (riff->incomplete_chunk) {
|
if (riff->incomplete_chunk) {
|
||||||
guint leftover;
|
guint leftover;
|
||||||
GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled\n", riff->incomplete_chunk_size);
|
GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled", riff->incomplete_chunk_size);
|
||||||
leftover = riff->incomplete_chunk->size - riff->incomplete_chunk_size;
|
leftover = riff->incomplete_chunk->size - riff->incomplete_chunk_size;
|
||||||
if (leftover <= size) {
|
if (leftover <= size) {
|
||||||
GST_DEBUG (0,"gst_riff_parser: we can fill it from %08x with %08x bytes = %08x\n",
|
GST_DEBUG (0,"gst_riff_parser: we can fill it from %08x with %08x bytes = %08x",
|
||||||
riff->incomplete_chunk_size, leftover,
|
riff->incomplete_chunk_size, leftover,
|
||||||
riff->incomplete_chunk_size+leftover);
|
riff->incomplete_chunk_size+leftover);
|
||||||
memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), leftover);
|
memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), leftover);
|
||||||
@ -116,7 +116,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
riff->incomplete_chunk = NULL;
|
riff->incomplete_chunk = NULL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
GST_DEBUG (0,"gst_riff_parser: we cannot fill it %08x >= %08lx\n", leftover, size);
|
GST_DEBUG (0,"gst_riff_parser: we cannot fill it %08x >= %08lx", leftover, size);
|
||||||
memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), size);
|
memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), size);
|
||||||
riff->incomplete_chunk_size += size;
|
riff->incomplete_chunk_size += size;
|
||||||
return 0;
|
return 0;
|
||||||
@ -125,7 +125,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
|
|
||||||
if (riff->nextlikely & 0x01) riff->nextlikely++;
|
if (riff->nextlikely & 0x01) riff->nextlikely++;
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08lx\n",riff->nextlikely, last, off);
|
GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08lx",riff->nextlikely, last, off);
|
||||||
/* loop while the next likely chunk header is in this buffer */
|
/* loop while the next likely chunk header is in this buffer */
|
||||||
while ((riff->nextlikely+12) <= last) {
|
while ((riff->nextlikely+12) <= last) {
|
||||||
guint32 *words = (guint32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off );
|
guint32 *words = (guint32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off );
|
||||||
@ -134,17 +134,17 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
while (riff->chunks) {
|
while (riff->chunks) {
|
||||||
chunk = g_list_nth_data(riff->chunks, 0);
|
chunk = g_list_nth_data(riff->chunks, 0);
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_parser: next 0x%08x offset 0x%08lx size 0x%08x\n",riff->nextlikely,
|
GST_DEBUG (0,"gst_riff_parser: next 0x%08x offset 0x%08lx size 0x%08x",riff->nextlikely,
|
||||||
chunk->offset, chunk->size);
|
chunk->offset, chunk->size);
|
||||||
if (riff->nextlikely >= chunk->offset+chunk->size) {
|
if (riff->nextlikely >= chunk->offset+chunk->size) {
|
||||||
GST_DEBUG (0,"gst_riff_parser: found END LIST\n");
|
GST_DEBUG (0,"gst_riff_parser: found END LIST");
|
||||||
/* we have the end of the chunk on the stack, remove it */
|
/* we have the end of the chunk on the stack, remove it */
|
||||||
riff->chunks = g_list_remove(riff->chunks, chunk);
|
riff->chunks = g_list_remove(riff->chunks, chunk);
|
||||||
}
|
}
|
||||||
else break;
|
else break;
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_parser: next likely chunk is at offset 0x%08x\n",riff->nextlikely);
|
GST_DEBUG (0,"gst_riff_parser: next likely chunk is at offset 0x%08x",riff->nextlikely);
|
||||||
|
|
||||||
chunk = (GstRiffChunk *)g_malloc(sizeof(GstRiffChunk));
|
chunk = (GstRiffChunk *)g_malloc(sizeof(GstRiffChunk));
|
||||||
g_return_val_if_fail(chunk != NULL, GST_RIFF_ENOMEM);
|
g_return_val_if_fail(chunk != NULL, GST_RIFF_ENOMEM);
|
||||||
@ -159,7 +159,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
|
|
||||||
|
|
||||||
if (chunk->id == GST_RIFF_TAG_LIST) {
|
if (chunk->id == GST_RIFF_TAG_LIST) {
|
||||||
GST_DEBUG (0,"found LIST %s\n", gst_riff_id_to_fourcc(chunk->form));
|
GST_DEBUG (0,"found LIST %s", gst_riff_id_to_fourcc(chunk->form));
|
||||||
riff->nextlikely += 12;
|
riff->nextlikely += 12;
|
||||||
/* we push the list chunk on our 'stack' */
|
/* we push the list chunk on our 'stack' */
|
||||||
riff->chunks = g_list_prepend(riff->chunks,chunk);
|
riff->chunks = g_list_prepend(riff->chunks,chunk);
|
||||||
@ -170,7 +170,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_riff_parser: chunk id offset %08x is 0x%08x '%s' and is 0x%08x long\n",
|
GST_DEBUG (0,"gst_riff_parser: chunk id offset %08x is 0x%08x '%s' and is 0x%08x long",
|
||||||
riff->nextlikely, GUINT32_FROM_LE (words[0]),
|
riff->nextlikely, GUINT32_FROM_LE (words[0]),
|
||||||
gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1]));
|
gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1]));
|
||||||
|
|
||||||
@ -179,7 +179,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
if (riff->nextlikely > last) {
|
if (riff->nextlikely > last) {
|
||||||
guint left = size - (riff->nextlikely - chunk->size - off);
|
guint left = size - (riff->nextlikely - chunk->size - off);
|
||||||
|
|
||||||
GST_DEBUG (0,"make incomplete buffer %08x\n", left);
|
GST_DEBUG (0,"make incomplete buffer %08x", left);
|
||||||
chunk->data = g_malloc(chunk->size);
|
chunk->data = g_malloc(chunk->size);
|
||||||
memcpy(chunk->data, (gchar *)(words+2), left);
|
memcpy(chunk->data, (gchar *)(words+2), left);
|
||||||
riff->incomplete_chunk = chunk;
|
riff->incomplete_chunk = chunk;
|
||||||
@ -199,7 +199,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||||||
}
|
}
|
||||||
if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) {
|
if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) {
|
||||||
guint left = last - riff->nextlikely;
|
guint left = last - riff->nextlikely;
|
||||||
GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08lx\n",riff->nextlikely,
|
GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08lx",riff->nextlikely,
|
||||||
last, left, off);
|
last, left, off);
|
||||||
|
|
||||||
riff->dataleft = g_malloc(left);
|
riff->dataleft = g_malloc(left);
|
||||||
|
@ -58,8 +58,8 @@ GST_PADTEMPLATE_FACTORY (gst_adder_src_template_factory,
|
|||||||
"law", GST_PROPS_INT (0),
|
"law", GST_PROPS_INT (0),
|
||||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||||
"signed", GST_PROPS_BOOLEAN (TRUE),
|
"signed", GST_PROPS_BOOLEAN (TRUE),
|
||||||
"width", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_LIST (16)),
|
"width", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_INT (16)),
|
||||||
"depth", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_LIST (16)),
|
"depth", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_INT (16)),
|
||||||
"rate", GST_PROPS_INT_RANGE (4000, 48000), /* FIXME */
|
"rate", GST_PROPS_INT_RANGE (4000, 48000), /* FIXME */
|
||||||
"channels", GST_PROPS_INT_RANGE (1, 2)
|
"channels", GST_PROPS_INT_RANGE (1, 2)
|
||||||
),
|
),
|
||||||
@ -86,8 +86,8 @@ GST_PADTEMPLATE_FACTORY (gst_adder_sink_template_factory,
|
|||||||
"law", GST_PROPS_INT (0),
|
"law", GST_PROPS_INT (0),
|
||||||
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
|
||||||
"signed", GST_PROPS_BOOLEAN (TRUE),
|
"signed", GST_PROPS_BOOLEAN (TRUE),
|
||||||
"width", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_LIST (16)),
|
"width", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_INT (16)),
|
||||||
"depth", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_LIST (16)),
|
"depth", GST_PROPS_LIST (GST_PROPS_INT (8), GST_PROPS_INT (16)),
|
||||||
"rate", GST_PROPS_INT_RANGE (4000, 48000), /* FIXME */
|
"rate", GST_PROPS_INT_RANGE (4000, 48000), /* FIXME */
|
||||||
"channels", GST_PROPS_INT_RANGE (1, 2)
|
"channels", GST_PROPS_INT_RANGE (1, 2)
|
||||||
),
|
),
|
||||||
@ -207,7 +207,7 @@ gst_adder_connect (GstPad *pad, GstCaps *caps)
|
|||||||
p = (GstPad*) sinkpads->data;
|
p = (GstPad*) sinkpads->data;
|
||||||
if (p != pad && p != adder->srcpad) {
|
if (p != pad && p != adder->srcpad) {
|
||||||
if (!gst_pad_try_set_caps (p, caps)) {
|
if (!gst_pad_try_set_caps (p, caps)) {
|
||||||
GST_DEBUG (0, "caps mismatch; disconnecting and removing pad %s:%s (peer %s:%s)\n",
|
GST_DEBUG (0, "caps mismatch; disconnecting and removing pad %s:%s (peer %s:%s)",
|
||||||
GST_DEBUG_PAD_NAME (p), GST_DEBUG_PAD_NAME (GST_PAD_PEER (p)));
|
GST_DEBUG_PAD_NAME (p), GST_DEBUG_PAD_NAME (GST_PAD_PEER (p)));
|
||||||
gst_pad_disconnect (GST_PAD (GST_PAD_PEER (p)), p);
|
gst_pad_disconnect (GST_PAD (GST_PAD_PEER (p)), p);
|
||||||
remove = g_list_prepend (remove, p);
|
remove = g_list_prepend (remove, p);
|
||||||
@ -386,12 +386,12 @@ gst_adder_loop (GstElement *element)
|
|||||||
/* get data from all of the sinks */
|
/* get data from all of the sinks */
|
||||||
inputs = adder->input_channels;
|
inputs = adder->input_channels;
|
||||||
|
|
||||||
GST_DEBUG (0, "starting to cycle through channels\n");
|
GST_DEBUG (0, "starting to cycle through channels");
|
||||||
|
|
||||||
while (inputs) {
|
while (inputs) {
|
||||||
input = (GstAdderInputChannel *) inputs->data;
|
input = (GstAdderInputChannel *) inputs->data;
|
||||||
|
|
||||||
GST_DEBUG (0, "looking into channel %p\n", input);
|
GST_DEBUG (0, "looking into channel %p", input);
|
||||||
|
|
||||||
/* get data from the bytestream of each input channel. we need to check for
|
/* get data from the bytestream of each input channel. we need to check for
|
||||||
events before passing on the data to the output buffer. */
|
events before passing on the data to the output buffer. */
|
||||||
@ -406,7 +406,7 @@ gst_adder_loop (GstElement *element)
|
|||||||
/* if we get an EOS event from one of our sink pads, we assume that
|
/* if we get an EOS event from one of our sink pads, we assume that
|
||||||
pad's finished handling data. delete the bytestream, free up the
|
pad's finished handling data. delete the bytestream, free up the
|
||||||
pad, and free up the memory associated with the input channel. */
|
pad, and free up the memory associated with the input channel. */
|
||||||
GST_DEBUG (0, "got an EOS event\n");
|
GST_DEBUG (0, "got an EOS event");
|
||||||
|
|
||||||
gst_bytestream_destroy (input->bytestream);
|
gst_bytestream_destroy (input->bytestream);
|
||||||
/* gst_object_unref (GST_OBJECT (input->sinkpad)); this causes problems */
|
/* gst_object_unref (GST_OBJECT (input->sinkpad)); this causes problems */
|
||||||
@ -422,7 +422,7 @@ gst_adder_loop (GstElement *element)
|
|||||||
/* here's where the data gets copied. this is a little nasty looking
|
/* here's where the data gets copied. this is a little nasty looking
|
||||||
because it's the same code pretty much 3 times, except each time uses
|
because it's the same code pretty much 3 times, except each time uses
|
||||||
different data types and clamp limits. */
|
different data types and clamp limits. */
|
||||||
GST_DEBUG (0, "copying %d bytes from channel %p to output data %p in buffer %p\n",
|
GST_DEBUG (0, "copying %d bytes from channel %p to output data %p in buffer %p",
|
||||||
GST_BUFFER_SIZE (buf_out), input, GST_BUFFER_DATA (buf_out), buf_out);
|
GST_BUFFER_SIZE (buf_out), input, GST_BUFFER_DATA (buf_out), buf_out);
|
||||||
|
|
||||||
if (adder->format == GST_ADDER_FORMAT_INT) {
|
if (adder->format == GST_ADDER_FORMAT_INT) {
|
||||||
@ -450,7 +450,7 @@ gst_adder_loop (GstElement *element)
|
|||||||
|
|
||||||
gst_bytestream_flush (input->bytestream, GST_BUFFER_SIZE (buf_out));
|
gst_bytestream_flush (input->bytestream, GST_BUFFER_SIZE (buf_out));
|
||||||
|
|
||||||
GST_DEBUG (0, "done copying data\n");
|
GST_DEBUG (0, "done copying data");
|
||||||
}
|
}
|
||||||
|
|
||||||
inputs = g_slist_next (inputs);
|
inputs = g_slist_next (inputs);
|
||||||
@ -458,7 +458,7 @@ gst_adder_loop (GstElement *element)
|
|||||||
|
|
||||||
/* send it out */
|
/* send it out */
|
||||||
|
|
||||||
GST_DEBUG (0, "pushing buf_out\n");
|
GST_DEBUG (0, "pushing buf_out");
|
||||||
gst_pad_push (adder->srcpad, buf_out);
|
gst_pad_push (adder->srcpad, buf_out);
|
||||||
|
|
||||||
} while (TRUE);
|
} while (TRUE);
|
||||||
|
@ -380,7 +380,7 @@ gst_sinesrc_update_freq(GValue *value, gpointer data)
|
|||||||
src->freq = g_value_get_float(value);
|
src->freq = g_value_get_float(value);
|
||||||
src->table_inc = src->table_size * src->freq / src->samplerate;
|
src->table_inc = src->table_size * src->freq / src->samplerate;
|
||||||
|
|
||||||
/*GST_DEBUG(GST_CAT_PARAMS, "freq %f\n", src->freq); */
|
/*GST_DEBUG(GST_CAT_PARAMS, "freq %f", src->freq); */
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
|
@ -151,7 +151,7 @@ videoscale_negotiate_src (GstPad *pad, GstCaps **caps, gpointer *data)
|
|||||||
{
|
{
|
||||||
GstVideoscale *videoscale = GST_VIDEOSCALE (gst_pad_get_parent (pad));
|
GstVideoscale *videoscale = GST_VIDEOSCALE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
GST_DEBUG(0,"videoscale_negotiate_src\n");
|
GST_DEBUG(0,"videoscale_negotiate_src");
|
||||||
|
|
||||||
if(*caps==NULL){
|
if(*caps==NULL){
|
||||||
return GST_PAD_NEGOTIATE_FAIL;
|
return GST_PAD_NEGOTIATE_FAIL;
|
||||||
@ -170,7 +170,7 @@ videoscale_negotiate_src (GstPad *pad, GstCaps **caps, gpointer *data)
|
|||||||
static GstPadNegotiateReturn
|
static GstPadNegotiateReturn
|
||||||
videoscale_negotiate_sink (GstPad *pad, GstCaps **caps, gpointer *data)
|
videoscale_negotiate_sink (GstPad *pad, GstCaps **caps, gpointer *data)
|
||||||
{
|
{
|
||||||
GST_DEBUG(0,"videoscale_negotiate_sink\n");
|
GST_DEBUG(0,"videoscale_negotiate_sink");
|
||||||
|
|
||||||
if (*caps==NULL)
|
if (*caps==NULL)
|
||||||
return GST_PAD_NEGOTIATE_FAIL;
|
return GST_PAD_NEGOTIATE_FAIL;
|
||||||
@ -184,7 +184,7 @@ gst_videoscale_sinkconnect (GstPad *pad, GstCaps *caps)
|
|||||||
{
|
{
|
||||||
GstVideoscale *videoscale;
|
GstVideoscale *videoscale;
|
||||||
|
|
||||||
GST_DEBUG(0,"gst_videoscale_sinkconnect\n");
|
GST_DEBUG(0,"gst_videoscale_sinkconnect");
|
||||||
videoscale = GST_VIDEOSCALE (gst_pad_get_parent (pad));
|
videoscale = GST_VIDEOSCALE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
if (!GST_CAPS_IS_FIXED (caps)) {
|
if (!GST_CAPS_IS_FIXED (caps)) {
|
||||||
@ -197,10 +197,10 @@ gst_videoscale_sinkconnect (GstPad *pad, GstCaps *caps)
|
|||||||
|
|
||||||
gst_videoscale_setup(videoscale);
|
gst_videoscale_setup(videoscale);
|
||||||
|
|
||||||
GST_DEBUG (0,"target size %d x %d\n",videoscale->targetwidth,
|
GST_DEBUG (0,"target size %d x %d",videoscale->targetwidth,
|
||||||
videoscale->targetheight);
|
videoscale->targetheight);
|
||||||
|
|
||||||
GST_DEBUG(0,"width %d\n",videoscale->targetwidth);
|
GST_DEBUG(0,"width %d",videoscale->targetwidth);
|
||||||
gst_pad_try_set_caps (videoscale->srcpad,
|
gst_pad_try_set_caps (videoscale->srcpad,
|
||||||
GST_CAPS_NEW (
|
GST_CAPS_NEW (
|
||||||
"videoscale_src",
|
"videoscale_src",
|
||||||
@ -216,7 +216,7 @@ gst_videoscale_sinkconnect (GstPad *pad, GstCaps *caps)
|
|||||||
static void
|
static void
|
||||||
gst_videoscale_init (GstVideoscale *videoscale)
|
gst_videoscale_init (GstVideoscale *videoscale)
|
||||||
{
|
{
|
||||||
GST_DEBUG(0,"gst_videoscale_init\n");
|
GST_DEBUG(0,"gst_videoscale_init");
|
||||||
videoscale->sinkpad = gst_pad_new_from_template (
|
videoscale->sinkpad = gst_pad_new_from_template (
|
||||||
GST_PADTEMPLATE_GET (sink_templ), "sink");
|
GST_PADTEMPLATE_GET (sink_templ), "sink");
|
||||||
/*gst_pad_set_negotiate_function(videoscale->sinkpad,videoscale_negotiate_sink); */
|
/*gst_pad_set_negotiate_function(videoscale->sinkpad,videoscale_negotiate_sink); */
|
||||||
@ -245,7 +245,7 @@ gst_videoscale_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
gulong size;
|
gulong size;
|
||||||
GstBuffer *outbuf;
|
GstBuffer *outbuf;
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_videoscale_chain\n");
|
GST_DEBUG (0,"gst_videoscale_chain");
|
||||||
|
|
||||||
g_return_if_fail (pad != NULL);
|
g_return_if_fail (pad != NULL);
|
||||||
g_return_if_fail (GST_IS_PAD (pad));
|
g_return_if_fail (GST_IS_PAD (pad));
|
||||||
@ -259,10 +259,10 @@ gst_videoscale_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
videoscale->format = gst_caps_get_int (gst_pad_get_caps(pad), "format");
|
videoscale->format = gst_caps_get_int (gst_pad_get_caps(pad), "format");
|
||||||
gst_videoscale_setup(videoscale);
|
gst_videoscale_setup(videoscale);
|
||||||
}
|
}
|
||||||
GST_DEBUG (0,"gst_videoscale_chain: got buffer of %ld bytes in '%s'\n",size,
|
GST_DEBUG (0,"gst_videoscale_chain: got buffer of %ld bytes in '%s'",size,
|
||||||
GST_OBJECT_NAME (videoscale));
|
GST_OBJECT_NAME (videoscale));
|
||||||
|
|
||||||
GST_DEBUG(0,"size=%ld from=%dx%d to=%dx%d newsize=%d\n",
|
GST_DEBUG(0,"size=%ld from=%dx%d to=%dx%d newsize=%d",
|
||||||
size,
|
size,
|
||||||
videoscale->width, videoscale->height,
|
videoscale->width, videoscale->height,
|
||||||
videoscale->targetwidth, videoscale->targetheight,
|
videoscale->targetwidth, videoscale->targetheight,
|
||||||
@ -278,7 +278,7 @@ GST_DEBUG(0,"size=%ld from=%dx%d to=%dx%d newsize=%d\n",
|
|||||||
/*g_return_if_fail(videoscale->scale_cc != NULL); */
|
/*g_return_if_fail(videoscale->scale_cc != NULL); */
|
||||||
videoscale->scale_cc(videoscale, data, GST_BUFFER_DATA(outbuf));
|
videoscale->scale_cc(videoscale, data, GST_BUFFER_DATA(outbuf));
|
||||||
|
|
||||||
GST_DEBUG (0,"gst_videoscale_chain: pushing buffer of %d bytes in '%s'\n",GST_BUFFER_SIZE(outbuf),
|
GST_DEBUG (0,"gst_videoscale_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf),
|
||||||
GST_OBJECT_NAME (videoscale));
|
GST_OBJECT_NAME (videoscale));
|
||||||
|
|
||||||
gst_pad_push(videoscale->srcpad, outbuf);
|
gst_pad_push(videoscale->srcpad, outbuf);
|
||||||
@ -295,7 +295,7 @@ gst_videoscale_set_property (GObject *object, guint prop_id, const GValue *value
|
|||||||
g_return_if_fail(GST_IS_VIDEOSCALE(object));
|
g_return_if_fail(GST_IS_VIDEOSCALE(object));
|
||||||
src = GST_VIDEOSCALE(object);
|
src = GST_VIDEOSCALE(object);
|
||||||
|
|
||||||
GST_DEBUG(0,"gst_videoscale_set_property\n");
|
GST_DEBUG(0,"gst_videoscale_set_property");
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
case ARG_WIDTH:
|
case ARG_WIDTH:
|
||||||
src->targetwidth = g_value_get_int (value);
|
src->targetwidth = g_value_get_int (value);
|
||||||
|
@ -64,7 +64,7 @@ gst_videoscale_setup (GstVideoscale *scale)
|
|||||||
switch (scale->method) {
|
switch (scale->method) {
|
||||||
case GST_VIDEOSCALE_POINT_SAMPLE:
|
case GST_VIDEOSCALE_POINT_SAMPLE:
|
||||||
scale->scaler = gst_videoscale_scale_point_sample;
|
scale->scaler = gst_videoscale_scale_point_sample;
|
||||||
GST_DEBUG (0,"videoscale: scaling method POINT_SAMPLE\n");
|
GST_DEBUG (0,"videoscale: scaling method POINT_SAMPLE");
|
||||||
break;
|
break;
|
||||||
case GST_VIDEOSCALE_NEAREST:
|
case GST_VIDEOSCALE_NEAREST:
|
||||||
#ifdef HAVE_CPU_I386
|
#ifdef HAVE_CPU_I386
|
||||||
@ -74,17 +74,17 @@ gst_videoscale_setup (GstVideoscale *scale)
|
|||||||
#else
|
#else
|
||||||
scale->scaler = gst_videoscale_scale_nearest;
|
scale->scaler = gst_videoscale_scale_nearest;
|
||||||
#endif
|
#endif
|
||||||
GST_DEBUG (0,"videoscale: scaling method NEAREST\n");
|
GST_DEBUG (0,"videoscale: scaling method NEAREST");
|
||||||
break;
|
break;
|
||||||
case GST_VIDEOSCALE_BILINEAR:
|
case GST_VIDEOSCALE_BILINEAR:
|
||||||
scale->scaler = gst_videoscale_scale_plane_slow;
|
scale->scaler = gst_videoscale_scale_plane_slow;
|
||||||
scale->filter = gst_videoscale_bilinear;
|
scale->filter = gst_videoscale_bilinear;
|
||||||
GST_DEBUG (0,"videoscale: scaling method BILINEAR\n");
|
GST_DEBUG (0,"videoscale: scaling method BILINEAR");
|
||||||
break;
|
break;
|
||||||
case GST_VIDEOSCALE_BICUBIC:
|
case GST_VIDEOSCALE_BICUBIC:
|
||||||
scale->scaler = gst_videoscale_scale_plane_slow;
|
scale->scaler = gst_videoscale_scale_plane_slow;
|
||||||
scale->filter = gst_videoscale_bicubic;
|
scale->filter = gst_videoscale_bicubic;
|
||||||
GST_DEBUG (0,"videoscale: scaling method BICUBIC\n");
|
GST_DEBUG (0,"videoscale: scaling method BICUBIC");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_print("videoscale: unsupported scaling method %d\n", scale->method);
|
g_print("videoscale: unsupported scaling method %d\n", scale->method);
|
||||||
@ -101,7 +101,7 @@ gst_videoscale_scale_rgb (GstVideoscale *scale, unsigned char *src, unsigned cha
|
|||||||
int sh = scale->height;
|
int sh = scale->height;
|
||||||
int dw = scale->targetwidth;
|
int dw = scale->targetwidth;
|
||||||
int dh = scale->targetheight;
|
int dh = scale->targetheight;
|
||||||
GST_DEBUG (0,"videoscale: scaling RGB %dx%d to %dx%d\n", sw, sh, dw, dh);
|
GST_DEBUG (0,"videoscale: scaling RGB %dx%d to %dx%d", sw, sh, dw, dh);
|
||||||
|
|
||||||
switch (scale->scale_bytes) {
|
switch (scale->scale_bytes) {
|
||||||
case 2:
|
case 2:
|
||||||
@ -116,7 +116,7 @@ gst_videoscale_scale_rgb (GstVideoscale *scale, unsigned char *src, unsigned cha
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: %p %p\n", src, dest);
|
GST_DEBUG (0,"videoscale: %p %p", src, dest);
|
||||||
scale->scaler(scale, src, dest, sw, sh, dw, dh);
|
scale->scaler(scale, src, dest, sw, sh, dw, dh);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ gst_videoscale_scale_yuv (GstVideoscale *scale, unsigned char *src, unsigned cha
|
|||||||
int dw = scale->targetwidth;
|
int dw = scale->targetwidth;
|
||||||
int dh = scale->targetheight;
|
int dh = scale->targetheight;
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: scaling YUV420P %dx%d to %dx%d\n", sw, sh, dw, dh);
|
GST_DEBUG (0,"videoscale: scaling YUV420P %dx%d to %dx%d", sw, sh, dw, dh);
|
||||||
|
|
||||||
scale->scaler(scale, src, dest, sw, sh, dw, dh);
|
scale->scaler(scale, src, dest, sw, sh, dw, dh);
|
||||||
|
|
||||||
@ -160,7 +160,7 @@ gst_videoscale_bilinear (unsigned char *src, double x, double y, int sw, int sh)
|
|||||||
double dest;
|
double dest;
|
||||||
int color;
|
int color;
|
||||||
|
|
||||||
GST_DEBUG(0,"videoscale: scaling bilinear %f %f %dx%d\n", x, y, sw, sh);
|
GST_DEBUG(0,"videoscale: scaling bilinear %f %f %dx%d", x, y, sw, sh);
|
||||||
|
|
||||||
dest=(1-a)*(1-b)*RC(j,k)+
|
dest=(1-a)*(1-b)*RC(j,k)+
|
||||||
a*(1-b)*RC(j+1,k);
|
a*(1-b)*RC(j+1,k);
|
||||||
@ -189,7 +189,7 @@ gst_videoscale_bicubic (unsigned char *src, double x, double y, int sw, int sh)
|
|||||||
double t1, t2, t3, t4;
|
double t1, t2, t3, t4;
|
||||||
double a1, a2, a3, a4;
|
double a1, a2, a3, a4;
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: scaling bicubic %dx%d\n", sw, sh);
|
GST_DEBUG (0,"videoscale: scaling bicubic %dx%d", sw, sh);
|
||||||
|
|
||||||
a1 = -a*(1-a)*(1-a);
|
a1 = -a*(1-a)*(1-a);
|
||||||
a2 = (1-2*a*a+a*a*a);
|
a2 = (1-2*a*a+a*a*a);
|
||||||
@ -222,17 +222,17 @@ gst_videoscale_scale_plane_slow (GstVideoscale *scale, unsigned char *src, unsig
|
|||||||
double xr, yr;
|
double xr, yr;
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: scale plane slow %dx%d %dx%d %g %g %p %p\n", sw, sh, dw, dh, zoomx, zoomy, src, dest);
|
GST_DEBUG (0,"videoscale: scale plane slow %dx%d %dx%d %g %g %p %p", sw, sh, dw, dh, zoomx, zoomy, src, dest);
|
||||||
|
|
||||||
for (y=0; y<dh; y++) {
|
for (y=0; y<dh; y++) {
|
||||||
yr = ((double)y)/zoomy;
|
yr = ((double)y)/zoomy;
|
||||||
for (x=0; x<dw; x++) {
|
for (x=0; x<dw; x++) {
|
||||||
xr = ((double)x)/zoomx;
|
xr = ((double)x)/zoomx;
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: scale plane slow %g %g %p\n", xr, yr, (src+(int)(x)+(int)((y)*sw)));
|
GST_DEBUG (0,"videoscale: scale plane slow %g %g %p", xr, yr, (src+(int)(x)+(int)((y)*sw)));
|
||||||
|
|
||||||
if (floor(xr) == xr && floor(yr) == yr){
|
if (floor(xr) == xr && floor(yr) == yr){
|
||||||
GST_DEBUG (0,"videoscale: scale plane %g %g %p %p\n", xr, yr, (src+(int)(x)+(int)((y)*sw)), dest);
|
GST_DEBUG (0,"videoscale: scale plane %g %g %p %p", xr, yr, (src+(int)(x)+(int)((y)*sw)), dest);
|
||||||
*dest++ = RC(xr, yr);
|
*dest++ = RC(xr, yr);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -252,7 +252,7 @@ gst_videoscale_scale_point_sample (GstVideoscale *scale, unsigned char *src, uns
|
|||||||
int sum, xcount, ycount, loop;
|
int sum, xcount, ycount, loop;
|
||||||
unsigned char *srcp, *srcp2;
|
unsigned char *srcp, *srcp2;
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: scaling nearest point sample %p %p %d\n", src, dest, dw);
|
GST_DEBUG (0,"videoscale: scaling nearest point sample %p %p %d", src, dest, dw);
|
||||||
|
|
||||||
ypos = 0x10000;
|
ypos = 0x10000;
|
||||||
yinc = (sh<<16)/dh;
|
yinc = (sh<<16)/dh;
|
||||||
@ -300,7 +300,7 @@ gst_videoscale_scale_nearest (GstVideoscale *scale,
|
|||||||
int ypos, yinc, y;
|
int ypos, yinc, y;
|
||||||
int xpos, xinc, x;
|
int xpos, xinc, x;
|
||||||
|
|
||||||
GST_DEBUG (0, "videoscale: scaling nearest %p %p %d %d\n", src, dest, dw, scale->scale_bytes);
|
GST_DEBUG (0, "videoscale: scaling nearest %p %p %d %d", src, dest, dw, scale->scale_bytes);
|
||||||
|
|
||||||
|
|
||||||
ypos = 0x10000;
|
ypos = 0x10000;
|
||||||
|
@ -42,7 +42,7 @@ gst_videoscale_generate_rowbytes_x86 (unsigned char *copy_row, int src_w, int ds
|
|||||||
unsigned char *eip;
|
unsigned char *eip;
|
||||||
unsigned char load, store;
|
unsigned char load, store;
|
||||||
|
|
||||||
GST_DEBUG (0,"videoscale: setup scaling %p\n", copy_row);
|
GST_DEBUG (0,"videoscale: setup scaling %p", copy_row);
|
||||||
|
|
||||||
switch (bpp) {
|
switch (bpp) {
|
||||||
case 1:
|
case 1:
|
||||||
@ -75,6 +75,6 @@ gst_videoscale_generate_rowbytes_x86 (unsigned char *copy_row, int src_w, int ds
|
|||||||
pos += inc;
|
pos += inc;
|
||||||
}
|
}
|
||||||
*eip++ = RETURN;
|
*eip++ = RETURN;
|
||||||
GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, (void*)(eip-copy_row));
|
GST_DEBUG (0,"scaler start/end %p %p %p", copy_row, eip, (void*)(eip-copy_row));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -235,12 +235,12 @@ gst_v4lmjpegsink_chain (GstPad *pad,
|
|||||||
v4lmjpegsink = GST_V4LMJPEGSINK (gst_pad_get_parent (pad));
|
v4lmjpegsink = GST_V4LMJPEGSINK (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
if (v4lmjpegsink->clock) {
|
if (v4lmjpegsink->clock) {
|
||||||
GST_DEBUG (0,"videosink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP(buf));
|
GST_DEBUG (0,"videosink: clock wait: %llu", GST_BUFFER_TIMESTAMP(buf));
|
||||||
|
|
||||||
jitter = gst_clock_current_diff(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf));
|
jitter = gst_clock_current_diff(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf));
|
||||||
|
|
||||||
if (jitter > 500000 || jitter < -500000)
|
if (jitter > 500000 || jitter < -500000)
|
||||||
GST_DEBUG (0, "jitter: %lld\n", jitter);
|
GST_DEBUG (0, "jitter: %lld", jitter);
|
||||||
|
|
||||||
gst_element_clock_wait(GST_ELEMENT(v4lmjpegsink), v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf));
|
gst_element_clock_wait(GST_ELEMENT(v4lmjpegsink), v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user