summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Mattern <tmattern@users.sourceforge.net>2003-04-30 06:58:50 +0000
committerThibaut Mattern <tmattern@users.sourceforge.net>2003-04-30 06:58:50 +0000
commit4f1dc4c3cebf7ba10aa9b59866c4e2f7a0bfd852 (patch)
treed93b1346c31e5de6edf3e73ddbf9480c22e20025
parent5f38710fc2e566f572d53bb9a96debf8006d0f7e (diff)
downloadxine-lib-4f1dc4c3cebf7ba10aa9b59866c4e2f7a0bfd852.tar.gz
xine-lib-4f1dc4c3cebf7ba10aa9b59866c4e2f7a0bfd852.tar.bz2
Don't forget to reset frame->bad_frame to 0 !
Fix strange problems with viz plugins. CVS patchset: 4716 CVS date: 2003/04/30 06:58:50
-rw-r--r--src/post/goom/xine_goom.c3
-rw-r--r--src/post/visualizations/fftscope.c5
-rw-r--r--src/post/visualizations/fooviz.c3
-rw-r--r--src/post/visualizations/oscope.c5
4 files changed, 11 insertions, 5 deletions
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 5a7e649cf..f191d352f 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_goom.c,v 1.29 2003/04/09 20:15:52 f1rmb Exp $
+ * $Id: xine_goom.c,v 1.30 2003/04/30 06:58:50 tmattern Exp $
*
* GOOM post plugin.
*
@@ -540,6 +540,7 @@ static void goom_port_put_buffer (xine_audio_port_t *port_gen,
VO_BOTH_FIELDS);
frame->extra_info->invalid = 1;
+ frame->bad_frame = 0;
frame->pts = vpts;
vpts = 0;
frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index 6c1cb6901..7ce034779 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -22,7 +22,7 @@
*
* FFT code by Steve Haehnichen, originally licensed under GPL v1
*
- * $Id: fftscope.c,v 1.12 2003/03/11 17:40:31 jkeil Exp $
+ * $Id: fftscope.c,v 1.13 2003/04/30 06:58:51 tmattern Exp $
*
*/
@@ -538,6 +538,7 @@ static void fftscope_port_put_buffer (xine_audio_port_t *port_gen,
uint64_t vpts = buf->vpts;
int i, c;
+
/* make a copy of buf data for private use */
if( this->buf.mem_size < buf->mem_size ) {
this->buf.mem = realloc(this->buf.mem, buf->mem_size);
@@ -594,8 +595,10 @@ static void fftscope_port_put_buffer (xine_audio_port_t *port_gen,
XINE_VO_ASPECT_SQUARE, XINE_IMGFMT_YUY2,
VO_BOTH_FIELDS);
frame->extra_info->invalid = 1;
+ frame->bad_frame = 0;
frame->pts = vpts;
vpts = 0;
+
frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
this->sample_counter -= this->samples_per_frame;
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index c8fd8391a..7f576af3e 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -23,7 +23,7 @@
* process. It simply paints the screen a solid color and rotates through
* colors on each iteration.
*
- * $Id: fooviz.c,v 1.5 2003/03/11 17:40:31 jkeil Exp $
+ * $Id: fooviz.c,v 1.6 2003/04/30 06:58:51 tmattern Exp $
*
*/
@@ -226,6 +226,7 @@ static void fooviz_port_put_buffer (xine_audio_port_t *port_gen,
XINE_VO_ASPECT_SQUARE, XINE_IMGFMT_YUY2,
VO_BOTH_FIELDS);
frame->extra_info->invalid = 1;
+ frame->bad_frame = 0;
frame->pts = vpts;
vpts = 0;
frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index a55ff6c17..b11e282bd 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -20,7 +20,7 @@
* Basic Oscilloscope Visualization Post Plugin For xine
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: oscope.c,v 1.6 2003/03/11 17:40:32 jkeil Exp $
+ * $Id: oscope.c,v 1.7 2003/04/30 06:58:51 tmattern Exp $
*
*/
@@ -293,6 +293,7 @@ static void oscope_port_put_buffer (xine_audio_port_t *port_gen,
XINE_VO_ASPECT_SQUARE, XINE_IMGFMT_YUY2,
VO_BOTH_FIELDS);
frame->extra_info->invalid = 1;
+ frame->bad_frame = 0;
frame->pts = vpts;
vpts = 0;
frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
@@ -395,7 +396,7 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs,
static char *oscope_get_identifier(post_class_t *class_gen)
{
- return "Oscilliscope";
+ return "Oscilloscope";
}
static char *oscope_get_description(post_class_t *class_gen)