bcoudurier | 1 Sep 2010 02:04
Picon

r25014 - trunk/libavformat/gxfenc.c

Author: bcoudurier
Date: Wed Sep  1 02:04:47 2010
New Revision: 25014

Log:
gxf muxer only accepts pal or ntsc resolutions currently, so fail if resolution is something else

Modified:
   trunk/libavformat/gxfenc.c

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	Tue Aug 31 22:07:38 2010	(r25013)
+++ trunk/libavformat/gxfenc.c	Wed Sep  1 02:04:47 2010	(r25014)
 <at>  <at>  -678,12 +678,16  <at>  <at>  static int gxf_write_header(AVFormatCont
                 sc->sample_rate = 60;
                 gxf->flags |= 0x00000080;
                 gxf->time_base = (AVRational){ 1001, 60000 };
-            } else { /* assume PAL */
+            } else if (st->codec->height == 576 || st->codec->height == 608) { /* PAL or PAL+VBI */
                 sc->frame_rate_index = 6;
                 sc->media_type++;
                 sc->sample_rate = 50;
                 gxf->flags |= 0x00000040;
                 gxf->time_base = (AVRational){ 1, 50 };
+            } else {
+                av_log(s, AV_LOG_ERROR, "unsupported video resolution, "
+                       "gxf muxer only accepts PAL or NTSC resolutions currently\n");
+                return -1;
             }
(Continue reading)

diego | 1 Sep 2010 04:12
Picon

r25015 - in trunk: libavcodec/ansi.c libavcore/avcore.h libavcore/parseutils.h

Author: diego
Date: Wed Sep  1 04:12:03 2010
New Revision: 25015

Log:
Use quotes instead of angle brackets for local #includes.

Modified:
   trunk/libavcodec/ansi.c
   trunk/libavcore/avcore.h
   trunk/libavcore/parseutils.h

Modified: trunk/libavcodec/ansi.c
==============================================================================
--- trunk/libavcodec/ansi.c	Wed Sep  1 02:04:47 2010	(r25014)
+++ trunk/libavcodec/ansi.c	Wed Sep  1 04:12:03 2010	(r25015)
 <at>  <at>  -24,9 +24,9  <at>  <at> 
  * ASCII/ANSI art decoder
  */

+#include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "cga_data.h"
-#include <libavutil/lfg.h>

 #define ATTR_BOLD         0x01  /**≤ Bold/Bright-foreground (mode 1) */
 #define ATTR_FAINT        0x02  /**≤ Faint (mode 2) */

Modified: trunk/libavcore/avcore.h
==============================================================================
(Continue reading)

aurel | 1 Sep 2010 12:26
Picon

r25016 - trunk/libavcodec/avcodec.h

Author: aurel
Date: Wed Sep  1 12:26:28 2010
New Revision: 25016

Log:
add FF_API_PALETTE_CONTROL define to drop usage of AVPaletteControl
and delay this transition to v54 as it is currently not functional

Modified:
   trunk/libavcodec/avcodec.h

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Wed Sep  1 04:12:03 2010	(r25015)
+++ trunk/libavcodec/avcodec.h	Wed Sep  1 12:26:28 2010	(r25016)
 <at>  <at>  -43,6 +43,14  <at>  <at> 

 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)

+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_PALETTE_CONTROL
+#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+
 #define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
 #define AV_TIME_BASE            1000000
 #define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
(Continue reading)

vitor | 1 Sep 2010 14:38
Picon

r25017 - in trunk/tests: codec-regression.sh ref/vsynth1/qtrle ref/vsynth2/qtrle

Author: vitor
Date: Wed Sep  1 14:38:36 2010
New Revision: 25017

Log:
QTRLE regtest

Added:
   trunk/tests/ref/vsynth1/qtrle
   trunk/tests/ref/vsynth2/qtrle
Modified:
   trunk/tests/codec-regression.sh

Modified: trunk/tests/codec-regression.sh
==============================================================================
--- trunk/tests/codec-regression.sh	Wed Sep  1 12:26:28 2010	(r25016)
+++ trunk/tests/codec-regression.sh	Wed Sep  1 14:38:36 2010	(r25017)
 <at>  <at>  -248,6 +248,11  <at>  <at>  do_video_encoding roqav.roq "" "-vframes
 do_video_decoding "" "-pix_fmt yuv420p"
 fi

+if [ -n "$do_qtrle" ] ; then
+do_video_encoding qtrle.mov "" ""
+do_video_decoding "" ""
+fi
+
 if [ -n "$do_rgb" ] ; then
 do_video_encoding rgb.avi "" "-an -vcodec rawvideo -pix_fmt bgr24"
 do_video_decoding "" "-pix_fmt yuv420p"

(Continue reading)

rbultje | 1 Sep 2010 22:48
Picon

r25018 - in trunk/libavcodec/x86: Makefile dsputil_mmx.c dsputil_mmx.h h264_qpel_mmx.c h264dsp_mmx.c

Author: rbultje
Date: Wed Sep  1 22:48:59 2010
New Revision: 25018

Log:
Split h264dsp_mmx.c (which was #included in dsputil_mmx.c) in h264_qpel_mmx.c,
still #included in dsputil_mmx.c and is part of DSPContext, and h264dsp_mmx.c,
which represents H264DSPContext and is now compiled on its own.

Added:
   trunk/libavcodec/x86/h264_qpel_mmx.c
      - copied, changed from r24990, trunk/libavcodec/x86/h264dsp_mmx.c
Modified:
   trunk/libavcodec/x86/Makefile
   trunk/libavcodec/x86/dsputil_mmx.c
   trunk/libavcodec/x86/dsputil_mmx.h
   trunk/libavcodec/x86/h264dsp_mmx.c

Modified: trunk/libavcodec/x86/Makefile
==============================================================================
--- trunk/libavcodec/x86/Makefile	Wed Sep  1 14:38:36 2010	(r25017)
+++ trunk/libavcodec/x86/Makefile	Wed Sep  1 22:48:59 2010	(r25018)
 <at>  <at>  -8,6 +8,7  <at>  <at>  YASM-OBJS-$(CONFIG_FFT)                +
                                           $(YASM-OBJS-FFT-yes)
 YASM-OBJS-$(CONFIG_GPL)                += x86/h264_idct_sse2.o          \
 
+MMX-OBJS-$(CONFIG_H264DSP)             += x86/h264dsp_mmx.o
 YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock_sse2.o       \
                                           x86/h264_weight_sse2.o        \
 
(Continue reading)

rbultje | 1 Sep 2010 22:56
Picon

r25019 - in trunk/libavcodec/x86: Makefile h264_weight.asm h264_weight_sse2.asm h264dsp_mmx.c

Author: rbultje
Date: Wed Sep  1 22:56:16 2010
New Revision: 25019

Log:
Rename h264_weight_sse2.asm to h264_weight.asm; add 16x8/8x16/8x4 non-square
biweight code to sse2/ssse3; add sse2 weight code; and use that same code to
create mmx2 functions also, so that the inline asm in h264dsp_mmx.c can be
removed. OK'ed by Jason on IRC.

Added:
   trunk/libavcodec/x86/h264_weight.asm
      - copied, changed from r24986, trunk/libavcodec/x86/h264_weight_sse2.asm
Deleted:
   trunk/libavcodec/x86/h264_weight_sse2.asm
Modified:
   trunk/libavcodec/x86/Makefile
   trunk/libavcodec/x86/h264dsp_mmx.c

Modified: trunk/libavcodec/x86/Makefile
==============================================================================
--- trunk/libavcodec/x86/Makefile	Wed Sep  1 22:48:59 2010	(r25018)
+++ trunk/libavcodec/x86/Makefile	Wed Sep  1 22:56:16 2010	(r25019)
 <at>  <at>  -10,7 +10,7  <at>  <at>  YASM-OBJS-$(CONFIG_GPL)                +

 MMX-OBJS-$(CONFIG_H264DSP)             += x86/h264dsp_mmx.o
 YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock_sse2.o       \
-                                          x86/h264_weight_sse2.o        \
+                                          x86/h264_weight.o             \

(Continue reading)

rbultje | 1 Sep 2010 23:10
Picon

r25020 - trunk/libavcodec/x86/h264_weight.asm

Author: rbultje
Date: Wed Sep  1 23:10:19 2010
New Revision: 25020

Log:
Unscrew breakage after my last commit because of symbol prefixes.

Modified:
   trunk/libavcodec/x86/h264_weight.asm

Modified: trunk/libavcodec/x86/h264_weight.asm
==============================================================================
--- trunk/libavcodec/x86/h264_weight.asm	Wed Sep  1 22:56:16 2010	(r25019)
+++ trunk/libavcodec/x86/h264_weight.asm	Wed Sep  1 23:10:19 2010	(r25020)
 <at>  <at>  -86,7 +86,7  <at>  <at>  cglobal h264_weight_16x%1_mmx2, 5, 5, 0
     jnz .nextrow
     REP_RET
 %else
-    jmp _ff_h264_weight_16x16_mmx2.nextrow
+    jmp mangle(ff_h264_weight_16x16_mmx2.nextrow)
 %endif
 %endmacro

 <at>  <at>  -107,7 +107,7  <at>  <at>  cglobal h264_weight_%1x%2_%4, 7, 7, %
     jnz .nextrow
     REP_RET
 %else
-    jmp _ff_h264_weight_%1x16_%4.nextrow
+    jmp mangle(ff_h264_weight_%1x16_%4.nextrow)
 %endif
(Continue reading)

Ramiro Polla | 2 Sep 2010 00:22
Picon
Gravatar

Re: r25019 - in trunk/libavcodec/x86: Makefile h264_weight.asm h264_weight_sse2.asm h264dsp_mmx.c

On Wed, Sep 1, 2010 at 5:56 PM, rbultje <subversion <at> mplayerhq.hu> wrote:
> Author: rbultje
> Date: Wed Sep  1 22:56:16 2010
> New Revision: 25019
>
> Log:
> Rename h264_weight_sse2.asm to h264_weight.asm; add 16x8/8x16/8x4 non-square
> biweight code to sse2/ssse3; add sse2 weight code; and use that same code to
> create mmx2 functions also, so that the inline asm in h264dsp_mmx.c can be
> removed. OK'ed by Jason on IRC.

This or another close commit broke win64:
http://fate.ffmpeg.org/x86_64-w64-mingw32-gcc-4.4/20100901215453
bcoudurier | 2 Sep 2010 00:58
Picon

r25021 - trunk/libavformat/vorbiscomment.c

Author: bcoudurier
Date: Thu Sep  2 00:58:39 2010
New Revision: 25021

Log:
cosmetics: spaces between and after parentheses

Modified:
   trunk/libavformat/vorbiscomment.c

Modified: trunk/libavformat/vorbiscomment.c
==============================================================================
--- trunk/libavformat/vorbiscomment.c	Wed Sep  1 23:10:19 2010	(r25020)
+++ trunk/libavformat/vorbiscomment.c	Thu Sep  2 00:58:39 2010	(r25021)
 <at>  <at>  -43,7 +43,7  <at>  <at>  int ff_vorbiscomment_length(AVMetadata *
     *count = 0;
     if (m) {
         AVMetadataTag *tag = NULL;
-        while ( (tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX) ) ) {
+        while ((tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
             len += 4 +strlen(tag->key) + 1 + strlen(tag->value);
             (*count)++;
         }
 <at>  <at>  -59,7 +59,7  <at>  <at>  int ff_vorbiscomment_write(uint8_t **p, 
     if (m) {
         AVMetadataTag *tag = NULL;
         bytestream_put_le32(p, count);
-        while ( (tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX) ) ) {
+        while ((tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
             unsigned int len1 = strlen(tag->key);
(Continue reading)

darkshikari | 2 Sep 2010 01:19
Picon

r25022 - trunk/libavcodec/x86/h264_weight.asm

Author: darkshikari
Date: Thu Sep  2 01:19:36 2010
New Revision: 25022

Log:
Fix typo in r25019.

Patch by Eli Friedman <eli.friedman at gmail dot com>.

Modified:
   trunk/libavcodec/x86/h264_weight.asm

Modified: trunk/libavcodec/x86/h264_weight.asm
==============================================================================
--- trunk/libavcodec/x86/h264_weight.asm	Thu Sep  2 00:58:39 2010	(r25021)
+++ trunk/libavcodec/x86/h264_weight.asm	Thu Sep  2 01:19:36 2010	(r25022)
 <at>  <at>  -95,7 +95,7  <at>  <at>  WEIGHT_FUNC_DBL_MM 16
 WEIGHT_FUNC_DBL_MM  8

 %macro WEIGHT_FUNC_MM 4
-cglobal h264_weight_%1x%2_%4, 7, 7, %
+cglobal h264_weight_%1x%2_%4, 7, 7, %3
     WEIGHT_SETUP
     mov        r2, %2
 %if %2 == 16

Gmane