headers
Guillaume Poirier CVS | 2 Nov 2005 10:18
Picon

CVS: ffmpeg/libavcodec utils.c,1.160,1.161

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

Modified Files:
	utils.c 
Log Message:
Typo fix

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- utils.c	20 Sep 2005 21:43:45 -0000	1.160
+++ utils.c	2 Nov 2005 09:18:32 -0000	1.161
 <at>  <at>  -701,7 +701,7  <at>  <at> 
 {"frame_skip_threshold", NULL, OFFSET(frame_skip_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN,
INT_MAX, V|E},
 {"frame_skip_factor", NULL, OFFSET(frame_skip_factor), FF_OPT_TYPE_INT, DEFAULT, INT_MIN,
INT_MAX, V|E},
 {"frame_skip_exp", NULL, OFFSET(frame_skip_exp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
-{"skipcmp", "frame skip comapare function", OFFSET(frame_skip_cmp), FF_OPT_TYPE_INT,
FF_CMP_DCTMAX, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), FF_OPT_TYPE_INT,
FF_CMP_DCTMAX, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"border_mask", NULL, OFFSET(border_masking), FF_OPT_TYPE_FLOAT, DEFAULT, FLT_MIN, FLT_MAX, V|E},
 {"mb_lmin", NULL, OFFSET(mb_lmin), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
 {"mb_lmax", NULL, OFFSET(mb_lmax), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
(Continue reading)

Permalink | Reply | 0 comments |
headers
Loren Merritt CVS | 4 Nov 2005 00:26
Picon

CVS: ffmpeg/libavcodec h264.c,1.163,1.164

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

Modified Files:
	h264.c 
Log Message:
tidier cabac_intra4x4_pred_mode

Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- h264.c	28 Oct 2005 18:18:04 -0000	1.163
+++ h264.c	3 Nov 2005 23:26:51 -0000	1.164
 <at>  <at>  -5291,12 +5291,10  <at>  <at> 
     if( get_cabac( &h->cabac, &h->cabac_state[68] ) )
         return pred_mode;

-    if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
-        mode += 1;
-    if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
-        mode += 2;
-    if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
-        mode += 4;
+    mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
+    mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
+    mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
+
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 5 Nov 2005 00:24
Picon

CVS: ffmpeg/libavcodec avcodec.h,1.426,1.427

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

Modified Files:
	avcodec.h 
Log Message:
extradata endianness comment

Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- avcodec.h	20 Oct 2005 20:04:45 -0000	1.426
+++ avcodec.h	4 Nov 2005 23:24:24 -0000	1.427
 <at>  <at>  -738,6 +738,7  <at>  <at> 
      * mpeg4: global headers (they can be in the bitstream or here)
      * the allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
      * then extradata_size to avoid prolems if its read with the bitstream reader
+     * the bytewise contents of extradata must not depend on the architecture or cpu endianness
      * - encoding: set/allocated/freed by lavc.
      * - decoding: set/allocated/freed by user.
      */
Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 5 Nov 2005 00:36
Picon
Picon

Re: CVS: ffmpeg/libavcodec truemotion2.c, NONE, 1.1 avcodec.h, 1.423, 1.424 allcodecs.c, 1.110, 1.111 Makefile, 1.203, 1.204

Hi

On Thu, Oct 13, 2005 at 06:31:57AM +0200, Mike Melanson CVS wrote:
[...]
>  <at>  <at>  -18,7 +18,7  <at>  <at> 
>        fft.o mdct.o raw.o golomb.o cabac.o\
>        dpcm.o adx.o faandct.o parser.o g726.o \
>        vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\
> -      opt.o
> +      opt.o truemotion2.o
>  
>  ifeq ($(CONFIG_AASC_DECODER),yes)
>      OBJS+= aasc.o

could you please place new decoders under ifeq like the ones below so
they can be nicely disabled

--

-- 
Michael
Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 5 Nov 2005 00:38
Picon
Picon

Re: CVS: ffmpeg/libavcodec Makefile, 1.205, 1.206 allcodecs.c, 1.111, 1.112 avcodec.h, 1.424, 1.425 mpegaudio.c, 1.23, 1.24 mpegaudio.h, 1.8, 1.9 mpegaudiodec.c, 1.61, 1.62

Hi

On Tue, Oct 18, 2005 at 10:16:45PM +0200, Roberto Togni CVS wrote:
> Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
> In directory mail:/var2/tmp/cvs-serv4913/libavcodec
> 
> Modified Files:
> 	Makefile allcodecs.c avcodec.h mpegaudio.c mpegaudio.h 
> 	mpegaudiodec.c 
> Log Message:
> QDM2 compatible decoder
> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
> retrieving revision 1.205
> retrieving revision 1.206
> diff -u -d -r1.205 -r1.206
> --- Makefile	14 Oct 2005 18:17:47 -0000	1.205
> +++ Makefile	18 Oct 2005 20:16:42 -0000	1.206
>  <at>  <at>  -18,7 +18,7  <at>  <at> 
>        fft.o mdct.o raw.o golomb.o cabac.o\
>        dpcm.o adx.o faandct.o parser.o g726.o \
>        vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\
> -      opt.o truemotion2.o
> +      opt.o qdm2.o truemotion2.o
>  
>  ifeq ($(CONFIG_AASC_DECODER),yes)
>      OBJS+= aasc.o
(Continue reading)

Permalink | Reply | 2 comments |
headers
Michael Niedermayer CVS | 5 Nov 2005 00:50
Picon

CVS: ffmpeg/libavformat utils.c,1.167,1.168

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

Modified Files:
	utils.c 
Log Message:
allow NULL write_header() and write_trailer()

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- utils.c	18 Sep 2005 14:45:17 -0000	1.167
+++ utils.c	4 Nov 2005 23:50:11 -0000	1.168
 <at>  <at>  -2253,9 +2253,11  <at>  <at> 
         }
     }

-    ret = s->oformat->write_header(s);
-    if (ret < 0)
-        return ret;
+    if(s->oformat->write_header){
+        ret = s->oformat->write_header(s);
+        if (ret < 0)
+            return ret;
+    }

     /* init PTS generation */
(Continue reading)

Permalink | Reply | 0 comments |
headers
Roberto Togni | 5 Nov 2005 01:00
Picon
Favicon

Re: CVS: ffmpeg/libavcodec Makefile, 1.205, 1.206 allcodecs.c, 1.111, 1.112 avcodec.h, 1.424, 1.425 mpegaudio.c, 1.23, 1.24 mpegaudio.h, 1.8, 1.9 mpegaudiodec.c, 1.61, 1.62

On Sat, 5 Nov 2005 00:38:03 +0100
Michael Niedermayer <michaelni <at> gmx.at> wrote:

> Hi
> 
[...]
> 
> could you also please place new decoders under ifeq like the ones below
> 
Done (also for tm2)

Ciao,
 Roberto
Permalink | Reply | 1 comment |
headers
Roberto Togni CVS | 5 Nov 2005 01:00
Picon

CVS: ffmpeg/libavcodec Makefile,1.208,1.209

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

Modified Files:
	Makefile 
Log Message:
Place qdm2 and truemotion2 in ifdef block so that they can be disabled

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- Makefile	23 Oct 2005 18:16:53 -0000	1.208
+++ Makefile	5 Nov 2005 00:00:24 -0000	1.209
 <at>  <at>  -18,7 +18,7  <at>  <at> 
       fft.o mdct.o raw.o golomb.o cabac.o\
       dpcm.o adx.o faandct.o parser.o g726.o \
       vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\
-      opt.o qdm2.o truemotion2.o
+      opt.o

 ifeq ($(CONFIG_AASC_DECODER),yes)
     OBJS+= aasc.o
 <at>  <at>  -98,6 +98,9  <at>  <at> 
 ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),)
     OBJS+= png.o
 endif
+ifeq ($(CONFIG_QDM2_DECODER),yes)
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 5 Nov 2005 01:10
Picon

CVS: ffmpeg/libavformat crc.c,1.9,1.10

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

Modified Files:
	crc.c 
Log Message:
per frame crc support

Index: crc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/crc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- crc.c	29 May 2004 02:06:31 -0000	1.9
+++ crc.c	5 Nov 2005 00:10:22 -0000	1.10
 <at>  <at>  -83,7 +83,18  <at>  <at> 
     CRCState *crc = s->priv_data;
     char buf[64];

-    snprintf(buf, sizeof(buf), "CRC=%08x\n", crc->crcval);
+    snprintf(buf, sizeof(buf), "CRC=0x%08x\n", crc->crcval);
+    put_buffer(&s->pb, buf, strlen(buf));
+    put_flush_packet(&s->pb);
+    return 0;
+}
+
+static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+    uint32_t crc = update_adler32(0, pkt->data, pkt->size);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 5 Nov 2005 01:16
Picon

CVS: ffmpeg/libavcodec mpegvideo.c,1.488,1.489

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

Modified Files:
	mpegvideo.c 
Log Message:
frame skip fixes
 fix 16pixel error in comparission
 fix vbv messup
 fix unlimited skip intervals, limited by GOP now

Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -d -r1.488 -r1.489
--- mpegvideo.c	14 Aug 2005 15:42:40 -0000	1.488
+++ mpegvideo.c	5 Nov 2005 00:16:03 -0000	1.489
 <at>  <at>  -2117,7 +2117,8  <at>  <at> 
         const int bw= plane ? 1 : 2;
         for(y=0; y<s->mb_height*bw; y++){
             for(x=0; x<s->mb_width*bw; x++){
-                int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride), ref->data[plane] + 8*(x +
y*stride), stride, 8);
+                int off= p->type == FF_BUFFER_TYPE_SHARED ? 0: 16;
+                int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride)+off, ref->data[plane] + 8*(x +
y*stride), stride, 8);

                 switch(s->avctx->frame_skip_exp){
(Continue reading)

Permalink | Reply | 0 comments |

Gmane