summaryrefslogtreecommitdiffstats
path: root/ext/jpeg
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2002-03-24 22:07:03 +0000
committerAndy Wingo <wingo@pobox.com>2002-03-24 22:07:03 +0000
commit29aa39e99c71e2c7ae98883e72620e590e6ec965 (patch)
treeb553181db23bf46ba9e27382b6fcf9c731cfa934 /ext/jpeg
parent9e745b472d465325f1e8fd05a5d6465cb120d004 (diff)
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
Diffstat (limited to 'ext/jpeg')
-rw-r--r--ext/jpeg/gstjpegdec.c26
-rw-r--r--ext/jpeg/gstjpegenc.c30
2 files changed, 28 insertions, 28 deletions
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 9dfab51e..93c1cd3b 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -87,38 +87,38 @@ gst_jpegdec_class_init (GstJpegDec *klass)
static void
gst_jpegdec_init_source (j_decompress_ptr cinfo)
{
- GST_DEBUG (0,"gst_jpegdec_chain: init_source\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: init_source");
}
static gboolean
gst_jpegdec_fill_input_buffer (j_decompress_ptr cinfo)
{
- GST_DEBUG (0,"gst_jpegdec_chain: fill_input_buffer\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: fill_input_buffer");
return TRUE;
}
static void
gst_jpegdec_skip_input_data (j_decompress_ptr cinfo, glong num_bytes)
{
- GST_DEBUG (0,"gst_jpegdec_chain: skip_input_data\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: skip_input_data");
}
static gboolean
gst_jpegdec_resync_to_restart (j_decompress_ptr cinfo, gint desired)
{
- GST_DEBUG (0,"gst_jpegdec_chain: resync_to_start\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: resync_to_start");
return TRUE;
}
static void
gst_jpegdec_term_source (j_decompress_ptr cinfo)
{
- GST_DEBUG (0,"gst_jpegdec_chain: term_source\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: term_source");
}
static void
gst_jpegdec_init (GstJpegDec *jpegdec)
{
- GST_DEBUG (0,"gst_jpegdec_init: initializing\n");
+ GST_DEBUG (0,"gst_jpegdec_init: initializing");
/* create the sink and src pads */
jpegdec->sinkpad = gst_pad_new_from_template (jpegdec_sink_template, "sink");
gst_element_add_pad(GST_ELEMENT(jpegdec),jpegdec->sinkpad);
@@ -180,14 +180,14 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
data = (guchar *)GST_BUFFER_DATA(buf);
size = GST_BUFFER_SIZE(buf);
- GST_DEBUG (0,"gst_jpegdec_chain: got buffer of %ld bytes in '%s'\n",size,
+ GST_DEBUG (0,"gst_jpegdec_chain: got buffer of %ld bytes in '%s'",size,
GST_OBJECT_NAME (jpegdec));
jpegdec->jsrc.next_input_byte = data;
jpegdec->jsrc.bytes_in_buffer = size;
- GST_DEBUG (0,"gst_jpegdec_chain: reading header %08lx\n", *(gulong *)data);
+ GST_DEBUG (0,"gst_jpegdec_chain: reading header %08lx", *(gulong *)data);
jpeg_read_header(&jpegdec->cinfo, TRUE);
r_h = jpegdec->cinfo.cur_comp_info[0]->h_samp_factor;
@@ -202,11 +202,11 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
jpegdec->cinfo.out_color_space = JCS_YCbCr;
jpegdec->cinfo.dct_method = JDCT_IFAST;
jpegdec->cinfo.raw_data_out = TRUE;
- GST_DEBUG (0,"gst_jpegdec_chain: starting decompress\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: starting decompress");
jpeg_start_decompress(&jpegdec->cinfo);
width = jpegdec->cinfo.output_width;
height = jpegdec->cinfo.output_height;
- GST_DEBUG (0,"gst_jpegdec_chain: width %d, height %d\n", width, height);
+ GST_DEBUG (0,"gst_jpegdec_chain: width %d, height %d", width, height);
outbuf = gst_buffer_new();
outsize = GST_BUFFER_SIZE(outbuf) = width*height +
@@ -237,7 +237,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
width2 = width >> 1;
- GST_DEBUG (0,"gst_jpegdec_chain: decompressing %u\n", jpegdec->cinfo.rec_outbuf_height);
+ GST_DEBUG (0,"gst_jpegdec_chain: decompressing %u", jpegdec->cinfo.rec_outbuf_height);
for (i = 0; i < height; i += r_v*DCTSIZE) {
for (j=0, k=0; j< (r_v*DCTSIZE); j += r_v, k++) {
jpegdec->line[0][j] = base[0]; base[0] += width;
@@ -254,10 +254,10 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
jpeg_read_raw_data(&jpegdec->cinfo, jpegdec->line, r_v*DCTSIZE);
}
- GST_DEBUG (0,"gst_jpegdec_chain: decompressing finished\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: decompressing finished");
jpeg_finish_decompress(&jpegdec->cinfo);
- GST_DEBUG (0,"gst_jpegdec_chain: sending buffer\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: sending buffer");
gst_pad_push(jpegdec->srcpad, outbuf);
gst_buffer_unref(buf);
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index b8a660f9..135ac455 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -97,19 +97,19 @@ gst_jpegenc_class_init (GstJpegEnc *klass)
static void
gst_jpegenc_init_destination (j_compress_ptr cinfo)
{
- GST_DEBUG (0,"gst_jpegenc_chain: init_destination\n");
+ GST_DEBUG (0,"gst_jpegenc_chain: init_destination");
}
static gboolean
gst_jpegenc_flush_destination (j_compress_ptr cinfo)
{
- GST_DEBUG (0,"gst_jpegenc_chain: flush_destination: buffer too small !!!\n");
+ GST_DEBUG (0,"gst_jpegenc_chain: flush_destination: buffer too small !!!");
return TRUE;
}
static void gst_jpegenc_term_destination (j_compress_ptr cinfo)
{
- GST_DEBUG (0,"gst_jpegenc_chain: term_source\n");
+ GST_DEBUG (0,"gst_jpegenc_chain: term_source");
}
static void
@@ -133,7 +133,7 @@ gst_jpegenc_init (GstJpegEnc *jpegenc)
jpegenc->cinfo.err = jpeg_std_error(&jpegenc->jerr);
jpeg_create_compress(&jpegenc->cinfo);
- GST_DEBUG (0,"gst_jpegenc_init: setting line buffers\n");
+ GST_DEBUG (0,"gst_jpegenc_init: setting line buffers");
jpegenc->line[0] = NULL;
jpegenc->line[1] = NULL;
jpegenc->line[2] = NULL;
@@ -153,13 +153,13 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
guint size = 0;
gint width, height;
- GST_DEBUG (0,"gst_jpegenc_resync: resync\n");
+ GST_DEBUG (0,"gst_jpegenc_resync: resync");
jpegenc->cinfo.image_width = width = jpegenc->width;
jpegenc->cinfo.image_height = height = jpegenc->height;
jpegenc->cinfo.input_components = 3;
- GST_DEBUG (0,"gst_jpegenc_resync: wdith %d, height %d\n", width, height);
+ GST_DEBUG (0,"gst_jpegenc_resync: wdith %d, height %d", width, height);
jpeg_set_defaults(&jpegenc->cinfo);
jpegenc->cinfo.dct_method = JDCT_FASTEST;
@@ -171,7 +171,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
switch (jpegenc->format) {
case GST_COLORSPACE_RGB24:
size = 3;
- GST_DEBUG (0,"gst_jpegenc_resync: setting format to RGB24\n");
+ GST_DEBUG (0,"gst_jpegenc_resync: setting format to RGB24");
jpegenc->cinfo.in_color_space = JCS_RGB;
jpegenc->cinfo.raw_data_in = FALSE;
break;
@@ -179,7 +179,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
size = 2;
jpegenc->cinfo.raw_data_in = TRUE;
jpegenc->cinfo.in_color_space = JCS_YCbCr;
- GST_DEBUG (0,"gst_jpegenc_resync: setting format to YUV420P\n");
+ GST_DEBUG (0,"gst_jpegenc_resync: setting format to YUV420P");
jpegenc->cinfo.comp_info[0].h_samp_factor = 2;
jpegenc->cinfo.comp_info[0].v_samp_factor = 2;
jpegenc->cinfo.comp_info[1].h_samp_factor = 1;
@@ -193,7 +193,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
jpegenc->line[2] = g_realloc(jpegenc->line[2], height*sizeof(char*)/2);
}
- GST_DEBUG (0,"gst_jpegenc_resync: setting format done\n");
+ GST_DEBUG (0,"gst_jpegenc_resync: setting format done");
break;
default:
printf("gst_jpegenc_resync: unsupported colorspace, using RGB\n");
@@ -208,7 +208,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
jpeg_suppress_tables(&jpegenc->cinfo, TRUE);
jpegenc->buffer = NULL;
- GST_DEBUG (0,"gst_jpegenc_resync: resync done\n");
+ GST_DEBUG (0,"gst_jpegenc_resync: resync done");
}
static GstBuffer*
@@ -217,7 +217,7 @@ gst_jpegenc_get (GstPad *pad)
GstJpegEnc *jpegenc;
GstBuffer *newbuf;
- GST_DEBUG (0,"gst_jpegenc_chain: pull buffer\n");
+ GST_DEBUG (0,"gst_jpegenc_chain: pull buffer");
g_return_val_if_fail (pad != NULL, NULL);
g_return_val_if_fail (GST_IS_PAD (pad), NULL);
@@ -226,7 +226,7 @@ gst_jpegenc_get (GstPad *pad)
if (jpegenc->buffer == NULL || GST_BUFFER_REFCOUNT(jpegenc->buffer) != 1) {
if (jpegenc->buffer) gst_buffer_unref(jpegenc->buffer);
- GST_DEBUG (0,"gst_jpegenc_chain: new buffer\n");
+ GST_DEBUG (0,"gst_jpegenc_chain: new buffer");
newbuf = jpegenc->buffer = gst_buffer_new();
GST_BUFFER_DATA(newbuf) = g_malloc(jpegenc->bufsize);
GST_BUFFER_SIZE(newbuf) = jpegenc->bufsize;
@@ -259,7 +259,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
data = GST_BUFFER_DATA(buf);
size = GST_BUFFER_SIZE(buf);
- GST_DEBUG (0,"gst_jpegenc_chain: got buffer of %ld bytes in '%s'\n",size,
+ GST_DEBUG (0,"gst_jpegenc_chain: got buffer of %ld bytes in '%s'",size,
GST_OBJECT_NAME (jpegenc));
outbuf = gst_buffer_new();
@@ -280,7 +280,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
jpeg_start_compress(&jpegenc->cinfo, TRUE);
width2 = width>>1;
- GST_DEBUG (0,"gst_jpegdec_chain: compressing\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: compressing");
for (i = 0; i < height; i += 2*DCTSIZE) {
for (j=0, k=0; j<2*DCTSIZE;j+=2, k++) {
@@ -292,7 +292,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
jpeg_write_raw_data(&jpegenc->cinfo, jpegenc->line, 2*DCTSIZE);
}
jpeg_finish_compress(&jpegenc->cinfo);
- GST_DEBUG (0,"gst_jpegdec_chain: compressing done\n");
+ GST_DEBUG (0,"gst_jpegdec_chain: compressing done");
GST_BUFFER_SIZE(outbuf) = (((outsize - jpegenc->jdest.free_in_buffer)+3)&~3);