diff options
Diffstat (limited to 'ext/jpeg')
-rw-r--r-- | ext/jpeg/gstjpeg.c | 27 | ||||
-rw-r--r-- | ext/jpeg/gstjpegdec.c | 360 | ||||
-rw-r--r-- | ext/jpeg/gstjpegdec.h | 67 | ||||
-rw-r--r-- | ext/jpeg/gstjpegenc.c | 226 | ||||
-rw-r--r-- | ext/jpeg/gstjpegenc.h | 69 |
5 files changed, 386 insertions, 363 deletions
diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c index 1a78b222..add7435e 100644 --- a/ext/jpeg/gstjpeg.c +++ b/ext/jpeg/gstjpeg.c @@ -24,24 +24,21 @@ #include "gstjpegenc.h" static gboolean -plugin_init (GstPlugin *plugin) +plugin_init (GstPlugin * plugin) { - if (!gst_element_register (plugin, "jpegenc", GST_RANK_NONE, GST_TYPE_JPEGENC)) + if (!gst_element_register (plugin, "jpegenc", GST_RANK_NONE, + GST_TYPE_JPEGENC)) return FALSE; - - if (!gst_element_register (plugin, "jpegdec", GST_RANK_PRIMARY, GST_TYPE_JPEGDEC)) + + if (!gst_element_register (plugin, "jpegdec", GST_RANK_PRIMARY, + GST_TYPE_JPEGDEC)) return FALSE; - + return TRUE; } -GST_PLUGIN_DEFINE ( - GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "jpeg", - "JPeg plugin library", - plugin_init, - VERSION, - "LGPL", - GST_PACKAGE, - GST_ORIGIN) +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "jpeg", + "JPeg plugin library", + plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 0a1bb60d..10156559 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -36,73 +36,74 @@ GstElementDetails gst_jpegdec_details = { }; /* JpegDec signals and args */ -enum { +enum +{ /* FILL ME */ LAST_SIGNAL }; -enum { +enum +{ ARG_0, /* FILL ME */ }; -static void gst_jpegdec_base_init (gpointer g_class); -static void gst_jpegdec_class_init (GstJpegDec *klass); -static void gst_jpegdec_init (GstJpegDec *jpegdec); +static void gst_jpegdec_base_init (gpointer g_class); +static void gst_jpegdec_class_init (GstJpegDec * klass); +static void gst_jpegdec_init (GstJpegDec * jpegdec); -static void gst_jpegdec_chain (GstPad *pad, GstData *_data); -static GstPadLinkReturn - gst_jpegdec_link (GstPad *pad, const GstCaps *caps); +static void gst_jpegdec_chain (GstPad * pad, GstData * _data); +static GstPadLinkReturn gst_jpegdec_link (GstPad * pad, const GstCaps * caps); static GstElementClass *parent_class = NULL; + /*static guint gst_jpegdec_signals[LAST_SIGNAL] = { 0 }; */ GType -gst_jpegdec_get_type(void) { +gst_jpegdec_get_type (void) +{ static GType jpegdec_type = 0; - + if (!jpegdec_type) { static const GTypeInfo jpegdec_info = { - sizeof(GstJpegDec), + sizeof (GstJpegDec), gst_jpegdec_base_init, NULL, - (GClassInitFunc)gst_jpegdec_class_init, + (GClassInitFunc) gst_jpegdec_class_init, NULL, NULL, - sizeof(GstJpegDec), + sizeof (GstJpegDec), 0, - (GInstanceInitFunc)gst_jpegdec_init, + (GInstanceInitFunc) gst_jpegdec_init, }; - jpegdec_type = g_type_register_static(GST_TYPE_ELEMENT, "GstJpegDec", &jpegdec_info, 0); + jpegdec_type = + g_type_register_static (GST_TYPE_ELEMENT, "GstJpegDec", &jpegdec_info, + 0); } return jpegdec_type; } static GstStaticPadTemplate gst_jpegdec_src_pad_template = -GST_STATIC_PAD_TEMPLATE ( - "src", +GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) -); + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) + ); static GstStaticPadTemplate gst_jpegdec_sink_pad_template = -GST_STATIC_PAD_TEMPLATE ( - "sink", +GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("image/jpeg, " - "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ], " - "framerate = (double) [ 1, MAX ]" - ) -); + "width = (int) [ 16, 4096 ], " + "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]") + ); static void gst_jpegdec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - + gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_jpegdec_src_pad_template)); gst_element_class_add_pad_template (element_class, @@ -111,13 +112,13 @@ gst_jpegdec_base_init (gpointer g_class) } static void -gst_jpegdec_class_init (GstJpegDec *klass) +gst_jpegdec_class_init (GstJpegDec * klass) { GstElementClass *gstelement_class; - gstelement_class = (GstElementClass*)klass; + gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref(GST_TYPE_ELEMENT); + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); } static void @@ -125,6 +126,7 @@ gst_jpegdec_init_source (j_decompress_ptr cinfo) { GST_DEBUG ("gst_jpegdec_chain: init_source"); } + static gboolean gst_jpegdec_fill_input_buffer (j_decompress_ptr cinfo) { @@ -152,21 +154,23 @@ gst_jpegdec_term_source (j_decompress_ptr cinfo) } static void -gst_jpegdec_init (GstJpegDec *jpegdec) +gst_jpegdec_init (GstJpegDec * jpegdec) { GST_DEBUG ("gst_jpegdec_init: initializing"); /* create the sink and src pads */ - jpegdec->sinkpad = gst_pad_new_from_template ( - gst_static_pad_template_get (&gst_jpegdec_sink_pad_template), "sink"); - gst_element_add_pad(GST_ELEMENT(jpegdec),jpegdec->sinkpad); - gst_pad_set_chain_function(jpegdec->sinkpad,gst_jpegdec_chain); - gst_pad_set_link_function(jpegdec->sinkpad, gst_jpegdec_link); + jpegdec->sinkpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_jpegdec_sink_pad_template), "sink"); + gst_element_add_pad (GST_ELEMENT (jpegdec), jpegdec->sinkpad); + gst_pad_set_chain_function (jpegdec->sinkpad, gst_jpegdec_chain); + gst_pad_set_link_function (jpegdec->sinkpad, gst_jpegdec_link); - jpegdec->srcpad = gst_pad_new_from_template ( - gst_static_pad_template_get (&gst_jpegdec_src_pad_template), "src"); + jpegdec->srcpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_jpegdec_src_pad_template), "src"); gst_pad_use_explicit_caps (jpegdec->srcpad); - gst_element_add_pad(GST_ELEMENT(jpegdec),jpegdec->srcpad); + gst_element_add_pad (GST_ELEMENT (jpegdec), jpegdec->srcpad); /* initialize the jpegdec decoder state */ jpegdec->next_time = 0; @@ -181,10 +185,10 @@ gst_jpegdec_init (GstJpegDec *jpegdec) jpegdec->line[2] = NULL; /* setup jpeglib */ - memset(&jpegdec->cinfo, 0, sizeof(jpegdec->cinfo)); - memset(&jpegdec->jerr, 0, sizeof(jpegdec->jerr)); - jpegdec->cinfo.err = jpeg_std_error(&jpegdec->jerr); - jpeg_create_decompress(&jpegdec->cinfo); + memset (&jpegdec->cinfo, 0, sizeof (jpegdec->cinfo)); + memset (&jpegdec->jerr, 0, sizeof (jpegdec->jerr)); + jpegdec->cinfo.err = jpeg_std_error (&jpegdec->jerr); + jpeg_create_decompress (&jpegdec->cinfo); jpegdec->jsrc.init_source = gst_jpegdec_init_source; jpegdec->jsrc.fill_input_buffer = gst_jpegdec_fill_input_buffer; @@ -196,7 +200,7 @@ gst_jpegdec_init (GstJpegDec *jpegdec) } static GstPadLinkReturn -gst_jpegdec_link (GstPad *pad, const GstCaps *caps) +gst_jpegdec_link (GstPad * pad, const GstCaps * caps) { GstJpegDec *jpegdec = GST_JPEGDEC (gst_pad_get_parent (pad)); GstStructure *structure; @@ -205,15 +209,14 @@ gst_jpegdec_link (GstPad *pad, const GstCaps *caps) structure = gst_caps_get_structure (caps, 0); gst_structure_get_double (structure, "framerate", &jpegdec->fps); - gst_structure_get_int (structure, "width", &jpegdec->width); - gst_structure_get_int (structure, "height", &jpegdec->height); + gst_structure_get_int (structure, "width", &jpegdec->width); + gst_structure_get_int (structure, "height", &jpegdec->height); srccaps = gst_caps_new_simple ("video/x-raw-yuv", - "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I','4','2','0'), - "width", G_TYPE_INT, jpegdec->width, - "height", G_TYPE_INT, jpegdec->height, - "framerate", G_TYPE_DOUBLE, jpegdec->fps, - NULL); + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'), + "width", G_TYPE_INT, jpegdec->width, + "height", G_TYPE_INT, jpegdec->height, + "framerate", G_TYPE_DOUBLE, jpegdec->fps, NULL); /* at this point, we're pretty sure that this will be the output * format, so we'll set it. */ @@ -223,18 +226,18 @@ gst_jpegdec_link (GstPad *pad, const GstCaps *caps) } /* shamelessly ripped from jpegutils.c in mjpegtools */ -static void add_huff_table (j_decompress_ptr dinfo, - JHUFF_TBL **htblptr, - const UINT8 *bits, const UINT8 *val) +static void +add_huff_table (j_decompress_ptr dinfo, + JHUFF_TBL ** htblptr, const UINT8 * bits, const UINT8 * val) /* Define a Huffman table */ { int nsymbols, len; if (*htblptr == NULL) - *htblptr = jpeg_alloc_huff_table((j_common_ptr) dinfo); + *htblptr = jpeg_alloc_huff_table ((j_common_ptr) dinfo); /* Copy the number-of-symbols-of-each-code-length counts */ - memcpy((*htblptr)->bits, bits, sizeof((*htblptr)->bits)); + memcpy ((*htblptr)->bits, bits, sizeof ((*htblptr)->bits)); /* Validate the counts. We do this here mainly so we can copy the right * number of symbols from the val[] array, without risking marching off @@ -244,119 +247,123 @@ static void add_huff_table (j_decompress_ptr dinfo, for (len = 1; len <= 16; len++) nsymbols += bits[len]; if (nsymbols < 1 || nsymbols > 256) - g_error("jpegutils.c: add_huff_table failed badly. "); + g_error ("jpegutils.c: add_huff_table failed badly. "); - memcpy((*htblptr)->huffval, val, nsymbols * sizeof(UINT8)); + memcpy ((*htblptr)->huffval, val, nsymbols * sizeof (UINT8)); } -static void std_huff_tables (j_decompress_ptr dinfo) +static void +std_huff_tables (j_decompress_ptr dinfo) /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ /* IMPORTANT: these are only valid for 8-bit data precision! */ { static const UINT8 bits_dc_luminance[17] = - { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; + { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; static const UINT8 val_dc_luminance[] = - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; - + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + static const UINT8 bits_dc_chrominance[17] = - { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; + { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; static const UINT8 val_dc_chrominance[] = - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; - + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + static const UINT8 bits_ac_luminance[17] = - { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; + { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; static const UINT8 val_ac_luminance[] = - { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, - 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, - 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, - 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, - 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, - 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, - 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, - 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, - 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, - 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, - 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, - 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, - 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, - 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, - 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, - 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, - 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, - 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, - 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, - 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, - 0xf9, 0xfa }; - + { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, + 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, + 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, + 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, + 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, + 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, + 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, + 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, + 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, + 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, + 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, + 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, + 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, + 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, + 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, + 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, + 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, + 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, + 0xf9, 0xfa + }; + static const UINT8 bits_ac_chrominance[17] = - { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; + { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; static const UINT8 val_ac_chrominance[] = - { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, - 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, - 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, - 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, - 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, - 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, - 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, - 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, - 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, - 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, - 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, - 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, - 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, - 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, - 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, - 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, - 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, - 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, - 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, - 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, - 0xf9, 0xfa }; - - add_huff_table(dinfo, &dinfo->dc_huff_tbl_ptrs[0], - bits_dc_luminance, val_dc_luminance); - add_huff_table(dinfo, &dinfo->ac_huff_tbl_ptrs[0], - bits_ac_luminance, val_ac_luminance); - add_huff_table(dinfo, &dinfo->dc_huff_tbl_ptrs[1], - bits_dc_chrominance, val_dc_chrominance); - add_huff_table(dinfo, &dinfo->ac_huff_tbl_ptrs[1], - bits_ac_chrominance, val_ac_chrominance); + { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, + 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, + 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, + 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, + 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, + 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, + 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, + 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, + 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, + 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, + 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, + 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, + 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, + 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, + 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, + 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, + 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, + 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, + 0xf9, 0xfa + }; + + add_huff_table (dinfo, &dinfo->dc_huff_tbl_ptrs[0], + bits_dc_luminance, val_dc_luminance); + add_huff_table (dinfo, &dinfo->ac_huff_tbl_ptrs[0], + bits_ac_luminance, val_ac_luminance); + add_huff_table (dinfo, &dinfo->dc_huff_tbl_ptrs[1], + bits_dc_chrominance, val_dc_chrominance); + add_huff_table (dinfo, &dinfo->ac_huff_tbl_ptrs[1], + bits_ac_chrominance, val_ac_chrominance); } -static void guarantee_huff_tables(j_decompress_ptr dinfo) +static void +guarantee_huff_tables (j_decompress_ptr dinfo) { - if ( (dinfo->dc_huff_tbl_ptrs[0] == NULL) && - (dinfo->dc_huff_tbl_ptrs[1] == NULL) && - (dinfo->ac_huff_tbl_ptrs[0] == NULL) && - (dinfo->ac_huff_tbl_ptrs[1] == NULL) ) { - GST_DEBUG ( - "Generating standard Huffman tables for this frame."); - std_huff_tables(dinfo); + if ((dinfo->dc_huff_tbl_ptrs[0] == NULL) && + (dinfo->dc_huff_tbl_ptrs[1] == NULL) && + (dinfo->ac_huff_tbl_ptrs[0] == NULL) && + (dinfo->ac_huff_tbl_ptrs[1] == NULL)) { + GST_DEBUG ("Generating standard Huffman tables for this frame."); + std_huff_tables (dinfo); } } static void -gst_jpegdec_chain (GstPad *pad, GstData *_data) +gst_jpegdec_chain (GstPad * pad, GstData * _data) { GstBuffer *buf = GST_BUFFER (_data); GstJpegDec *jpegdec; guchar *data, *outdata; gulong size, outsize; GstBuffer *outbuf; - /*GstMeta *meta;*/ + + /*GstMeta *meta; */ gint width, height, width2; guchar *base[3]; - gint i,j, k; + gint i, j, k; gint r_h, r_v; - g_return_if_fail(pad != NULL); - g_return_if_fail(GST_IS_PAD(pad)); - g_return_if_fail(buf != NULL); - /*g_return_if_fail(GST_IS_BUFFER(buf));*/ + g_return_if_fail (pad != NULL); + g_return_if_fail (GST_IS_PAD (pad)); + g_return_if_fail (buf != NULL); + /*g_return_if_fail(GST_IS_BUFFER(buf)); */ jpegdec = GST_JPEGDEC (GST_OBJECT_PARENT (pad)); @@ -365,24 +372,24 @@ gst_jpegdec_chain (GstPad *pad, GstData *_data) return; } - data = (guchar *)GST_BUFFER_DATA(buf); - size = GST_BUFFER_SIZE(buf); - GST_DEBUG ("gst_jpegdec_chain: got buffer of %ld bytes in '%s'",size, - GST_OBJECT_NAME (jpegdec)); + data = (guchar *) GST_BUFFER_DATA (buf); + size = GST_BUFFER_SIZE (buf); + GST_DEBUG ("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 ("gst_jpegdec_chain: reading header %08lx", *(gulong *)data); - jpeg_read_header(&jpegdec->cinfo, TRUE); + + GST_DEBUG ("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; r_v = jpegdec->cinfo.cur_comp_info[0]->v_samp_factor; - /*g_print ("%d %d\n", r_h, r_v);*/ - /*g_print ("%d %d\n", jpegdec->cinfo.cur_comp_info[1]->h_samp_factor, jpegdec->cinfo.cur_comp_info[1]->v_samp_factor);*/ - /*g_print ("%d %d\n", jpegdec->cinfo.cur_comp_info[2]->h_samp_factor, jpegdec->cinfo.cur_comp_info[2]->v_samp_factor);*/ + /*g_print ("%d %d\n", r_h, r_v); */ + /*g_print ("%d %d\n", jpegdec->cinfo.cur_comp_info[1]->h_samp_factor, jpegdec->cinfo.cur_comp_info[1]->v_samp_factor); */ + /*g_print ("%d %d\n", jpegdec->cinfo.cur_comp_info[2]->h_samp_factor, jpegdec->cinfo.cur_comp_info[2]->v_samp_factor); */ jpegdec->cinfo.do_fancy_upsampling = FALSE; jpegdec->cinfo.do_block_smoothing = FALSE; @@ -390,66 +397,67 @@ gst_jpegdec_chain (GstPad *pad, GstData *_data) jpegdec->cinfo.dct_method = JDCT_IFAST; jpegdec->cinfo.raw_data_out = TRUE; GST_DEBUG ("gst_jpegdec_chain: starting decompress"); - guarantee_huff_tables(&jpegdec->cinfo); - jpeg_start_decompress(&jpegdec->cinfo); + guarantee_huff_tables (&jpegdec->cinfo); + jpeg_start_decompress (&jpegdec->cinfo); width = jpegdec->cinfo.output_width; height = jpegdec->cinfo.output_height; GST_DEBUG ("gst_jpegdec_chain: width %d, height %d", width, height); - outbuf = gst_buffer_new(); - outsize = GST_BUFFER_SIZE(outbuf) = width*height + - width*height / 2; - outdata = GST_BUFFER_DATA(outbuf) = g_malloc(outsize); - GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf); + outbuf = gst_buffer_new (); + outsize = GST_BUFFER_SIZE (outbuf) = width * height + width * height / 2; + outdata = GST_BUFFER_DATA (outbuf) = g_malloc (outsize); + GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf); if (jpegdec->height != height || jpegdec->line[0] == NULL) { GstCaps *caps; - jpegdec->line[0] = g_realloc(jpegdec->line[0], height*sizeof(char*)); - jpegdec->line[1] = g_realloc(jpegdec->line[1], height*sizeof(char*)); - jpegdec->line[2] = g_realloc(jpegdec->line[2], height*sizeof(char*)); + jpegdec->line[0] = g_realloc (jpegdec->line[0], height * sizeof (char *)); + jpegdec->line[1] = g_realloc (jpegdec->line[1], height * sizeof (char *)); + jpegdec->line[2] = g_realloc (jpegdec->line[2], height * sizeof (char *)); jpegdec->height = height; caps = gst_caps_new_simple ("video/x-raw-yuv", - "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I','4','2','0'), - "width", G_TYPE_INT, width, - "height", G_TYPE_INT, height, - "framerate", G_TYPE_DOUBLE, jpegdec->fps, - NULL); + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'), + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", G_TYPE_DOUBLE, jpegdec->fps, NULL); gst_pad_set_explicit_caps (jpegdec->srcpad, caps); gst_caps_free (caps); } /* mind the swap, jpeglib outputs blue chroma first */ base[0] = outdata; - base[1] = base[0]+width*height; - base[2] = base[1]+width*height/4; + base[1] = base[0] + width * height; + base[2] = base[1] + width * height / 4; width2 = width >> 1; - GST_DEBUG ("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; + GST_DEBUG ("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; if (r_v == 2) { - jpegdec->line[0][j+1] = base[0]; base[0] += width; + jpegdec->line[0][j + 1] = base[0]; + base[0] += width; } - jpegdec->line[1][k] = base[1]; - jpegdec->line[2][k] = base[2]; - if (r_v == 2 || k&1) { - base[1] += width2; base[2] += width2; + jpegdec->line[1][k] = base[1]; + jpegdec->line[2][k] = base[2]; + if (r_v == 2 || k & 1) { + base[1] += width2; + base[2] += width2; } } - /*g_print ("%d\n", jpegdec->cinfo.output_scanline);*/ - jpeg_read_raw_data(&jpegdec->cinfo, jpegdec->line, r_v*DCTSIZE); + /*g_print ("%d\n", jpegdec->cinfo.output_scanline); */ + jpeg_read_raw_data (&jpegdec->cinfo, jpegdec->line, r_v * DCTSIZE); } GST_DEBUG ("gst_jpegdec_chain: decompressing finished"); - jpeg_finish_decompress(&jpegdec->cinfo); + jpeg_finish_decompress (&jpegdec->cinfo); GST_DEBUG ("gst_jpegdec_chain: sending buffer"); - gst_pad_push(jpegdec->srcpad, GST_DATA (outbuf)); + gst_pad_push (jpegdec->srcpad, GST_DATA (outbuf)); - gst_buffer_unref(buf); + gst_buffer_unref (buf); } - diff --git a/ext/jpeg/gstjpegdec.h b/ext/jpeg/gstjpegdec.h index 05187873..9a864eba 100644 --- a/ext/jpeg/gstjpegdec.h +++ b/ext/jpeg/gstjpegdec.h @@ -30,8 +30,9 @@ #include <jpeglib.h> #ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +extern "C" +{ +#endif /* __cplusplus */ #define GST_TYPE_JPEGDEC \ @@ -45,46 +46,48 @@ extern "C" { #define GST_IS_JPEGDEC_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JPEGDEC)) -typedef struct _GstJpegDec GstJpegDec; -typedef struct _GstJpegDecClass GstJpegDecClass; + typedef struct _GstJpegDec GstJpegDec; + typedef struct _GstJpegDecClass GstJpegDecClass; -struct _GstJpegDec { - GstElement element; + struct _GstJpegDec + { + GstElement element; - /* pads */ - GstPad *sinkpad,*srcpad; + /* pads */ + GstPad *sinkpad, *srcpad; - int parse_state; - /* the timestamp of the next frame */ - guint64 next_time; - /* the interval between frames */ - guint64 time_interval; + int parse_state; + /* the timestamp of the next frame */ + guint64 next_time; + /* the interval between frames */ + guint64 time_interval; - /* video state */ - gint format; - gint width; - gint height; - gdouble fps; - /* the size of the output buffer */ - gint outsize; - /* the jpeg line buffer */ - guchar **line[3]; + /* video state */ + gint format; + gint width; + gint height; + gdouble fps; + /* the size of the output buffer */ + gint outsize; + /* the jpeg line buffer */ + guchar **line[3]; - struct jpeg_decompress_struct cinfo; - struct jpeg_error_mgr jerr; - struct jpeg_source_mgr jsrc; -}; + struct jpeg_decompress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_source_mgr jsrc; + }; -struct _GstJpegDecClass { - GstElementClass parent_class; -}; + struct _GstJpegDecClass + { + GstElementClass parent_class; + }; -GType gst_jpegdec_get_type(void); + GType gst_jpegdec_get_type (void); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* __GST_JPEGDEC_H__ */ +#endif /* __GST_JPEGDEC_H__ */ diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 7f43ea97..44941719 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -35,30 +35,34 @@ GstElementDetails gst_jpegenc_details = { }; /* JpegEnc signals and args */ -enum { +enum +{ FRAME_ENCODED, /* FILL ME */ LAST_SIGNAL }; -enum { +enum +{ ARG_0, ARG_QUALITY, ARG_SMOOTHING, /* FILL ME */ }; -static void gst_jpegenc_base_init (gpointer g_class); -static void gst_jpegenc_class_init (GstJpegEnc *klass); -static void gst_jpegenc_init (GstJpegEnc *jpegenc); +static void gst_jpegenc_base_init (gpointer g_class); +static void gst_jpegenc_class_init (GstJpegEnc * klass); +static void gst_jpegenc_init (GstJpegEnc * jpegenc); -static void gst_jpegenc_chain (GstPad *pad, GstData *_data); -static GstPadLinkReturn gst_jpegenc_link (GstPad *pad, const GstCaps *caps); -static GstCaps * gst_jpegenc_getcaps (GstPad *pad); +static void gst_jpegenc_chain (GstPad * pad, GstData * _data); +static GstPadLinkReturn gst_jpegenc_link (GstPad * pad, const GstCaps * caps); +static GstCaps *gst_jpegenc_getcaps (GstPad * pad); -static void gst_jpegenc_resync (GstJpegEnc *jpegenc); -static void gst_jpegenc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); +static void gst_jpegenc_resync (GstJpegEnc * jpegenc); +static void gst_jpegenc_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_jpegenc_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); static GstElementClass *parent_class = NULL; static guint gst_jpegenc_signals[LAST_SIGNAL] = { 0 }; @@ -70,46 +74,44 @@ gst_jpegenc_get_type (void) if (!jpegenc_type) { static const GTypeInfo jpegenc_info = { - sizeof(GstJpegEnc), + sizeof (GstJpegEnc), gst_jpegenc_base_init, NULL, - (GClassInitFunc)gst_jpegenc_class_init, + (GClassInitFunc) gst_jpegenc_class_init, NULL, NULL, - sizeof(GstJpegEnc), + sizeof (GstJpegEnc), 0, - (GInstanceInitFunc)gst_jpegenc_init, + (GInstanceInitFunc) gst_jpegenc_init, }; - jpegenc_type = g_type_register_static(GST_TYPE_ELEMENT, "GstJpegEnc", &jpegenc_info, 0); + jpegenc_type = + g_type_register_static (GST_TYPE_ELEMENT, "GstJpegEnc", &jpegenc_info, + 0); } return jpegenc_type; } static GstStaticPadTemplate gst_jpegenc_sink_pad_template = -GST_STATIC_PAD_TEMPLATE ( - "sink", +GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) -); + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) + ); static GstStaticPadTemplate gst_jpegenc_src_pad_template = -GST_STATIC_PAD_TEMPLATE ( - "src", +GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("image/jpeg, " - "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ], " - "framerate = (double) [ 1, MAX ]" - ) -); + "width = (int) [ 16, 4096 ], " + "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]") + ); static void gst_jpegenc_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - + gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_jpegenc_sink_pad_template)); gst_element_class_add_pad_template (element_class, @@ -118,29 +120,29 @@ gst_jpegenc_base_init (gpointer g_class) } static void -gst_jpegenc_class_init (GstJpegEnc *klass) +gst_jpegenc_class_init (GstJpegEnc * klass) { GObjectClass *gobject_class; GstElementClass *gstelement_class; - gobject_class = (GObjectClass*)klass; - gstelement_class = (GstElementClass*)klass; + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref(GST_TYPE_ELEMENT); + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); gst_jpegenc_signals[FRAME_ENCODED] = - g_signal_new ("frame-encoded", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstJpegEncClass, frame_encoded), NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_signal_new ("frame-encoded", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstJpegEncClass, frame_encoded), NULL, + NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); g_object_class_install_property (gobject_class, ARG_QUALITY, g_param_spec_int ("quality", "Quality", "Quality of encoding", - 0, 100, 85, G_PARAM_READWRITE)); + 0, 100, 85, G_PARAM_READWRITE)); #if 0 /* disabled, since it doesn't seem to work */ g_object_class_install_property (gobject_class, ARG_SMOOTHING, g_param_spec_int ("smoothing", "Smoothing", "Smoothing factor", - 0, 100, 0, G_PARAM_READWRITE)); + 0, 100, 0, G_PARAM_READWRITE)); #endif gobject_class->set_property = gst_jpegenc_set_property; @@ -160,44 +162,47 @@ gst_jpegenc_flush_destination (j_compress_ptr cinfo) return TRUE; } -static void gst_jpegenc_term_destination (j_compress_ptr cinfo) +static void +gst_jpegenc_term_destination (j_compress_ptr cinfo) { GST_DEBUG ("gst_jpegenc_chain: term_source"); } static void -gst_jpegenc_init (GstJpegEnc *jpegenc) +gst_jpegenc_init (GstJpegEnc * jpegenc) { /* create the sink and src pads */ - jpegenc->sinkpad = gst_pad_new_from_template ( - gst_static_pad_template_get (&gst_jpegenc_sink_pad_template), "sink"); - gst_pad_set_chain_function(jpegenc->sinkpad,gst_jpegenc_chain); - gst_pad_set_getcaps_function(jpegenc->sinkpad, gst_jpegenc_getcaps); - gst_pad_set_link_function(jpegenc->sinkpad, gst_jpegenc_link); - gst_element_add_pad(GST_ELEMENT(jpegenc),jpegenc->sinkpad); - - jpegenc->srcpad = gst_pad_new_from_template ( - gst_static_pad_template_get (&gst_jpegenc_src_pad_template), "src"); - gst_pad_set_getcaps_function(jpegenc->sinkpad, gst_jpegenc_getcaps); - gst_pad_set_link_function(jpegenc->sinkpad, gst_jpegenc_link); - gst_element_add_pad(GST_ELEMENT(jpegenc),jpegenc->srcpad); + jpegenc->sinkpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_jpegenc_sink_pad_template), "sink"); + gst_pad_set_chain_function (jpegenc->sinkpad, gst_jpegenc_chain); + gst_pad_set_getcaps_function (jpegenc->sinkpad, gst_jpegenc_getcaps); + gst_pad_set_link_function (jpegenc->sinkpad, gst_jpegenc_link); + gst_element_add_pad (GST_ELEMENT (jpegenc), jpegenc->sinkpad); + + jpegenc->srcpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_jpegenc_src_pad_template), "src"); + gst_pad_set_getcaps_function (jpegenc->sinkpad, gst_jpegenc_getcaps); + gst_pad_set_link_function (jpegenc->sinkpad, gst_jpegenc_link); + gst_element_add_pad (GST_ELEMENT (jpegenc), jpegenc->srcpad); /* reset the initial video state */ jpegenc->width = -1; jpegenc->height = -1; /* setup jpeglib */ - memset(&jpegenc->cinfo, 0, sizeof(jpegenc->cinfo)); - memset(&jpegenc->jerr, 0, sizeof(jpegenc->jerr)); - jpegenc->cinfo.err = jpeg_std_error(&jpegenc->jerr); - jpeg_create_compress(&jpegenc->cinfo); + memset (&jpegenc->cinfo, 0, sizeof (jpegenc->cinfo)); + memset (&jpegenc->jerr, 0, sizeof (jpegenc->jerr)); + jpegenc->cinfo.err = jpeg_std_error (&jpegenc->jerr); + jpeg_create_compress (&jpegenc->cinfo); GST_DEBUG ("gst_jpegenc_init: setting line buffers"); jpegenc->line[0] = NULL; jpegenc->line[1] = NULL; jpegenc->line[2] = NULL; - gst_jpegenc_resync(jpegenc); + gst_jpegenc_resync (jpegenc); jpegenc->jdest.init_destination = gst_jpegenc_init_destination; jpegenc->jdest.empty_output_buffer = gst_jpegenc_flush_destination; @@ -209,7 +214,7 @@ gst_jpegenc_init (GstJpegEnc *jpegenc) } static GstCaps * -gst_jpegenc_getcaps (GstPad *pad) +gst_jpegenc_getcaps (GstPad * pad) { GstJpegEnc *jpegenc = GST_JPEGENC (gst_pad_get_parent (pad)); GstPad *otherpad; @@ -225,7 +230,7 @@ gst_jpegenc_getcaps (GstPad *pad) } else { name = "video/x-raw-yuv"; } - for (i=0;i<gst_caps_get_size (caps); i++){ + for (i = 0; i < gst_caps_get_size (caps); i++) { structure = gst_caps_get_structure (caps, i); gst_structure_set_name (structure, name); @@ -236,7 +241,7 @@ gst_jpegenc_getcaps (GstPad *pad) } static GstPadLinkReturn -gst_jpegenc_link (GstPad *pad, const GstCaps *caps) +gst_jpegenc_link (GstPad * pad, const GstCaps * caps) { GstJpegEnc *jpegenc = GST_JPEGENC (gst_pad_get_parent (pad)); GstStructure *structure; @@ -248,18 +253,17 @@ gst_jpegenc_link (GstPad *pad, const GstCaps *caps) structure = gst_caps_get_structure (caps, 0); gst_structure_get_double (structure, "framerate", &jpegenc->fps); - gst_structure_get_int (structure, "width", &jpegenc->width); - gst_structure_get_int (structure, "height", &jpegenc->height); - + gst_structure_get_int (structure, "width", &jpegenc->width); + gst_structure_get_int (structure, "height", &jpegenc->height); + othercaps = gst_caps_copy (gst_pad_get_pad_template_caps (otherpad)); gst_caps_set_simple (othercaps, - "width", G_TYPE_INT, jpegenc->width, - "height", G_TYPE_INT, jpegenc->height, - "framerate", G_TYPE_DOUBLE, jpegenc->fps, - NULL); + "width", G_TYPE_INT, jpegenc->width, + "height", G_TYPE_INT, jpegenc->height, + "framerate", G_TYPE_DOUBLE, jpegenc->fps, NULL); ret = gst_pad_try_set_caps (jpegenc->srcpad, othercaps); - gst_caps_free(othercaps); + gst_caps_free (othercaps); if (GST_PAD_LINK_SUCCESSFUL (ret)) { gst_jpegenc_resync (jpegenc); @@ -269,7 +273,7 @@ gst_jpegenc_link (GstPad *pad, const GstCaps *caps) } static void -gst_jpegenc_resync (GstJpegEnc *jpegenc) +gst_jpegenc_resync (GstJpegEnc * jpegenc) { guint size = 0; gint width, height; @@ -282,11 +286,11 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) GST_DEBUG ("gst_jpegenc_resync: wdith %d, height %d", width, height); - jpeg_set_defaults(&jpegenc->cinfo); + jpeg_set_defaults (&jpegenc->cinfo); jpegenc->cinfo.dct_method = JDCT_FASTEST; - /*jpegenc->cinfo.dct_method = JDCT_DEFAULT;*/ + /*jpegenc->cinfo.dct_method = JDCT_DEFAULT; */ /*jpegenc->cinfo.smoothing_factor = jpegenc->smoothing; */ - jpeg_set_quality(&jpegenc->cinfo, jpegenc->quality, TRUE); + jpeg_set_quality (&jpegenc->cinfo, jpegenc->quality, TRUE); #if 0 switch (jpegenc->format) { @@ -310,24 +314,27 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) jpegenc->cinfo.comp_info[2].v_samp_factor = 1; if (height != -1) { - jpegenc->line[0] = g_realloc(jpegenc->line[0], height*sizeof(char*)); - jpegenc->line[1] = g_realloc(jpegenc->line[1], height*sizeof(char*)/2); - jpegenc->line[2] = g_realloc(jpegenc->line[2], height*sizeof(char*)/2); + jpegenc->line[0] = + g_realloc (jpegenc->line[0], height * sizeof (char *)); + jpegenc->line[1] = + g_realloc (jpegenc->line[1], height * sizeof (char *) / 2); + jpegenc->line[2] = + g_realloc (jpegenc->line[2], height * sizeof (char *) / 2); } GST_DEBUG ("gst_jpegenc_resync: setting format done"); #if 0 break; default: - printf("gst_jpegenc_resync: unsupported colorspace, using RGB\n"); + printf ("gst_jpegenc_resync: unsupported colorspace, using RGB\n"); size = 3; jpegenc->cinfo.in_color_space = JCS_RGB; break; } #endif - jpegenc->bufsize = jpegenc->width*jpegenc->height*size; + jpegenc->bufsize = jpegenc->width * jpegenc->height * size; - jpeg_suppress_tables(&jpegenc->cinfo, TRUE); + jpeg_suppress_tables (&jpegenc->cinfo, TRUE); //jpeg_suppress_tables(&jpegenc->cinfo, FALSE); jpegenc->buffer = NULL; @@ -335,17 +342,18 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) } static void -gst_jpegenc_chain (GstPad *pad, GstData *_data) +gst_jpegenc_chain (GstPad * pad, GstData * _data) { GstBuffer *buf = GST_BUFFER (_data); GstJpegEnc *jpegenc; guchar *data, *outdata; gulong size, outsize; GstBuffer *outbuf; + /* GstMeta *meta; */ guint height, width, width2; guchar *base[3]; - gint i,j, k; + gint i, j, k; g_return_if_fail (pad != NULL); g_return_if_fail (GST_IS_PAD (pad)); @@ -355,53 +363,58 @@ gst_jpegenc_chain (GstPad *pad, GstData *_data) /*usleep(10000); */ jpegenc = GST_JPEGENC (GST_OBJECT_PARENT (pad)); - data = GST_BUFFER_DATA(buf); - size = GST_BUFFER_SIZE(buf); + data = GST_BUFFER_DATA (buf); + size = GST_BUFFER_SIZE (buf); - GST_DEBUG ("gst_jpegenc_chain: got buffer of %ld bytes in '%s'",size, - GST_OBJECT_NAME (jpegenc)); + GST_DEBUG ("gst_jpegenc_chain: got buffer of %ld bytes in '%s'", size, + GST_OBJECT_NAME (jpegenc)); - outbuf = gst_buffer_new(); - outsize = GST_BUFFER_SIZE(outbuf) = jpegenc->bufsize; - outdata = GST_BUFFER_DATA(outbuf) = g_malloc(outsize); - GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf); + outbuf = gst_buffer_new (); + outsize = GST_BUFFER_SIZE (outbuf) = jpegenc->bufsize; + outdata = GST_BUFFER_DATA (outbuf) = g_malloc (outsize); + GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf); width = jpegenc->width; height = jpegenc->height; base[0] = data; - base[1] = base[0]+width*height; - base[2] = base[1]+width*height/4; + base[1] = base[0] + width * height; + base[2] = base[1] + width * height / 4; jpegenc->jdest.next_output_byte = outdata; jpegenc->jdest.free_in_buffer = outsize; jpegenc->cinfo.smoothing_factor = jpegenc->smoothing; - jpeg_set_quality(&jpegenc->cinfo, jpegenc->quality, TRUE); - jpeg_start_compress(&jpegenc->cinfo, TRUE); + jpeg_set_quality (&jpegenc->cinfo, jpegenc->quality, TRUE); + jpeg_start_compress (&jpegenc->cinfo, TRUE); - width2 = width>>1; + width2 = width >> 1; GST_DEBUG ("gst_jpegdec_chain: compressing"); - for (i = 0; i < height; i += 2*DCTSIZE) { - for (j=0, k=0; j<2*DCTSIZE;j+=2, k++) { - jpegenc->line[0][j] = base[0]; base[0] += width; - jpegenc->line[0][j+1] = base[0]; base[0] += width; - jpegenc->line[1][k] = base[1]; base[1] += width2; - jpegenc->line[2][k] = base[2]; base[2] += width2; + for (i = 0; i < height; i += 2 * DCTSIZE) { + for (j = 0, k = 0; j < 2 * DCTSIZE; j += 2, k++) { + jpegenc->line[0][j] = base[0]; + base[0] += width; + jpegenc->line[0][j + 1] = base[0]; + base[0] += width; + jpegenc->line[1][k] = base[1]; + base[1] += width2; + jpegenc->line[2][k] = base[2]; + base[2] += width2; } - jpeg_write_raw_data(&jpegenc->cinfo, jpegenc->line, 2*DCTSIZE); + jpeg_write_raw_data (&jpegenc->cinfo, jpegenc->line, 2 * DCTSIZE); } - jpeg_finish_compress(&jpegenc->cinfo); + jpeg_finish_compress (&jpegenc->cinfo); GST_DEBUG ("gst_jpegdec_chain: compressing done"); - GST_BUFFER_SIZE(outbuf) = (((outsize - jpegenc->jdest.free_in_buffer)+3)&~3); + GST_BUFFER_SIZE (outbuf) = + (((outsize - jpegenc->jdest.free_in_buffer) + 3) & ~3); - gst_pad_push(jpegenc->srcpad, GST_DATA (outbuf)); + gst_pad_push (jpegenc->srcpad, GST_DATA (outbuf)); - g_signal_emit(G_OBJECT(jpegenc),gst_jpegenc_signals[FRAME_ENCODED], 0); + g_signal_emit (G_OBJECT (jpegenc), gst_jpegenc_signals[FRAME_ENCODED], 0); - gst_buffer_unref(buf); + gst_buffer_unref (buf); } static void @@ -412,7 +425,7 @@ gst_jpegenc_set_property (GObject * object, guint prop_id, g_return_if_fail (GST_IS_JPEGENC (object)); jpegenc = GST_JPEGENC (object); - + switch (prop_id) { case ARG_QUALITY: jpegenc->quality = g_value_get_int (value); @@ -423,7 +436,7 @@ gst_jpegenc_set_property (GObject * object, guint prop_id, default: break; } -} +} static void gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value, @@ -446,4 +459,3 @@ gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value, break; } } - diff --git a/ext/jpeg/gstjpegenc.h b/ext/jpeg/gstjpegenc.h index b68b4859..beeaf6f9 100644 --- a/ext/jpeg/gstjpegenc.h +++ b/ext/jpeg/gstjpegenc.h @@ -30,8 +30,9 @@ #include <jpeglib.h> #ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +extern "C" +{ +#endif /* __cplusplus */ #define GST_TYPE_JPEGENC \ @@ -45,48 +46,50 @@ extern "C" { #define GST_IS_JPEGENC_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JPEGENC)) -typedef struct _GstJpegEnc GstJpegEnc; -typedef struct _GstJpegEncClass GstJpegEncClass; + typedef struct _GstJpegEnc GstJpegEnc; + typedef struct _GstJpegEncClass GstJpegEncClass; -struct _GstJpegEnc { - GstElement element; + struct _GstJpegEnc + { + GstElement element; - /* pads */ - GstPad *sinkpad,*srcpad; + /* pads */ + GstPad *sinkpad, *srcpad; - /* video state */ - gint format; - gint width; - gint height; - gdouble fps; - /* the video buffer */ - gint bufsize; - GstBuffer *buffer; - guint row_stride; - /* the jpeg line buffer */ - guchar **line[3]; + /* video state */ + gint format; + gint width; + gint height; + gdouble fps; + /* the video buffer */ + gint bufsize; + GstBuffer *buffer; + guint row_stride; + /* the jpeg line buffer */ + guchar **line[3]; - struct jpeg_compress_struct cinfo; - struct jpeg_error_mgr jerr; - struct jpeg_destination_mgr jdest; + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_destination_mgr jdest; - int quality; - int smoothing; -}; + int quality; + int smoothing; + }; -struct _GstJpegEncClass { - GstElementClass parent_class; + struct _GstJpegEncClass + { + GstElementClass parent_class; - /* signals */ - void (*frame_encoded) (GstElement *element); -}; + /* signals */ + void (*frame_encoded) (GstElement * element); + }; -GType gst_jpegenc_get_type(void); + GType gst_jpegenc_get_type (void); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* __GST_JPEGENC_H__ */ +#endif /* __GST_JPEGENC_H__ */ |