headers
diego | 1 Nov 2006 17:59
Picon

r6851 - trunk/libavutil/bswap.h

Author: diego
Date: Wed Nov  1 17:59:18 2006
New Revision: 6851

Modified:
   trunk/libavutil/bswap.h

Log:
better #endif comment

Modified: trunk/libavutil/bswap.h
==============================================================================
--- trunk/libavutil/bswap.h	(original)
+++ trunk/libavutil/bswap.h	Wed Nov  1 17:59:18 2006
 <at>  <at>  -149,7 +149,7  <at>  <at> 
     return r.ll;
 #endif
 }
-#endif  /* !ARCH_X86 */
+#endif  /* defined(ARCH_X86) || defined(ARCH_X86_64) */

 #endif  /* !HAVE_BYTESWAP_H */
Permalink | Reply | 0 comments |
headers
diego | 1 Nov 2006 18:01
Picon

r6852 - in trunk: configure libavcodec/cabac.h libavcodec/h264.c libavcodec/mathops.h libavutil/common.h libavutil/internal.h

Author: diego
Date: Wed Nov  1 18:01:33 2006
New Revision: 6852

Modified:
   trunk/configure
   trunk/libavcodec/cabac.h
   trunk/libavcodec/h264.c
   trunk/libavcodec/mathops.h
   trunk/libavutil/common.h
   trunk/libavutil/internal.h

Log:
Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change
the semantics of ARCH_X86 to mean both 32 and 64 bits.

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Nov  1 18:01:33 2006
 <at>  <at>  -355,10 +355,10  <at>  <at> 
 mmi="default"
 case "$arch" in
   i386|i486|i586|i686|i86pc|BePC)
-    arch="x86"
+    arch="x86_32"
   ;;
   x86_64|amd64)
-    arch="x86"
+    arch="x86"_32
(Continue reading)

Permalink | Reply | 0 comments |
headers
reimar | 1 Nov 2006 18:18
Picon

r6853 - in trunk/libavcodec: cabac.h h264.c

Author: reimar
Date: Wed Nov  1 18:18:49 2006
New Revision: 6853

Modified:
   trunk/libavcodec/cabac.h
   trunk/libavcodec/h264.c

Log:
Reenable AMD64 optimizations for cabac accidentially disabled in r6852

Modified: trunk/libavcodec/cabac.h
==============================================================================
--- trunk/libavcodec/cabac.h	(original)
+++ trunk/libavcodec/cabac.h	Wed Nov  1 18:18:49 2006
 <at>  <at>  -28,9 +28,6  <at>  <at> 

 //#undef NDEBUG
 #include <assert.h>
-#ifdef ARCH_X86_64
-#define ARCH_X86
-#endif
 #ifdef ARCH_X86
 #include "x86_cpu.h"
 #endif
 <at>  <at>  -379,7 +376,7  <at>  <at> 
 #define BYTE        "16"
 #define BYTEEND     "20"
 #endif
-#if defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__))
(Continue reading)

Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Nov 2006 18:27
Picon

r6854 - in trunk: doc/TODO libavformat/movenc.c

Author: bcoudurier
Date: Wed Nov  1 18:27:39 2006
New Revision: 6854

Modified:
   trunk/doc/TODO
   trunk/libavformat/movenc.c

Log:
mov vfr muxing

Modified: trunk/doc/TODO
==============================================================================
--- trunk/doc/TODO	(original)
+++ trunk/doc/TODO	Wed Nov  1 18:27:39 2006
 <at>  <at>  -69,7 +69,6  <at>  <at> 
 - MPEG4 GMC encoding support
 - macroblock based pixel format (better cache locality, somewhat complex, one paper claimed it faster for
high res)
 - finish NUT implementation
-- movenc.c fix stts so that variable framerate files work
 - seeking regression test
 - regression tests for codecs which dont have an encoder (I+P frame bitstream in svn)
 - add support for using mplayers video filters to ffmpeg

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	(original)
+++ trunk/libavformat/movenc.c	Wed Nov  1 18:27:39 2006
 <at>  <at>  -44,6 +44,7  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Nov 2006 18:56
Picon

r6855 - trunk/libavformat/movenc.c

Author: bcoudurier
Date: Wed Nov  1 18:56:22 2006
New Revision: 6855

Modified:
   trunk/libavformat/movenc.c

Log:
simplify

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	(original)
+++ trunk/libavformat/movenc.c	Wed Nov  1 18:56:22 2006
 <at>  <at>  -345,13 +345,10  <at>  <at> 
 static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
 {
     offset_t pos = url_ftell(pb);
-    int vbr=  track->mode == MODE_MOV &&
-        (track->enc->codec_id == CODEC_ID_AAC ||
-         track->enc->codec_id == CODEC_ID_MP3 ||
-         track->enc->codec_id == CODEC_ID_AMR_NB);
-    int version = vbr ||
-        track->enc->codec_id == CODEC_ID_PCM_S32LE ||
-        track->enc->codec_id == CODEC_ID_PCM_S24LE;
+    int version = track->mode == MODE_MOV &&
+        (track->audio_vbr ||
+         track->enc->codec_id == CODEC_ID_PCM_S32LE ||
+         track->enc->codec_id == CODEC_ID_PCM_S24LE);
(Continue reading)

Permalink | Reply | 0 comments |
headers
mru | 1 Nov 2006 19:18
Picon

r6856 - trunk/libavcodec/x264.c

Author: mru
Date: Wed Nov  1 19:18:48 2006
New Revision: 6856

Modified:
   trunk/libavcodec/x264.c

Log:
CODEC_CAP_DELAY support

Modified: trunk/libavcodec/x264.c
==============================================================================
--- trunk/libavcodec/x264.c	(original)
+++ trunk/libavcodec/x264.c	Wed Nov  1 19:18:48 2006
 <at>  <at>  -78,6 +78,7  <at>  <at> 
     x4->pic.img.i_csp = X264_CSP_I420;
     x4->pic.img.i_plane = 3;

+    if (frame) {
     for(i = 0; i < 3; i++){
         x4->pic.img.plane[i] = frame->data[i];
         x4->pic.img.i_stride[i] = frame->linesize[i];
 <at>  <at>  -85,8 +86,10  <at>  <at> 

     x4->pic.i_pts = frame->pts;
     x4->pic.i_type = X264_TYPE_AUTO;
+    }

-    if(x264_encoder_encode(x4->enc, &nal, &nnal, &x4->pic, &pic_out))
+    if(x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL,
(Continue reading)

Permalink | Reply | 0 comments |
headers
mru | 1 Nov 2006 19:19
Picon

r6857 - trunk/libavcodec/x264.c

Author: mru
Date: Wed Nov  1 19:19:20 2006
New Revision: 6857

Modified:
   trunk/libavcodec/x264.c

Log:
indentation

Modified: trunk/libavcodec/x264.c
==============================================================================
--- trunk/libavcodec/x264.c	(original)
+++ trunk/libavcodec/x264.c	Wed Nov  1 19:19:20 2006
 <at>  <at>  -79,13 +79,13  <at>  <at> 
     x4->pic.img.i_plane = 3;

     if (frame) {
-    for(i = 0; i < 3; i++){
-        x4->pic.img.plane[i] = frame->data[i];
-        x4->pic.img.i_stride[i] = frame->linesize[i];
-    }
+        for(i = 0; i < 3; i++){
+            x4->pic.img.plane[i] = frame->data[i];
+            x4->pic.img.i_stride[i] = frame->linesize[i];
+        }

-    x4->pic.i_pts = frame->pts;
-    x4->pic.i_type = X264_TYPE_AUTO;
+        x4->pic.i_pts = frame->pts;
(Continue reading)

Permalink | Reply | 0 comments |
headers
diego | 1 Nov 2006 19:20
Picon

r6858 - trunk/configure

Author: diego
Date: Wed Nov  1 19:20:15 2006
New Revision: 6858

Modified:
   trunk/configure

Log:
typo

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Nov  1 19:20:15 2006
 <at>  <at>  -358,7 +358,7  <at>  <at> 
     arch="x86_32"
   ;;
   x86_64|amd64)
-    arch="x86"_32
+    arch="x86_32"
     canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
Permalink | Reply | 0 comments |
headers
diego | 1 Nov 2006 19:34
Picon

r6859 - in trunk: libavcodec/bitstream.h libavcodec/msmpeg4.c libavutil/bswap.h libavutil/common.h libavutil/internal.h libpostproc/postprocess.c

Author: diego
Date: Wed Nov  1 19:34:40 2006
New Revision: 6859

Modified:
   trunk/libavcodec/bitstream.h
   trunk/libavcodec/msmpeg4.c
   trunk/libavutil/bswap.h
   trunk/libavutil/common.h
   trunk/libavutil/internal.h
   trunk/libpostproc/postprocess.c

Log:
Use common define for x86_32 and x86_64.

Modified: trunk/libavcodec/bitstream.h
==============================================================================
--- trunk/libavcodec/bitstream.h	(original)
+++ trunk/libavcodec/bitstream.h	Wed Nov  1 19:34:40 2006
 <at>  <at>  -47,7 +47,7  <at>  <at> 

 extern const uint8_t ff_reverse[256];

-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#if defined(ARCH_X86)
 // avoid +32 for shift optimization (gcc should do that ...)
 static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
     asm ("sarl %1, %0\n\t"
 <at>  <at>  -171,7 +171,7  <at>  <at> 
 #endif
(Continue reading)

Permalink | Reply | 0 comments |
headers
diego | 1 Nov 2006 19:51
Picon

r6860 - trunk/libavcodec/Makefile

Author: diego
Date: Wed Nov  1 19:51:37 2006
New Revision: 6860

Modified:
   trunk/libavcodec/Makefile

Log:
Make tests compile on non-x86.

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Wed Nov  1 19:51:37 2006
 <at>  <at>  -405,7 +405,11  <at>  <at> 
 LIBVERSION=$(LAVCVERSION)
 LIBMAJOR=$(LAVCMAJOR)
 endif
-TESTS= cpuid_test imgresample-test dct-test motion-test fft-test
+
+TESTS= imgresample-test fft-test
+ifeq ($(TARGET_ARCH_X86),yes)
+TESTS+= cpuid_test dct-test motion-test
+endif

 include $(SRC_PATH)/common.mak
Permalink | Reply | 0 comments |

Gmane