headers
Michael Niedermayer CVS | 1 Sep 2005 02:15
Picon

CVS: ffmpeg/libavcodec rv10.c,1.73,1.74

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

Modified Files:
	rv10.c 
Log Message:
error concealment fix

Index: rv10.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/rv10.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- rv10.c	25 Apr 2005 18:29:05 -0000	1.73
+++ rv10.c	1 Sep 2005 00:15:12 -0000	1.74
 <at>  <at>  -620,8 +620,14  <at>  <at> 
 //if(s->pict_type == P_TYPE) return 0;

     if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
+        if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames?
+            ff_er_frame_end(s);
+            MPV_frame_end(s);
+            s->mb_x= s->mb_y = s->resync_mb_x = s->resync_mb_y= 0;
+        }
         if(MPV_frame_start(s, avctx) < 0)
             return -1;
+        ff_er_frame_start(s);
     }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 2 Sep 2005 02:01
Picon

CVS: ffmpeg/tests libav.regression.ref,1.71,1.72

Update of /cvsroot/ffmpeg/ffmpeg/tests
In directory mail:/var2/tmp/cvs-serv23763

Modified Files:
	libav.regression.ref 
Log Message:
forgot to commit this after dv changes

Index: libav.regression.ref
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/libav.regression.ref,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- libav.regression.ref	25 Jul 2005 14:36:58 -0000	1.71
+++ libav.regression.ref	2 Sep 2005 00:00:58 -0000	1.72
 <at>  <at>  -28,9 +28,9  <at>  <at> 
 7c1a4d31acaaeaf172f59367e927f72c *./data/b-libav.nut
 332358 ./data/b-libav.nut
 ./data/b-libav.nut CRC=ccab3a27
-29a2c312bbc5b187491183a918556475 *./data/b-libav.dv
+b466c970d54eb254ad0f954b08535634 *./data/b-libav.dv
 3600000 ./data/b-libav.dv
-./data/b-libav.dv CRC=37b096b4
+./data/b-libav.dv CRC=c5215996
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
 317075 ./data/b-libav.pbm
 ./data/b-libav.pbm CRC=b92906cb
Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 2 Sep 2005 10:30
Picon

CVS: ffmpeg/libavcodec dv.c,1.64,1.65

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

Modified Files:
	dv.c 
Log Message:
lowres support

Index: dv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- dv.c	30 Aug 2005 20:03:19 -0000	1.64
+++ dv.c	2 Sep 2005 08:30:26 -0000	1.65
 <at>  <at>  -228,7 +228,13  <at>  <at> 
     /* 248DCT setup */
     s->fdct[1] = dsp.fdct248;
     s->idct_put[1] = simple_idct248_put;  // FIXME: need to add it to DSP
-    memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);
+    if(avctx->lowres){
+        for (i=0; i<64; i++){
+            int j= ff_zigzag248_direct[i];
+            s->dv_zigzag[1][i] = dsp.idct_permutation[(j&7) + (j&8)*4 + (j&48)/2];
+        }
+    }else
+        memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);

     /* XXX: do it only for constant case */
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 2 Sep 2005 10:30
Picon

CVS: ffmpeg/libavformat dv.c,1.44,1.45

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

Modified Files:
	dv.c 
Log Message:
lowres support

Index: dv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/dv.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- dv.c	17 Jul 2005 22:24:35 -0000	1.44
+++ dv.c	2 Sep 2005 08:30:26 -0000	1.45
 <at>  <at>  -593,8 +593,10  <at>  <at> 
 	
         av_set_pts_info(c->vst, 64, sys->frame_rate_base, sys->frame_rate);
         avctx->time_base= (AVRational){sys->frame_rate_base, sys->frame_rate};
-        avctx->width = sys->width;
-        avctx->height = sys->height;
+        if(!avctx->width){
+            avctx->width = sys->width;
+            avctx->height = sys->height;
+        }
         avctx->pix_fmt = sys->pix_fmt;

 	/* finding out SAR is a little bit messy */
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 2 Sep 2005 13:08
Picon

CVS: ffmpeg/libavcodec oggvorbis.c,1.19,1.20

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

Modified Files:
	oggvorbis.c 
Log Message:
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)

Index: oggvorbis.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/oggvorbis.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- oggvorbis.c	19 May 2005 11:45:10 -0000	1.19
+++ oggvorbis.c	2 Sep 2005 11:08:49 -0000	1.20
 <at>  <at>  -30,6 +30,11  <at>  <at> 

 static int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {

+    if(avccontext->flags & CODEC_FLAG_QSCALE) {
+        return vorbis_encode_init_vbr(vi, avccontext->channels,
+                avccontext->sample_rate,
+                avccontext->global_quality / (float)FF_QP2LAMBDA);
+    }
 #ifdef OGGVORBIS_VBR_BY_ESTIMATE
     /* variable bitrate by estimate */

 <at>  <at>  -87,6 +92,8  <at>  <at> 
     vorbis_comment_clear(&context->vc);
(Continue reading)

Permalink | Reply | 1 comment |
headers
Rich Felker | 2 Sep 2005 16:59

Re: CVS: ffmpeg/libavcodec oggvorbis.c,1.19,1.20

On Fri, Sep 02, 2005 at 01:08:51PM +0200, Michael Niedermayer CVS wrote:
> Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
> In directory mail:/var2/tmp/cvs-serv14106
> 
> Modified Files:
> 	oggvorbis.c 
> Log Message:
> fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
> 
> 
> Index: oggvorbis.c
> ===================================================================
> RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/oggvorbis.c,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -d -r1.19 -r1.20
> --- oggvorbis.c	19 May 2005 11:45:10 -0000	1.19
> +++ oggvorbis.c	2 Sep 2005 11:08:49 -0000	1.20
>  <at>  <at>  -30,6 +30,11  <at>  <at> 
>  
>  static int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {
>  
> +    if(avccontext->flags & CODEC_FLAG_QSCALE) {
> +        return vorbis_encode_init_vbr(vi, avccontext->channels,
> +                avccontext->sample_rate,
> +                avccontext->global_quality / (float)FF_QP2LAMBDA);
> +    }
>  #ifdef OGGVORBIS_VBR_BY_ESTIMATE
>      /* variable bitrate by estimate */
>
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer CVS | 2 Sep 2005 19:12
Picon

CVS: ffmpeg/libavcodec oggvorbis.c,1.20,1.21

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

Modified Files:
	oggvorbis.c 
Log Message:
setting timebase in the encoder doesnt seem like a good idea

Index: oggvorbis.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/oggvorbis.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- oggvorbis.c	2 Sep 2005 11:08:49 -0000	1.20
+++ oggvorbis.c	2 Sep 2005 17:12:16 -0000	1.21
 <at>  <at>  -92,8 +92,6  <at>  <at> 
     vorbis_comment_clear(&context->vc);

     avccontext->frame_size = OGGVORBIS_FRAME_SIZE ;
-    avccontext->time_base.den = avccontext->sample_rate;
-    avccontext->time_base.num = 1;

     avccontext->coded_frame= avcodec_alloc_frame();
     avccontext->coded_frame->key_frame= 1;
Permalink | Reply | 7 comments |
headers
Reimar Döffinger CVS | 2 Sep 2005 21:16
Picon

CVS: ffmpeg/libavcodec allcodecs.c, 1.109, 1.110 avcodec.h, 1.415, 1.416 pcm.c, 1.15, 1.16 utils.c, 1.148, 1.149

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

Modified Files:
	allcodecs.c avcodec.h pcm.c utils.c 
Log Message:
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).

Index: allcodecs.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- allcodecs.c	17 Jul 2005 00:28:11 -0000	1.109
+++ allcodecs.c	2 Sep 2005 19:16:48 -0000	1.110
 <at>  <at>  -524,6 +524,15  <at>  <at> 
     register_avcodec(& name ## _decoder);
 #endif

+PCM_CODEC(CODEC_ID_PCM_S32LE, pcm_s32le);
+PCM_CODEC(CODEC_ID_PCM_S32BE, pcm_s32be);
+PCM_CODEC(CODEC_ID_PCM_U32LE, pcm_u32le);
+PCM_CODEC(CODEC_ID_PCM_U32BE, pcm_u32be);
+PCM_CODEC(CODEC_ID_PCM_S24LE, pcm_s24le);
+PCM_CODEC(CODEC_ID_PCM_S24BE, pcm_s24be);
+PCM_CODEC(CODEC_ID_PCM_U24LE, pcm_u24le);
+PCM_CODEC(CODEC_ID_PCM_U24BE, pcm_u24be);
+PCM_CODEC(CODEC_ID_PCM_S24DAUD, pcm_s24daud);
 PCM_CODEC(CODEC_ID_PCM_S16LE, pcm_s16le);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Reimar Döffinger CVS | 2 Sep 2005 21:16
Picon

CVS: ffmpeg/libavformat wav.c, 1.53, 1.54 utils.c, 1.164, 1.165

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

Modified Files:
	wav.c utils.c 
Log Message:
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).

Index: wav.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- wav.c	17 Jul 2005 22:24:36 -0000	1.53
+++ wav.c	2 Sep 2005 19:16:48 -0000	1.54
 <at>  <at>  -25,6 +25,8  <at>  <at> 
     { CODEC_ID_AC3, 0x2000 },
     { CODEC_ID_PCM_S16LE, 0x01 },
     { CODEC_ID_PCM_U8, 0x01 }, /* must come after s16le in this list */
+    { CODEC_ID_PCM_S24LE, 0x01 },
+    { CODEC_ID_PCM_S32LE, 0x01 },
     { CODEC_ID_PCM_ALAW, 0x06 },
     { CODEC_ID_PCM_MULAW, 0x07 },
     { CODEC_ID_ADPCM_MS, 0x02 },
 <at>  <at>  -68,6 +70,10  <at>  <at> 
         bps = 0;
     } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS ||
enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { //
         bps = 4;
(Continue reading)

Permalink | Reply | 0 comments |
headers
Reimar Döffinger CVS | 2 Sep 2005 21:16
Picon

CVS: ffmpeg ffmpeg.c,1.343,1.344

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

Modified Files:
	ffmpeg.c 
Log Message:
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).

Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -d -r1.343 -r1.344
--- ffmpeg.c	21 Aug 2005 20:27:00 -0000	1.343
+++ ffmpeg.c	2 Sep 2005 19:16:48 -0000	1.344
 <at>  <at>  -599,6 +599,19  <at>  <at> 
         /* output a pcm frame */
         /* XXX: change encoding codec API to avoid this ? */
         switch(enc->codec->id) {
+        case CODEC_ID_PCM_S32LE:
+        case CODEC_ID_PCM_S32BE:
+        case CODEC_ID_PCM_U32LE:
+        case CODEC_ID_PCM_U32BE:
+            size_out = size_out << 1;
+            break;
+        case CODEC_ID_PCM_S24LE:
+        case CODEC_ID_PCM_S24BE:
+        case CODEC_ID_PCM_U24LE:
+        case CODEC_ID_PCM_U24BE:
(Continue reading)

Permalink | Reply | 0 comments |

Gmane