[MPlayer-cvslog] CVS: main/libmpcodecs ve_divx4.c, 1.19, 1.20 ve_lavc.c, 1.129, 1.130 ve_libdv.c, 1.14, 1.15 ve_nuv.c, 1.8, 1.9 ve_qtvideo.c, 1.17, 1.18 ve_raw.c, 1.6, 1.7 ve_vfw.c, 1.20, 1.21 ve_x264.c, 1.43, 1.44 ve_xvid4.c, 1.22, 1.23 ve_xvid.c, 1.30, 1.31

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv10013/libmpcodecs

Modified Files:
	ve_divx4.c ve_lavc.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c 
	ve_vfw.c ve_x264.c ve_xvid4.c ve_xvid.c 
Log Message:
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer


Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ve_divx4.c	18 Nov 2005 14:39:22 -0000	1.19
+++ ve_divx4.c	26 Jan 2006 19:32:06 -0000	1.20
@@ -396,9 +396,9 @@
     vf->priv->enc_frame.produce_empty_frame = 0;
     encore(vf->priv->enc_handle, ENC_OPT_ENCODE, &vf->priv->enc_frame, &enc_result);
     if(enc_result.cType == 'I')
-        muxer_write_chunk(mux_v,vf->priv->enc_frame.length,0x10);
+        muxer_write_chunk(mux_v,vf->priv->enc_frame.length,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     else
-        muxer_write_chunk(mux_v,vf->priv->enc_frame.length,0);
+        muxer_write_chunk(mux_v,vf->priv->enc_frame.length,0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 #else
     vf->priv->enc_frame.mvs=NULL;
 #ifdef HAVE_XVID_VBR
@@ -444,7 +444,7 @@
 					       enc_result.quantizer);
 	}
     }
-    muxer_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0);
+    muxer_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 #endif
     return 1;
 }

Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- ve_lavc.c	25 Jan 2006 01:17:57 -0000	1.129
+++ ve_lavc.c	26 Jan 2006 19:32:06 -0000	1.130
@@ -859,7 +859,7 @@
     if(out_size == 0)
         return 0;
            
-    muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0);
+    muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
         
 #if LIBAVCODEC_BUILD >= 4643
     /* store psnr / pict size / type / qscale */

Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ve_libdv.c	18 Nov 2005 14:39:22 -0000	1.14
+++ ve_libdv.c	26 Jan 2006 19:32:06 -0000	1.15
@@ -77,7 +77,7 @@
 	(mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
 	mux_v->buffer);
 
-    muxer_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10);
+    muxer_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     return 1;
 }
 

Index: ve_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_nuv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ve_nuv.c	18 Nov 2005 14:39:22 -0000	1.8
+++ ve_nuv.c	26 Jan 2006 19:32:06 -0000	1.9
@@ -118,7 +118,7 @@
   
     le2me_rtframeheader(ench);
     mux_v->buffer=vf->priv->buffer;
-    muxer_write_chunk(mux_v,FRAMEHEADERSIZE + 128*sizeof(long int), 0x10);
+    muxer_write_chunk(mux_v,FRAMEHEADERSIZE + 128*sizeof(long int), 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     vf->priv->tbl_wrote = 1;
     memset(ench,0,FRAMEHEADERSIZE); // Reset the header
   }
@@ -175,7 +175,7 @@
   ench->packetlength = len;
   le2me_rtframeheader(ench);
   mux_v->buffer=(void*)ench;
-  muxer_write_chunk(mux_v, len + FRAMEHEADERSIZE, 0x10);
+  muxer_write_chunk(mux_v, len + FRAMEHEADERSIZE, 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
   return 1;
 }
 

Index: ve_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_qtvideo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ve_qtvideo.c	12 Jan 2006 20:04:34 -0000	1.17
+++ ve_qtvideo.c	26 Jan 2006 19:32:06 -0000	1.18
@@ -260,7 +260,7 @@
     printf("Size %i->%i   \n",stride*height,compressedsize);
     printf("Ratio: %i:1\n",(stride*height)/compressedsize);
 #endif
-    muxer_write_chunk(mux_v, compressedsize , similarity?0:0x10);
+    muxer_write_chunk(mux_v, compressedsize , similarity?0:0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 
     if(((*desc)->idSize)>MAX_IDSIZE){
 	mp_msg(MSGT_MENCODER,MSGL_ERR,"FATAL! idSize=%d too big, increase MAX_IDSIZE in ve_qtvideo.c!\n",((*desc)->idSize));

Index: ve_raw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_raw.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ve_raw.c	18 Nov 2005 14:39:22 -0000	1.6
+++ ve_raw.c	26 Jan 2006 19:32:06 -0000	1.7
@@ -117,7 +117,7 @@
 
 static int put_image(struct vf_instance_s *vf, mp_image_t *mpi) {
     mux_v->buffer = mpi->planes[0];
-    muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10);
+    muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     return 1;
 }
 

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ve_vfw.c	18 Nov 2005 14:39:22 -0000	1.20
+++ ve_vfw.c	26 Jan 2006 19:32:06 -0000	1.21
@@ -243,7 +243,7 @@
     int ret;
 //    flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack
     ret=vfw_encode_frame(mux_v->bih, mux_v->buffer, vfw_bih, mpi->planes[0], &flags, 10000);
-    muxer_write_chunk(mux_v,mux_v->bih->biSizeImage,flags);
+    muxer_write_chunk(mux_v,mux_v->bih->biSizeImage,flags, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     return 1;
 }
 

Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ve_x264.c	16 Jan 2006 01:37:32 -0000	1.43
+++ ve_x264.c	26 Jan 2006 19:32:06 -0000	1.44
@@ -511,7 +511,7 @@
         int keyframe = (pic_out.i_type == X264_TYPE_IDR) ||
                        (pic_out.i_type == X264_TYPE_I
                         && frame_ref == 1 && !bframe);
-        muxer_write_chunk(mod->mux, i_size, keyframe?0x10:0);
+        muxer_write_chunk(mod->mux, i_size, keyframe?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     }
 
     return i_size;

Index: ve_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ve_xvid4.c	18 Nov 2005 14:39:22 -0000	1.22
+++ ve_xvid4.c	26 Jan 2006 19:32:06 -0000	1.23
@@ -629,7 +629,7 @@
 	/* xvidcore outputed bitstream -- mux it */
 	muxer_write_chunk(mod->mux,
 			  size,
-			  (mod->frame.out_flags & XVID_KEYFRAME)?0x10:0);
+			  (mod->frame.out_flags & XVID_KEYFRAME)?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 
 	return(FINE);
 }
@@ -1378,7 +1378,7 @@
 
 			/* xvidcore outputed bitstream -- mux it */
 			muxer_write_chunk(mod->mux, size,
-					(mod->frame.out_flags & XVID_KEYFRAME)?0x10:0);
+					(mod->frame.out_flags & XVID_KEYFRAME)?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 		}
 	} while (size>0);
 }

Index: ve_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ve_xvid.c	18 Nov 2005 14:39:22 -0000	1.30
+++ ve_xvid.c	26 Jan 2006 19:32:06 -0000	1.31
@@ -523,7 +523,7 @@
 #endif
     
     // write output
-    muxer_write_chunk(fp->mux, fp->enc_frame.length, fp->enc_frame.intra==1 ? 0x10 : 0);
+    muxer_write_chunk(fp->mux, fp->enc_frame.length, fp->enc_frame.intra==1 ? 0x10 : 0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 
     // update the VBR engine
     vbrUpdate(&fp->vbr_state, enc_stats.quant, fp->enc_frame.intra,