michael | 1 Aug 2007 02:39
Picon

r9846 - in trunk: configure libavcodec/mpegvideo.c libavcodec/mpegvideo_common.h

Author: michael
Date: Wed Aug  1 02:39:39 2007
New Revision: 9846

Log:
make grayscale only decoding checks in inner loops compiletime killable

Modified:
   trunk/configure
   trunk/libavcodec/mpegvideo.c
   trunk/libavcodec/mpegvideo_common.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Aug  1 02:39:39 2007
 <at>  <at>  -133,6 +133,7  <at>  <at>  show_help(){
   echo "  --disable-debug          disable debugging symbols"
   echo "  --disable-mpegaudio-hp   faster (but less accurate)"
   echo "                           MPEG audio decoding [default=no]"
+  echo "  --enable-gray            enable full grayscale support (slower color)"
   echo "  --disable-ffmpeg         disable ffmpeg build"
   echo "  --disable-ffserver       disable ffserver build"
   echo "  --disable-ffplay         disable ffplay build"
 <at>  <at>  -615,6 +616,7  <at>  <at>  CONFIG_LIST='
     v4l2
     x11grab
     zlib
+    gray
 '
(Continue reading)

michael | 1 Aug 2007 03:01
Picon

r9847 - trunk/libavcodec/h264.c

Author: michael
Date: Wed Aug  1 03:01:03 2007
New Revision: 9847

Log:
use ENABLE_GRAY

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Wed Aug  1 03:01:03 2007
 <at>  <at>  -2432,7 +2432,7  <at>  <at>  static inline void mc_dir_part(H264Conte
         qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
     }

-    if(s->flags&CODEC_FLAG_GRAY) return;
+    if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return;

     if(MB_MBAFF){
         // chroma offset when predicting from a field of opposite parity
 <at>  <at>  -3007,7 +3007,7  <at>  <at>  static inline void backup_mb_border(H264
     *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y +  16*linesize);
     *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);

-    if(simple || !(s->flags&CODEC_FLAG_GRAY)){
+    if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
         h->left_border[17  ]= h->top_borders[0][s->mb_x][16+7];
(Continue reading)

jbr | 1 Aug 2007 03:13
Picon

r9848 - trunk/libavcodec/ac3dec.c

Author: jbr
Date: Wed Aug  1 03:13:58 2007
New Revision: 9848

Log:
align array used in mdct. fixes segfault.

Modified:
   trunk/libavcodec/ac3dec.c

Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c	(original)
+++ trunk/libavcodec/ac3dec.c	Wed Aug  1 03:13:58 2007
 <at>  <at>  -686,7 +686,7  <at>  <at>  static void do_rematrixing(AC3DecodeCont
 static void do_imdct_256(AC3DecodeContext *ctx, int chindex)
 {
     int i, k;
-    float x[128];
+    DECLARE_ALIGNED_16(float, x[128]);
     FFTComplex z[2][64];
     float *o_ptr = ctx->tmp_output;
mhoffman | 1 Aug 2007 04:16
Picon

r9849 - trunk/CREDITS

Author: mhoffman
Date: Wed Aug  1 04:16:08 2007
New Revision: 9849

Log:
adding myself to the CREDITS

Modified:
   trunk/CREDITS

Modified: trunk/CREDITS
==============================================================================
--- trunk/CREDITS	(original)
+++ trunk/CREDITS	Wed Aug  1 04:16:08 2007
 <at>  <at>  -18,6 +18,7  <at>  <at>  Vladimir Gneushev
 Roine Gustafsson
 David Hammerton
 Wolfgang Hesseler
+Marc Hoffman
 Falk Hueffner
 Steven Johnson
 Zdenek Kabelac
Benjamin Larsson | 1 Aug 2007 07:39
Picon

Re: r9848 - trunk/libavcodec/ac3dec.c

jbr wrote:
> Author: jbr
> Date: Wed Aug  1 03:13:58 2007
> New Revision: 9848
> 
> Log:
> align array used in mdct. fixes segfault.
> 
> Modified:
>    trunk/libavcodec/ac3dec.c
> 
> Modified: trunk/libavcodec/ac3dec.c
> ==============================================================================
> --- trunk/libavcodec/ac3dec.c	(original)
> +++ trunk/libavcodec/ac3dec.c	Wed Aug  1 03:13:58 2007
>  <at>  <at>  -686,7 +686,7  <at>  <at>  static void do_rematrixing(AC3DecodeCont
>  static void do_imdct_256(AC3DecodeContext *ctx, int chindex)
>  {
>      int i, k;
> -    float x[128];
> +    DECLARE_ALIGNED_16(float, x[128]);
>      FFTComplex z[2][64];
>      float *o_ptr = ctx->tmp_output;

This wont work on win32/beos with regular gcc's. Please use an array
allocated in the AC3DecodeContext.

MvH
Benjamin Larsson
(Continue reading)

Måns Rullgård | 1 Aug 2007 09:26

Re: r9846 - in trunk: configure libavcodec/mpegvideo.c libavcodec/mpegvideo_common.h

michael <subversion <at> mplayerhq.hu> writes:

> Author: michael
> Date: Wed Aug  1 02:39:39 2007
> New Revision: 9846
>
> Log:
> make grayscale only decoding checks in inner loops compiletime killable
>
> Modified:
>    trunk/configure
>    trunk/libavcodec/mpegvideo.c
>    trunk/libavcodec/mpegvideo_common.h
>
> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	(original)
> +++ trunk/configure	Wed Aug  1 02:39:39 2007
>  <at>  <at>  -133,6 +133,7  <at>  <at>  show_help(){
>    echo "  --disable-debug          disable debugging symbols"
>    echo "  --disable-mpegaudio-hp   faster (but less accurate)"
>    echo "                           MPEG audio decoding [default=no]"
> +  echo "  --enable-gray            enable full grayscale support (slower color)"
>    echo "  --disable-ffmpeg         disable ffmpeg build"
>    echo "  --disable-ffserver       disable ffserver build"
>    echo "  --disable-ffplay         disable ffplay build"
>  <at>  <at>  -615,6 +616,7  <at>  <at>  CONFIG_LIST='
>      v4l2
>      x11grab
>      zlib
(Continue reading)

diego | 1 Aug 2007 10:09
Picon

[propchange]: r9845 - svn:log

Author: diego
Revision: 9845
Property Name: svn:log
Action: modified

Property diff:
--- old property value
+++ new property value
 <at>  <at>  -1 +1,2  <at>  <at> 
-move some code which was executed for every skiped MB so its only executed for the first skiped mb in a run
+move some code which was executed for every skipped MB so it is only executed
+for the first skipped mb in a run
diego | 1 Aug 2007 10:10
Picon

[propchange]: r9842 - svn:log

Author: diego
Revision: 9842
Property Name: svn:log
Action: modified

Property diff:
--- old property value
+++ new property value
 <at>  <at>  -1 +1  <at>  <at> 
-chroma_qscale seems not used anywhere for mpeg1/2 so dont waste cpu time setting it
+chroma_qscale seems not used anywhere for mpeg1/2 so do not waste cpu time setting it
diego | 1 Aug 2007 10:50
Picon

[propchange]: r9839 - svn:log

Author: diego
Revision: 9839
Property Name: svn:log
Action: modified

Property diff:
--- old property value
+++ new property value
 <at>  <at>  -1 +1  <at>  <at> 
-deal with the case where one of pts,dts has wraped but the other has not
+deal with the case where one of pts,dts has wrapped but the other has not
Uoti Urpala | 1 Aug 2007 14:10
Picon
Picon

Re: r9848 - trunk/libavcodec/ac3dec.c

On Wed, 2007-08-01 at 07:39 +0200, Benjamin Larsson wrote:
> jbr wrote:
> >  static void do_imdct_256(AC3DecodeContext *ctx, int chindex)
> >  {
> >      int i, k;
> > -    float x[128];
> > +    DECLARE_ALIGNED_16(float, x[128]);
> >      FFTComplex z[2][64];
> >      float *o_ptr = ctx->tmp_output;
> 
> This wont work on win32/beos with regular gcc's. Please use an array
> allocated in the AC3DecodeContext.

What do you mean by "with regular gccs"? And why would it fail? I don't
see anything special about this case - if you're talking about the same
"other code misaligns stack and no forced realign was used" or "old
buggy gcc version was used" issues then those already occur elsewhere in
the code.

Gmane