mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

// to /* */ fixes

Browse source 
Original commit message from CVS:
// to /* */ fixes
This commit is contained in:
Christian Schaller 2002-02-03 22:27:33 +00:00
parent 341e978125
commit 2c818e34fe
5 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit d81417a103945ab1c393e74557983b1163e9e353 Subproject commit 47d51c3f04e416caa4c43c72a5458df99cf09c3a

20
ext/jpeg/gstjpegdec.c
View file

@ -1,4 +1,4 @@
/* Gnome-Streamer /* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -20,7 +20,7 @@
#include <string.h> #include <string.h>
//#define DEBUG_ENABLED /*#define DEBUG_ENABLED*/
#include "gstjpegdec.h" #include "gstjpegdec.h"
extern GstPadTemplate *jpegdec_src_template, *jpegdec_sink_template; extern GstPadTemplate *jpegdec_src_template, *jpegdec_sink_template;
@ -52,7 +52,7 @@ static void gst_jpegdec_init (GstJpegDec *jpegdec);
static void gst_jpegdec_chain (GstPad *pad, GstBuffer *buf); static void gst_jpegdec_chain (GstPad *pad, GstBuffer *buf);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
//static guint gst_jpegdec_signals[LAST_SIGNAL] = { 0 }; /*static guint gst_jpegdec_signals[LAST_SIGNAL] = { 0 }; */
GType GType
gst_jpegdec_get_type(void) { gst_jpegdec_get_type(void) {
@ -129,7 +129,7 @@ gst_jpegdec_init (GstJpegDec *jpegdec)
/* initialize the jpegdec decoder state */ /* initialize the jpegdec decoder state */
jpegdec->next_time = 0; jpegdec->next_time = 0;
// reset the initial video state /* reset the initial video state */
jpegdec->format = -1; jpegdec->format = -1;
jpegdec->width = -1; jpegdec->width = -1;
jpegdec->height = -1; jpegdec->height = -1;
@ -160,7 +160,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
guchar *data, *outdata; guchar *data, *outdata;
gulong size, outsize; gulong size, outsize;
GstBuffer *outbuf; GstBuffer *outbuf;
//GstMeta *meta; /*GstMeta *meta;*/
gint width, height, width2; gint width, height, width2;
guchar *base[3]; guchar *base[3];
gint i,j, k; gint i,j, k;
@ -169,7 +169,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
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));
g_return_if_fail(buf != NULL); g_return_if_fail(buf != NULL);
//g_return_if_fail(GST_IS_BUFFER(buf)); /*g_return_if_fail(GST_IS_BUFFER(buf));*/
jpegdec = GST_JPEGDEC (GST_OBJECT_PARENT (pad)); jpegdec = GST_JPEGDEC (GST_OBJECT_PARENT (pad));
@ -193,9 +193,9 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
r_h = jpegdec->cinfo.cur_comp_info[0]->h_samp_factor; r_h = jpegdec->cinfo.cur_comp_info[0]->h_samp_factor;
r_v = jpegdec->cinfo.cur_comp_info[0]->v_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", 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[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", 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_fancy_upsampling = FALSE;
jpegdec->cinfo.do_block_smoothing = FALSE; jpegdec->cinfo.do_block_smoothing = FALSE;
@ -250,7 +250,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
base[1] += width2; base[2] += width2; base[1] += width2; base[2] += width2;
} }
} }
//g_print ("%d\n", jpegdec->cinfo.output_scanline); /*g_print ("%d\n", jpegdec->cinfo.output_scanline);*/
jpeg_read_raw_data(&jpegdec->cinfo, jpegdec->line, r_v*DCTSIZE); jpeg_read_raw_data(&jpegdec->cinfo, jpegdec->line, r_v*DCTSIZE);
} }

12
ext/jpeg/gstjpegdec.h
View file

@ -1,4 +1,4 @@
/* Gnome-Streamer /* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -53,18 +53,18 @@ struct _GstJpegDec {
GstPad *sinkpad,*srcpad; GstPad *sinkpad,*srcpad;
int parse_state; int parse_state;
// the timestamp of the next frame /* the timestamp of the next frame */
guint64 next_time; guint64 next_time;
// the interval between frames /* the interval between frames */
guint64 time_interval; guint64 time_interval;
// video state /* video state */
gint format; gint format;
gint width; gint width;
gint height; gint height;
// the size of the output buffer /* the size of the output buffer */
gint outsize; gint outsize;
// the jpeg line buffer /* the jpeg line buffer */
guchar **line[3]; guchar **line[3];
struct jpeg_decompress_struct cinfo; struct jpeg_decompress_struct cinfo;

14
ext/jpeg/gstjpegenc.c
View file

@ -1,4 +1,4 @@
/* Gnome-Streamer /* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -123,7 +123,7 @@ gst_jpegenc_init (GstJpegEnc *jpegenc)
jpegenc->srcpad = gst_pad_new("src",GST_PAD_SRC); jpegenc->srcpad = gst_pad_new("src",GST_PAD_SRC);
gst_element_add_pad(GST_ELEMENT(jpegenc),jpegenc->srcpad); gst_element_add_pad(GST_ELEMENT(jpegenc),jpegenc->srcpad);
// reset the initial video state /* reset the initial video state */
jpegenc->width = -1; jpegenc->width = -1;
jpegenc->height = -1; jpegenc->height = -1;
@ -163,8 +163,8 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
jpeg_set_defaults(&jpegenc->cinfo); jpeg_set_defaults(&jpegenc->cinfo);
jpegenc->cinfo.dct_method = JDCT_FASTEST; jpegenc->cinfo.dct_method = JDCT_FASTEST;
//jpegenc->cinfo.dct_method = JDCT_DEFAULT; /*jpegenc->cinfo.dct_method = JDCT_DEFAULT; */
//jpegenc->cinfo.smoothing_factor = 10; /*jpegenc->cinfo.smoothing_factor = 10; */
jpeg_set_quality(&jpegenc->cinfo, 85, TRUE); jpeg_set_quality(&jpegenc->cinfo, 85, TRUE);
/* /*
@ -243,7 +243,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
guchar *data, *outdata; guchar *data, *outdata;
gulong size, outsize; gulong size, outsize;
GstBuffer *outbuf; GstBuffer *outbuf;
// GstMeta *meta; /* GstMeta *meta; */
guint height, width, width2; guint height, width, width2;
guchar *base[3]; guchar *base[3];
gint i,j, k; gint i,j, k;
@ -251,9 +251,9 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
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));
g_return_if_fail (buf != NULL); g_return_if_fail (buf != NULL);
//g_return_if_fail(GST_IS_BUFFER(buf)); /*g_return_if_fail(GST_IS_BUFFER(buf)); */
//usleep(10000); /*usleep(10000); */
jpegenc = GST_JPEGENC (GST_OBJECT_PARENT (pad)); jpegenc = GST_JPEGENC (GST_OBJECT_PARENT (pad));
data = GST_BUFFER_DATA(buf); data = GST_BUFFER_DATA(buf);

6
ext/jpeg/gstjpegenc.h
View file

@ -52,15 +52,15 @@ struct _GstJpegEnc {
/* pads */ /* pads */
GstPad *sinkpad,*srcpad; GstPad *sinkpad,*srcpad;
// video state /* video state */
gint format; gint format;
gint width; gint width;
gint height; gint height;
// the video buffer /* the video buffer */
gint bufsize; gint bufsize;
GstBuffer *buffer; GstBuffer *buffer;
guint row_stride; guint row_stride;
// the jpeg line buffer /* the jpeg line buffer */
guchar **line[3]; guchar **line[3];
struct jpeg_compress_struct cinfo; struct jpeg_compress_struct cinfo;