handle extra info properly; that is: the inverter should pass on the extra info,

the vis plugins should invalidate the extra info of the frames they output to not
interfere with the (correct) extra info which will be set by audio out

CVS patchset: 4250
CVS date: 2003/02/22 14:21:37

5 files changed, 11 insertions, 6 deletions

diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 65e6d94fc..04838b788 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.24 2003/01/29 17:21:14 miguelfreitas Exp $
+ * $Id: xine_goom.c,v 1.25 2003/02/22 14:21:37 mroi Exp $
  *
  * GOOM post plugin.
  *
@@ -528,6 +528,7 @@ static void goom_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->pts = vpts;
       vpts = 0;
       frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index 304005052..8d299a57a 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.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: invert.c,v 1.7 2002/12/30 14:26:51 mroi Exp $
+ * $Id: invert.c,v 1.8 2003/02/22 14:21:37 mroi Exp $
  */
  
 /*
@@ -238,7 +238,8 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream)
   inverted_frame->pts = frame->pts;
   inverted_frame->duration = frame->duration;
   inverted_frame->bad_frame = frame->bad_frame;
-  
+  extra_info_merge(inverted_frame->extra_info, frame->extra_info);
+    
   switch (inverted_frame->format) {
   case XINE_IMGFMT_YUY2:
     size = inverted_frame->pitches[0] * inverted_frame->height;
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index ad898ed16..02be47ea2 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.10 2003/02/17 00:02:52 tmattern Exp $
+ * $Id: fftscope.c,v 1.11 2003/02/22 14:21:37 mroi Exp $
  *
  */
 
@@ -593,6 +593,7 @@ static void fftscope_port_put_buffer (xine_audio_port_t *port_gen,
       frame = this->vo_port->get_frame (this->vo_port, FFT_WIDTH, FFT_HEIGHT,
                                         XINE_VO_ASPECT_SQUARE, XINE_IMGFMT_YUY2,
                                         VO_BOTH_FIELDS);
+      frame->extra_info->invalid = 1;
       frame->pts = vpts;
       vpts = 0;
       frame->duration = 90000 * this->samples_per_frame / this->sample_rate;
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index 443c244cd..b88641f21 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.3 2003/01/14 21:00:36 miguelfreitas Exp $
+ * $Id: fooviz.c,v 1.4 2003/02/22 14:21:37 mroi Exp $
  *
  */
 
@@ -225,6 +225,7 @@ static void fooviz_port_put_buffer (xine_audio_port_t *port_gen,
       frame = this->vo_port->get_frame (this->vo_port, FOO_WIDTH, FOO_HEIGHT,
                                         XINE_VO_ASPECT_SQUARE, XINE_IMGFMT_YUY2,
                                         VO_BOTH_FIELDS);
+      frame->extra_info->invalid = 1;
       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 61bb33384..e805ddb26 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.4 2003/02/14 04:17:23 tmmm Exp $
+ * $Id: oscope.c,v 1.5 2003/02/22 14:21:37 mroi Exp $
  *
  */
 
@@ -292,6 +292,7 @@ static void oscope_port_put_buffer (xine_audio_port_t *port_gen,
       frame = this->vo_port->get_frame (this->vo_port, OSCOPE_WIDTH, OSCOPE_HEIGHT,
                                         XINE_VO_ASPECT_SQUARE, XINE_IMGFMT_YUY2,
                                         VO_BOTH_FIELDS);
+      frame->extra_info->invalid = 1;
       frame->pts = vpts;
       vpts = 0;
       frame->duration = 90000 * this->samples_per_frame / this->sample_rate;