Aurelien Jacobs CVS | 1 May 02:27 2006
Picon

CVS: ffmpeg/libavutil common.h,1.164,1.165

Update of /cvsroot/ffmpeg/ffmpeg/libavutil
In directory mail:/var2/tmp/cvs-serv11761/libavutil

Modified Files:
	common.h 
Log Message:
document clip functions

Index: common.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- common.h	30 Apr 2006 17:49:11 -0000	1.164
+++ common.h	1 May 2006 00:27:24 -0000	1.165
 <at>  <at>  -427,6 +427,13  <at>  <at> 
 #endif
 }

+/**
+ * clip a signed integer value into the amin-amax range
+ *  <at> param a value to clip
+ *  <at> param amin minimum value of the clip range
+ *  <at> param amax maximum value of the clip range
+ *  <at> return cliped value
+ */
 static inline int clip(int a, int amin, int amax)
 {
     if (a < amin)
(Continue reading)

Aurelien Jacobs CVS | 1 May 02:28 2006
Picon

CVS: ffmpeg/libavcodec mpegvideo.c,1.515,1.516

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv18550/libavcodec

Modified Files:
	mpegvideo.c 
Log Message:
clip_uint8 now return an uint8_t so no need to &0xFF

Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -d -r1.515 -r1.516
--- mpegvideo.c	28 Apr 2006 17:03:51 -0000	1.515
+++ mpegvideo.c	1 May 2006 00:28:36 -0000	1.516
 <at>  <at>  -5577,7 +5577,7  <at>  <at> 
         for(i=1;i<64;i++){
             int j= s->dsp.idct_permutation[i];

-            s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3) & 0xFF;
+            s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
         }
         convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
                        s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
Rich Felker | 1 May 03:25 2006

Re: CVS: ffmpeg/libavutil common.h,1.164,1.165

On Mon, May 01, 2006 at 02:27:26AM +0200, Aurelien Jacobs CVS wrote:
> Update of /cvsroot/ffmpeg/ffmpeg/libavutil
> In directory mail:/var2/tmp/cvs-serv11761/libavutil
> 
> Modified Files:
> 	common.h 
> Log Message:
> document clip functions
> 
> Index: common.h
> ===================================================================
> RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
> retrieving revision 1.164
> retrieving revision 1.165
> diff -u -d -r1.164 -r1.165
> --- common.h	30 Apr 2006 17:49:11 -0000	1.164
> +++ common.h	1 May 2006 00:27:24 -0000	1.165
>  <at>  <at>  -427,6 +427,13  <at>  <at> 
>  #endif
>  }
>  
> +/**
> + * clip a signed integer value into the amin-amax range
> + *  <at> param a value to clip
> + *  <at> param amin minimum value of the clip range
> + *  <at> param amax maximum value of the clip range
> + *  <at> return cliped value
> + */
>  static inline int clip(int a, int amin, int amax)
>  {
(Continue reading)

Baptiste Coudurier CVS | 1 May 17:53 2006
Picon

CVS: ffmpeg/libavformat mov.c,1.144,1.145

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv23057/libavformat

Modified Files:
	mov.c 
Log Message:
skip null fourcc, fix ep2_mystery_m640_dummy.mov

Index: mov.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- mov.c	19 Apr 2006 14:18:13 -0000	1.144
+++ mov.c	1 May 2006 15:52:57 -0000	1.145
 <at>  <at>  -944,15 +944,11  <at>  <at> 
         get_be16(pb); /* reserved */
         get_be16(pb); /* index */

-        dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n",
-                size,
-                (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff,
-                st->codec->codec_type);
         st->codec->codec_tag = format;
         id = codec_get_id(mov_audio_tags, format);
         if (id > 0) {
             st->codec->codec_type = CODEC_TYPE_AUDIO;
-        } else if (format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
+        } else if (format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
(Continue reading)

Michael Niedermayer CVS | 2 May 11:03 2006
Picon

CVS: ffmpeg/libavcodec mpeg12.c,1.250,1.251

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv19353

Modified Files:
	mpeg12.c 
Log Message:
d10 decoding fix

Index: mpeg12.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpeg12.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- mpeg12.c	8 Mar 2006 11:43:09 -0000	1.250
+++ mpeg12.c	2 May 2006 09:03:22 -0000	1.251
 <at>  <at>  -2618,10 +2618,13  <at>  <at> 

             if(s->mb_y<<field_pic >= s->mb_height){
                 int left= s->gb.size_in_bits - get_bits_count(&s->gb);
+                int is_d10= s->chroma_format==2 && s->pict_type==I_TYPE && avctx->profile==0 && avctx->level==5
+                            && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0
+                            && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/;

-                if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)))
+                if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10)
                    || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){
-                    av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d\n", left);
+                    av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23)));
                     return -1;
(Continue reading)

Luca Barbato CVS | 2 May 20:45 2006
Picon

CVS: ffmpeg/libavcodec/ppc dsputil_snow_altivec.c, 1.5, 1.6

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/ppc
In directory mail:/var2/tmp/cvs-serv20528/libavcodec/ppc

Modified Files:
	dsputil_snow_altivec.c 
Log Message:
Macosx fix

Index: dsputil_snow_altivec.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ppc/dsputil_snow_altivec.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dsputil_snow_altivec.c	25 Apr 2006 19:54:02 -0000	1.5
+++ dsputil_snow_altivec.c	2 May 2006 18:45:04 -0000	1.6
 <at>  <at>  -626,11 +626,11  <at>  <at> 
                                                vec_splat_u32(7))),\
                                vec_splat_u32(8));\
 \
-                mask = vec_sl((vector signed int)\
+                mask = (vector bool int) vec_sl((vector signed int)\
                         vec_cmpeq(v[x],v[x]),vec_splat_u32(8));\
-                mask = vec_and(v[x],vec_nor(mask,mask));\
+                mask = (vector bool int) vec_and(v[x],vec_nor(mask,mask));\
 \
-                mask = (vector signed int)\
+                mask = (vector bool int)\
                         vec_cmpeq((vector signed int)mask,\
                                   (vector signed int)vec_splat_u32(0));\
(Continue reading)

Luca Abeni CVS | 4 May 14:23 2006
Picon

CVS: ffmpeg/libavformat grab.c,1.43,1.44

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv8361/libavformat

Modified Files:
	grab.c 
Log Message:
Fix v4l grabbing with some webcams, and simplify the code.
Patch by Flavio Pimentel Duarte

Index: grab.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/grab.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- grab.c	13 Mar 2006 09:47:37 -0000	1.43
+++ grab.c	4 May 2006 12:23:12 -0000	1.44
 <at>  <at>  -65,6 +65,7  <at>  <at> 
     int desired_palette;
     struct video_tuner tuner;
     struct video_audio audio;
+    struct video_picture pict;
     const char *video_device;
     int j;

 <at>  <at>  -143,11 +144,36  <at>  <at> 
     audio.flags &= ~VIDEO_AUDIO_MUTE;
     ioctl(video_fd, VIDIOCSAUDIO, &audio);

+    ioctl(video_fd, VIDIOCGPICT, &pict);
(Continue reading)

Diego Biurrun CVS | 5 May 11:41 2006
Picon

CVS: ffmpeg/libavcodec Makefile,1.257,1.258

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv24415/libavcodec

Modified Files:
	Makefile 
Log Message:
Unconditionally clean AMR subdirs.

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- Makefile	27 Apr 2006 03:31:26 -0000	1.257
+++ Makefile	5 May 2006 09:41:06 -0000	1.258
 <at>  <at>  -240,14 +240,12  <at>  <at> 
 ifeq ($(AMR_NB),yes)
 AMROBJS= amr.o
 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
-CLEANAMR=cleanamrfloat
 endif

 ifeq ($(AMR_NB_FIXED),yes)
 AMROBJS= amr.o
 EXTRAOBJS += amr/*.o
 EXTRADEPS=amrlibs
-CLEANAMR=cleanamr
 endif

(Continue reading)

Diego Biurrun CVS | 5 May 12:27 2006
Picon

CVS: ffmpeg/libavcodec Makefile,1.258,1.259

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv22873

Modified Files:
	Makefile 
Log Message:
Ignore errors from recursive AMR cleans.

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- Makefile	5 May 2006 09:41:06 -0000	1.258
+++ Makefile	5 May 2006 10:27:44 -0000	1.259
 <at>  <at>  -442,8 +442,8  <at>  <at> 
 	   liba52/*.o liba52/*~ \
 	   amr_float/*.o \
 	   apiexample $(TESTS)
-	$(MAKE) -C amr clean
-	$(MAKE) -C amrwb_float -f makefile.gcc clean
+	-$(MAKE) -C amr clean
+	-$(MAKE) -C amrwb_float -f makefile.gcc clean

 # api example program
 apiexample: apiexample.c $(LIB)
Loren Merritt CVS | 5 May 20:08 2006
Picon

CVS: ffmpeg/libavcodec h264.c,1.203,1.204

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv18478

Modified Files:
	h264.c 
Log Message:
reinit quant matrices if pps is overwritten by another of the same pps_id.

Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- h264.c	30 Apr 2006 19:31:45 -0000	1.203
+++ h264.c	5 May 2006 18:08:01 -0000	1.204
 <at>  <at>  -7390,6 +7390,8  <at>  <at> 
     pps->constrained_intra_pred= get_bits1(&s->gb);
     pps->redundant_pic_cnt_present = get_bits1(&s->gb);

+    pps->transform_8x8_mode= 0;
+    h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
     memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t));
     memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t));

Gmane