February 2008 - ffmpeg-cvslog

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r12212 - trunk/libavcodec/faandct.c
by subversion＠mplayerhq.hu 06 Sep '08

06 Sep '08

Author: michael Date: Mon Feb 25 15:42:12 2008 New Revision: 12212 Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap). Modified: trunk/libavcodec/faandct.c Modified: trunk/libavcodec/faandct.c ============================================================================== --- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */ /**

5 8

r11806 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 25 May '08

25 May '08

Author: lorenm Date: Sat Feb 2 11:51:56 2008 New Revision: 11806 Log: mbaff spatial direct Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Sat Feb 2 11:51:56 2008 @@ -1017,14 +1017,76 @@ static inline void pred_direct_motion(H2 } if(ref[1] < 0){ - *mb_type &= ~MB_TYPE_P0L1; - sub_mb_type &= ~MB_TYPE_P0L1; + if(!is_b8x8) + *mb_type &= ~MB_TYPE_L1; + sub_mb_type &= ~MB_TYPE_L1; }else if(ref[0] < 0){ - *mb_type &= ~MB_TYPE_P0L0; - sub_mb_type &= ~MB_TYPE_P0L0; + if(!is_b8x8) + *mb_type &= ~MB_TYPE_L0; + sub_mb_type &= ~MB_TYPE_L0; } - if(IS_16X16(*mb_type)){ + if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){ + int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride; + int mb_types_col[2]; + int b8_stride = h->b8_stride; + int b4_stride = h->b_stride; + + *mb_type = (*mb_type & ~MB_TYPE_16x16) | MB_TYPE_8x8; + + if(IS_INTERLACED(*mb_type)){ + mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy]; + mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; + if(s->mb_y&1){ + l1ref0 -= 2*b8_stride; + l1ref1 -= 2*b8_stride; + l1mv0 -= 4*b4_stride; + l1mv1 -= 4*b4_stride; + } + b8_stride *= 3; + b4_stride *= 6; + }else{ + int cur_poc = s->current_picture_ptr->poc; + int *col_poc = h->ref_list[1]->field_poc; + int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc); + int dy = 2*col_parity - (s->mb_y&1); + mb_types_col[0] = + mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy + col_parity*s->mb_stride]; + l1ref0 += dy*b8_stride; + l1ref1 += dy*b8_stride; + l1mv0 += 2*dy*b4_stride; + l1mv1 += 2*dy*b4_stride; + b8_stride = 0; + } + + for(i8=0; i8<4; i8++){ + int x8 = i8&1; + int y8 = i8>>1; + int xy8 = x8+y8*b8_stride; + int xy4 = 3*x8+y8*b4_stride; + int a=0, b=0; + + if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) + continue; + h->sub_mb_type[i8] = sub_mb_type; + + fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1); + fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); + if(!IS_INTRA(mb_types_col[y8]) + && ( (l1ref0[xy8] == 0 && FFABS(l1mv0[xy4][0]) <= 1 && FFABS(l1mv0[xy4][1]) <= 1) + || (l1ref0[xy8] < 0 && l1ref1[xy8] == 0 && FFABS(l1mv1[xy4][0]) <= 1 && FFABS(l1mv1[xy4][1]) <= 1))){ + if(ref[0] > 0) + a= pack16to32(mv[0][0],mv[0][1]); + if(ref[1] > 0) + b= pack16to32(mv[1][0],mv[1][1]); + }else{ + a= pack16to32(mv[0][0],mv[0][1]); + b= pack16to32(mv[1][0],mv[1][1]); + } + fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4); + fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4); + } + }else if(IS_16X16(*mb_type)){ int a=0, b=0; fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1); @@ -4046,8 +4108,6 @@ static int decode_slice_header(H264Conte if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ if(h->slice_type == B_TYPE){ h->direct_spatial_mv_pred= get_bits1(&s->gb); - if(FIELD_OR_MBAFF_PICTURE && h->direct_spatial_mv_pred) - av_log(h->s.avctx, AV_LOG_ERROR, "Interlaced pictures + spatial direct mode is not implemented\n"); } num_ref_idx_active_override_flag= get_bits1(&s->gb);

2 1

r12194 - in trunk: common.mak configure libavcodec/avcodec.h libavcodec/opt.h libavformat/avformat.h libpostproc/Makefile libpostproc/postprocess.h
by subversion＠mplayerhq.hu 22 Mar '08

22 Mar '08

Author: mru Date: Mon Feb 25 10:22:11 2008 New Revision: 12194 Log: Install headers in $prefix/include/$libname Install each library's headers in $prefix/include/$libname. The installed headers use #include "lib*/*.h"; applications are expected to do the same. Specify only $prefix/include in .pc files. Modified: trunk/common.mak trunk/configure trunk/libavcodec/avcodec.h trunk/libavcodec/opt.h trunk/libavformat/avformat.h trunk/libpostproc/Makefile trunk/libpostproc/postprocess.h Modified: trunk/common.mak ============================================================================== --- trunk/common.mak (original) +++ trunk/common.mak Mon Feb 25 10:22:11 2008 @@ -79,10 +79,12 @@ install-lib-static: $(LIBNAME) install -m 644 $(LIBNAME) "$(LIBDIR)" $(LIB_INSTALL_EXTRA_CMD) +INCINSTDIR = $(INCDIR)/lib$(NAME) + install-headers: - install -d "$(INCDIR)" + install -d "$(INCINSTDIR)" install -d "$(LIBDIR)/pkgconfig" - install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)" + install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCINSTDIR)" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" uninstall: uninstall-libs uninstall-headers @@ -95,7 +97,7 @@ uninstall-libs: -rm -f "$(LIBDIR)/$(LIBNAME)" uninstall-headers:: - rm -f $(addprefix "$(INCDIR)/",$(HEADERS)) + rm -f $(addprefix "$(INCINSTDIR)/",$(HEADERS)) rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc" tests: $(TESTS) Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Feb 25 10:22:11 2008 @@ -882,7 +882,7 @@ logfile="config.err" PREFIX="/usr/local" libdir='$(PREFIX)/lib' shlibdir="$libdir" -incdir='$(PREFIX)/include/ffmpeg' +incdir='$(PREFIX)/include' mandir='$(PREFIX)/share/man' bindir='$(PREFIX)/bin' @@ -2130,7 +2130,6 @@ comment=$2 version=$3 libs=$4 requires=$5 -include=$6 cat <<EOF >$name.pc prefix=$PREFIX exec_prefix=\${prefix} @@ -2143,7 +2142,7 @@ Version: $version Requires: $requires Conflicts: Libs: -L\${libdir} $libs -Cflags: -I\${includedir}/$include +Cflags: -I\${includedir} EOF } @@ -2158,7 +2157,7 @@ cat <<EOF >$name-uninstalled.pc prefix= exec_prefix= libdir=\${pcfiledir}/$name -includedir=\${pcfiledir}/$name +includedir=\${pcfiledir} Name: $name Description: $comment @@ -2170,27 +2169,27 @@ Cflags: -I\${includedir} EOF } -pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg +pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version" -pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg +pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version" -pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg +pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version" -pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg +pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version" if enabled pp; then - pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc + pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version" fi if enabled swscaler; then - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg + pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version" else - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg + pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" apply libswscale.pc sed s/^Libs:.*$/Libs:/ apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/ Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Mon Feb 25 10:22:11 2008 @@ -27,7 +27,7 @@ */ -#include "avutil.h" +#include "libavutil/avutil.h" #include <sys/types.h> /* size_t */ #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 Modified: trunk/libavcodec/opt.h ============================================================================== --- trunk/libavcodec/opt.h (original) +++ trunk/libavcodec/opt.h Mon Feb 25 10:22:11 2008 @@ -27,7 +27,7 @@ * AVOptions */ -#include "rational.h" +#include "libavutil/rational.h" enum AVOptionType{ FF_OPT_TYPE_FLAGS, Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h (original) +++ trunk/libavformat/avformat.h Mon Feb 25 10:22:11 2008 @@ -31,7 +31,7 @@ #include <time.h> #include <stdio.h> /* FILE */ -#include "avcodec.h" +#include "libavcodec/avcodec.h" #include "avio.h" Modified: trunk/libpostproc/Makefile ============================================================================== --- trunk/libpostproc/Makefile (original) +++ trunk/libpostproc/Makefile Mon Feb 25 10:22:11 2008 @@ -1,9 +1,6 @@ include ../config.mak -# Overload incdir, postproc include files go in a different directory. -INCDIR=$(prefix)/include/postproc - EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) NAME=postproc @@ -15,6 +12,3 @@ HEADERS = postprocess.h OBJS = postprocess.o include ../common.mak - -uninstall-headers:: - -rmdir "$(prefix)/include/postproc" Modified: trunk/libpostproc/postprocess.h ============================================================================== --- trunk/libpostproc/postprocess.h (original) +++ trunk/libpostproc/postprocess.h Mon Feb 25 10:22:11 2008 @@ -27,7 +27,7 @@ * external api for the pp stuff */ -#include "avutil.h" +#include "libavutil/avutil.h" #define LIBPOSTPROC_VERSION_TRIPLET 51,1,0

3 2

r12278 - trunk/libavcodec/libamr.c
by subversion＠mplayerhq.hu 03 Mar '08

03 Mar '08

Author: benoit Date: Fri Feb 29 09:01:01 2008 New Revision: 12278 Log: Make AMR-NB block size const and 8 bits. Modified: trunk/libavcodec/libamr.c Modified: trunk/libavcodec/libamr.c ============================================================================== --- trunk/libavcodec/libamr.c (original) +++ trunk/libavcodec/libamr.c Fri Feb 29 09:01:01 2008 @@ -444,7 +444,7 @@ static int amr_nb_decode_frame(AVCodecCo { AMRContext *s = avctx->priv_data; uint8_t*amrData=buf; - static short block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 }; + static const uint8_t block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 }; enum Mode dec_mode; int packet_size;

3 2

[ffmpeg.org]: r142 - trunk/src/projects
by subversion＠mplayerhq.hu 29 Feb '08

29 Feb '08

Author: compn Date: Fri Feb 29 17:01:13 2008 New Revision: 142 Log: add ffdshow-tryouts fork Modified: trunk/src/projects Modified: trunk/src/projects ============================================================================== --- trunk/src/projects (original) +++ trunk/src/projects Fri Feb 29 17:01:13 2008 @@ -47,6 +47,7 @@ <li><a href="http://www.dvdflick.net/">DVDFlick</a></li> <li><a href="http://sourceforge.net/projects/easyvob2divx/">Easy VOB 2 DivX</a></li> <li><a href="http://ffdshow.sourceforge.net/">ffdshow</a></li> +<li><a href="http://ffdshow-tryout.sourceforge.net/">ffdshow-tryouts</a></li> <li><a href="http://ffmpeg-php.sourceforge.net/">ffmpeg-php</a></li> <li><a href="http://www.v2v.cc/~j/ffmpeg2theora/">ffmpeg2theora</a></li> <li><a href="http://sourceforge.net/projects/qt-ffmpeg/">FFMPEG for QT</a></li>

1 0

[propchange]: r12275 - svn:log
by subversion＠mplayerhq.hu 29 Feb '08

29 Feb '08

Author: reimar Revision: 12275 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,2 @@ -Use cltd instead of cdq asm mnemonic, ICC and gcc support but, but +Use cltd instead of cdq asm mnemonic, ICC and gcc support both, but SunStudio 12 only supports the former.

1 0

[propchange]: r12279 - svn:log
by subversion＠mplayerhq.hu 29 Feb '08

29 Feb '08

Author: michael Revision: 12279 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ add cdvc +(from a patch by Dmitry Vassiliev // slydiman mail ru)

1 0

r12279 - trunk/libavformat/riff.c
by subversion＠mplayerhq.hu 29 Feb '08

29 Feb '08

Author: michael Date: Fri Feb 29 12:41:57 2008 New Revision: 12279 Log: add cdvc Modified: trunk/libavformat/riff.c Modified: trunk/libavformat/riff.c ============================================================================== --- trunk/libavformat/riff.c (original) +++ trunk/libavformat/riff.c Fri Feb 29 12:41:57 2008 @@ -88,6 +88,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, + { CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, // Canopus DV { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') }, { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },

1 0

r12275 - in trunk: libavcodec/cabac.h libavutil/internal.h
by subversion＠mplayerhq.hu 29 Feb '08

29 Feb '08

Author: reimar Date: Thu Feb 28 18:01:35 2008 New Revision: 12275 Log: Use cltd instead of cdq asm mnemonic, ICC and gcc support but, but SunStudio 12 only supports the former. Modified: trunk/libavcodec/cabac.h trunk/libavutil/internal.h Modified: trunk/libavcodec/cabac.h ============================================================================== --- trunk/libavcodec/cabac.h (original) +++ trunk/libavcodec/cabac.h Thu Feb 28 18:01:35 2008 @@ -327,7 +327,7 @@ static inline void renorm_cabac_decoder_ //P3:665 athlon:517 asm( "lea -0x100(%0), %%eax \n\t" - "cdq \n\t" + "cltd \n\t" "mov %0, %%eax \n\t" "and %%edx, %0 \n\t" "and %1, %%edx \n\t" @@ -599,7 +599,7 @@ static int get_cabac_bypass(CABACContext "shl $17, %%ebx \n\t" "add %%eax, %%eax \n\t" "sub %%ebx, %%eax \n\t" - "cdq \n\t" + "cltd \n\t" "and %%edx, %%ebx \n\t" "add %%ebx, %%eax \n\t" "test %%ax, %%ax \n\t" @@ -646,7 +646,7 @@ static av_always_inline int get_cabac_by "shl $17, %%ebx \n\t" "add %%eax, %%eax \n\t" "sub %%ebx, %%eax \n\t" - "cdq \n\t" + "cltd \n\t" "and %%edx, %%ebx \n\t" "add %%ebx, %%eax \n\t" "xor %%edx, %%ecx \n\t" Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h (original) +++ trunk/libavutil/internal.h Thu Feb 28 18:01:35 2008 @@ -205,7 +205,7 @@ static inline unsigned int ff_sqrt(unsig #if defined(ARCH_X86) #define MASK_ABS(mask, level)\ asm volatile(\ - "cdq \n\t"\ + "cltd \n\t"\ "xorl %1, %0 \n\t"\ "subl %1, %0 \n\t"\ : "+a" (level), "=&d" (mask)\

2 1