headers
aurel | 1 Nov 2007 01:17
Picon

r10890 - trunk/libavcodec/adpcm.c

Author: aurel
Date: Thu Nov  1 01:17:18 2007
New Revision: 10890

Log:
cosmetics: sort

Modified:
   trunk/libavcodec/adpcm.c

Modified: trunk/libavcodec/adpcm.c
==============================================================================
--- trunk/libavcodec/adpcm.c	(original)
+++ trunk/libavcodec/adpcm.c	Thu Nov  1 01:17:18 2007
 <at>  <at>  -1558,6 +1558,9  <at>  <at>  ADPCM_ENCODER(id,name) ADPCM_DECODER(id,
 ADPCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm);
 ADPCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
 ADPCM_CODEC(CODEC_ID_ADPCM_EA, adpcm_ea);
+ADPCM_CODEC(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
+ADPCM_CODEC(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
+ADPCM_CODEC(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3);
 ADPCM_CODEC(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv);
 ADPCM_CODEC(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3);
 ADPCM_CODEC(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4);
 <at>  <at>  -1568,9 +1571,6  <at>  <at>  ADPCM_CODEC(CODEC_ID_ADPCM_IMA_SMJPEG, a
 ADPCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav);
 ADPCM_CODEC(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws);
 ADPCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
-ADPCM_CODEC(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
-ADPCM_CODEC(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael | 1 Nov 2007 02:59
Picon

r10891 - trunk/ffmpeg.c

Author: michael
Date: Thu Nov  1 02:59:22 2007
New Revision: 10891

Log:
check av_interleaved_write_frame() return
fixes issue149

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu Nov  1 02:59:22 2007
 <at>  <at>  -409,6 +409,8  <at>  <at>  get_sync_ipts(const AVOutputStream *ost)
 }

 static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx,
AVBitStreamFilterContext *bsfc){
+    int ret;
+
     while(bsfc){
         AVPacket new_pkt= *pkt;
         int a= av_bitstream_filter_filter(bsfc, avctx, NULL,
 <at>  <at>  -424,7 +426,11  <at>  <at>  static void write_frame(AVFormatContext 
         bsfc= bsfc->next;
     }

-    av_interleaved_write_frame(s, pkt);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Rich Felker | 1 Nov 2007 05:10

Re: r10823 - in trunk/libavformat: rm.h rmdec.c

On Wed, Oct 31, 2007 at 10:39:35PM +0100, Michael Niedermayer wrote:
> Hi
> 
> On Sun, Oct 21, 2007 at 07:17:28PM +0200, kostya wrote:
> > Author: kostya
> > Date: Sun Oct 21 19:17:28 2007
> > New Revision: 10823
> > 
> > Log:
> > Demux full frames instead of sliced for RealVideo.
> > Some changes by Roberto Togni and blessed by him on IRC.
> 
> i will revert this and the later patches depending on it in 24h if noone
> fixes the rm/rv regression tests failure this change caused

please don't. if there are bugs they should be fixed asap, but this
code is the direction forward and reverting it will just be a mess...

rich
Permalink | Reply | 1 comment |
headers
Kostya | 1 Nov 2007 07:57
Picon

Re: r10823 - in trunk/libavformat: rm.h rmdec.c

On Wed, Oct 31, 2007 at 10:39:35PM +0100, Michael Niedermayer wrote:
> Hi
> 
> On Sun, Oct 21, 2007 at 07:17:28PM +0200, kostya wrote:
> > Author: kostya
> > Date: Sun Oct 21 19:17:28 2007
> > New Revision: 10823
> > 
> > Log:
> > Demux full frames instead of sliced for RealVideo.
> > Some changes by Roberto Togni and blessed by him on IRC.
> 
> i will revert this and the later patches depending on it in 24h if noone
> fixes the rm/rv regression tests failure this change caused

I'm trying to fix RM muxer ASAP as it does not produce correct data at all.
For now the easiest solution is temporary disable regression tests for .rm
I will try to produce solution today though.

> [...]
> -- 
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Permalink | Reply | 2 comments |
headers
Rich Felker | 1 Nov 2007 08:02

Re: r10823 - in trunk/libavformat: rm.h rmdec.c

On Thu, Nov 01, 2007 at 08:57:37AM +0200, Kostya wrote:
> On Wed, Oct 31, 2007 at 10:39:35PM +0100, Michael Niedermayer wrote:
> > Hi
> > 
> > On Sun, Oct 21, 2007 at 07:17:28PM +0200, kostya wrote:
> > > Author: kostya
> > > Date: Sun Oct 21 19:17:28 2007
> > > New Revision: 10823
> > > 
> > > Log:
> > > Demux full frames instead of sliced for RealVideo.
> > > Some changes by Roberto Togni and blessed by him on IRC.
> > 
> > i will revert this and the later patches depending on it in 24h if noone
> > fixes the rm/rv regression tests failure this change caused
> 
> I'm trying to fix RM muxer ASAP as it does not produce correct data at all.
> For now the easiest solution is temporary disable regression tests for .rm
> I will try to produce solution today though.

I hope you got the comment from Michael that if the demuxer is
crashing, there's a bug in the demuxer not just the muxer. Even if
data is totally invalid or pulled from /dev/urandom or from Gabu's
encrypted cp volumes the demuxer should not crash but rather fail as
gracefully as possible. Fixing this crash is essential to making
Michael (and everyone, I think) happy; without the fix he will still
want to revert.

Rich
(Continue reading)

Permalink | Reply | 1 comment |
headers
kostya | 1 Nov 2007 10:02
Picon

r10892 - trunk/libavformat/rmdec.c

Author: kostya
Date: Thu Nov  1 10:02:29 2007
New Revision: 10892

Log:
Revert get_num() to old behaviour in order to handle
incorrect RMs generated by lavf muxer.

Modified:
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	(original)
+++ trunk/libavformat/rmdec.c	Thu Nov  1 10:02:29 2007
 <at>  <at>  -366,7 +366,7  <at>  <at>  static int get_num(ByteIOContext *pb, in

     n = get_be16(pb);
     (*len)-=2;
-    n &= 0x7FFF;
+//    n &= 0x7FFF;
     if (n >= 0x4000) {
         return n - 0x4000;
     } else {
Permalink | Reply | 3 comments |
headers
Kostya | 1 Nov 2007 11:03
Picon

Re: r10823 - in trunk/libavformat: rm.h rmdec.c

On Thu, Nov 01, 2007 at 03:02:16AM -0400, Rich Felker wrote:
> On Thu, Nov 01, 2007 at 08:57:37AM +0200, Kostya wrote:
> > On Wed, Oct 31, 2007 at 10:39:35PM +0100, Michael Niedermayer wrote:
> > > Hi
> > > 
> > > On Sun, Oct 21, 2007 at 07:17:28PM +0200, kostya wrote:
> > > > Author: kostya
> > > > Date: Sun Oct 21 19:17:28 2007
> > > > New Revision: 10823
> > > > 
> > > > Log:
> > > > Demux full frames instead of sliced for RealVideo.
> > > > Some changes by Roberto Togni and blessed by him on IRC.
> > > 
> > > i will revert this and the later patches depending on it in 24h if noone
> > > fixes the rm/rv regression tests failure this change caused
> > 
> > I'm trying to fix RM muxer ASAP as it does not produce correct data at all.
> > For now the easiest solution is temporary disable regression tests for .rm
> > I will try to produce solution today though.
> 
> I hope you got the comment from Michael that if the demuxer is
> crashing, there's a bug in the demuxer not just the muxer. Even if
> data is totally invalid or pulled from /dev/urandom or from Gabu's
> encrypted cp volumes the demuxer should not crash but rather fail as
> gracefully as possible. Fixing this crash is essential to making
> Michael (and everyone, I think) happy; without the fix he will still
> want to revert.
> 
> Rich
(Continue reading)

Permalink | Reply | 0 comments |
headers
gpoirier | 1 Nov 2007 12:51
Picon

r10893 - trunk/libavutil/mem.h

Author: gpoirier
Date: Thu Nov  1 12:51:51 2007
New Revision: 10893

Log:
doxy/cosmetics fixes. Patch by Stefano Sabatini %stefano P sabatini-lala A posteP it %

Modified:
   trunk/libavutil/mem.h

Modified: trunk/libavutil/mem.h
==============================================================================
--- trunk/libavutil/mem.h	(original)
+++ trunk/libavutil/mem.h	Thu Nov  1 12:51:51 2007
 <at>  <at>  -48,8 +48,8  <at>  <at>  void *av_realloc(void *ptr, unsigned int

 /**
  * Free memory which has been allocated with av_malloc(z)() or av_realloc().
- * NOTE: ptr = NULL is explicitly allowed.
- * Note2: It is recommended that you use av_freep() instead.
+ *  <at> note ptr = NULL is explicitly allowed.
+ *  <at> note It is recommended that you use av_freep() instead.
  */
 void av_free(void *ptr);

 <at>  <at>  -65,7 +65,7  <at>  <at>  char *av_strdup(const char *s);

 /**
  * Free memory and set the pointer to NULL.
- *  <at> param ptr pointer to the pointer which should be freed.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Nov 2007 16:41
Picon
Picon

Re: r10892 - trunk/libavformat/rmdec.c

Hi

On Thu, Nov 01, 2007 at 10:02:29AM +0100, kostya wrote:
> Author: kostya
> Date: Thu Nov  1 10:02:29 2007
> New Revision: 10892
> 
> Log:
> Revert get_num() to old behaviour in order to handle
> incorrect RMs generated by lavf muxer.
> 
> 
> Modified:
>    trunk/libavformat/rmdec.c
> 
> Modified: trunk/libavformat/rmdec.c
> ==============================================================================
> --- trunk/libavformat/rmdec.c	(original)
> +++ trunk/libavformat/rmdec.c	Thu Nov  1 10:02:29 2007
>  <at>  <at>  -366,7 +366,7  <at>  <at>  static int get_num(ByteIOContext *pb, in
>  
>      n = get_be16(pb);
>      (*len)-=2;
> -    n &= 0x7FFF;
> +//    n &= 0x7FFF;

it seems the seek regression tests still fail also
this cannot _fix_ the crash, as simply storing the & 0x7FFF
should still crash, its just a workaround
(Continue reading)

Permalink | Reply | 2 comments |
headers
aurel | 1 Nov 2007 16:51
Picon

r10894 - in trunk/libavcodec: Makefile adpcm.c allcodecs.c

Author: aurel
Date: Thu Nov  1 16:51:51 2007
New Revision: 10894

Log:
don't register adpcm encoders which are not implemented

Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/adpcm.c
   trunk/libavcodec/allcodecs.c

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Thu Nov  1 16:51:51 2007
 <at>  <at>  -259,13 +259,10  <at>  <at>  OBJS-$(CONFIG_PCM_MULAW_DECODER)       +
 OBJS-$(CONFIG_PCM_MULAW_ENCODER)       += pcm.o

 OBJS-$(CONFIG_ADPCM_4XM_DECODER)       += adpcm.o
-OBJS-$(CONFIG_ADPCM_4XM_ENCODER)       += adpcm.o
 OBJS-$(CONFIG_ADPCM_ADX_DECODER)       += adx.o
 OBJS-$(CONFIG_ADPCM_ADX_ENCODER)       += adx.o
 OBJS-$(CONFIG_ADPCM_CT_DECODER)        += adpcm.o
-OBJS-$(CONFIG_ADPCM_CT_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_DECODER)        += adpcm.o
-OBJS-$(CONFIG_ADPCM_EA_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)     += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_R2_DECODER)     += adpcm.o
 OBJS-$(CONFIG_ADPCM_EA_R3_DECODER)     += adpcm.o
(Continue reading)

Permalink | Reply | 0 comments |

Gmane