March 2008 - ffmpeg-cvslog - lists.ffmpeg.org

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

r12487 - trunk/configure
by subversion＠mplayerhq.hu 09 Mar '09

09 Mar '09

Author: diego Date: Tue Mar 18 13:32:55 2008 New Revision: 12487 Log: Check for and set HAVE_MMX2, it is used in several places. patch by Alexander Strange, astrange ithinksw com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Mar 18 13:32:55 2008 @@ -699,6 +699,7 @@ ARCH_EXT_LIST=' iwmmxt mmi mmx + mmx2 ssse3 vis ' @@ -780,6 +781,7 @@ armv6_deps="armv4l" iwmmxt_deps="armv4l" mmi_deps="mips" mmx_deps="x86" +mmx2_deps="x86" ssse3_deps="x86" vis_deps="sparc" @@ -1517,8 +1519,9 @@ EOF # check wether EBX is available on x86 check_asm ebx_available '"":::"%ebx"' - # check whether binutils is new enough to compile SSSE3 + # check whether binutils is new enough to compile SSSE3/MMX2 enabled ssse3 && check_asm ssse3 '"pabsw %xmm0, %xmm0"' + enabled mmx2 && check_asm mmx2 '"movss %xmm0, %xmm0"' check_asm bswap '"bswap %%eax" ::: "%eax"' fi

4 4

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

r12574 - trunk/configure
by subversion＠mplayerhq.hu 01 Apr '08

01 Apr '08

Author: diego Date: Tue Mar 25 10:24:55 2008 New Revision: 12574 Log: Add OS-specific executable suffix to temporary executable name. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Mar 25 10:24:55 2008 @@ -1299,7 +1299,7 @@ fi TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" -TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}" +TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"

4 7

r12659 - trunk/libavformat/matroskadec.c
by subversion＠mplayerhq.hu 31 Mar '08

31 Mar '08

Author: aurel Date: Mon Mar 31 22:16:04 2008 New Revision: 12659 Log: check return value of matroska_find_track_by_num (fix a segfault) Modified: trunk/libavformat/matroskadec.c Modified: trunk/libavformat/matroskadec.c ============================================================================== --- trunk/libavformat/matroskadec.c (original) +++ trunk/libavformat/matroskadec.c Mon Mar 31 22:16:04 2008 @@ -2355,6 +2355,7 @@ matroska_read_header (AVFormatContext for (i=0; i<matroska->num_indexes; i++) { MatroskaDemuxIndex *idx = &matroska->index[i]; track = matroska_find_track_by_num(matroska, idx->track); + if (track < 0) continue; stream = matroska->tracks[track]->stream_index; if (stream >= 0 && stream < matroska->ctx->nb_streams) av_add_index_entry(matroska->ctx->streams[stream],

1 0

r12652 - trunk/libavcodec/escape124.c
by subversion＠mplayerhq.hu 31 Mar '08

31 Mar '08

Author: michael Date: Mon Mar 31 18:43:27 2008 New Revision: 12652 Log: help gcc-2.95 Modified: trunk/libavcodec/escape124.c Modified: trunk/libavcodec/escape124.c ============================================================================== --- trunk/libavcodec/escape124.c (original) +++ trunk/libavcodec/escape124.c Mon Mar 31 18:43:27 2008 @@ -37,7 +37,7 @@ typedef union SuperBlock { typedef struct CodeBook { unsigned depth; unsigned size; - MacroBlock blocks[]; + MacroBlock blocks[0]; } CodeBook; typedef struct Escape124Context {

2 1

r12658 - in trunk: libavcodec/8svx.c libavformat/avio.h libavformat/iff.c
by subversion＠mplayerhq.hu 31 Mar '08

31 Mar '08

Author: diego Date: Mon Mar 31 19:31:11 2008 New Revision: 12658 Log: minor typo fixes Modified: trunk/libavcodec/8svx.c trunk/libavformat/avio.h trunk/libavformat/iff.c Modified: trunk/libavcodec/8svx.c ============================================================================== --- trunk/libavcodec/8svx.c (original) +++ trunk/libavcodec/8svx.c Mon Mar 31 19:31:11 2008 @@ -1,5 +1,5 @@ /* - * 8SVX Audio Decoder + * 8SVX audio decoder * Copyright (C) 2008 Jaikrishnan Menon * * This file is part of FFmpeg. Modified: trunk/libavformat/avio.h ============================================================================== --- trunk/libavformat/avio.h (original) +++ trunk/libavformat/avio.h Mon Mar 31 19:31:11 2008 @@ -269,7 +269,7 @@ int get_buffer(ByteIOContext *s, unsigne /** * Reads size bytes from ByteIOContext into buf. - * This reads at most 1 packet. If that's not enough fewer bytes will be + * This reads at most 1 packet. If that is not enough fewer bytes will be * returned. * @returns number of bytes read or AVERROR */ Modified: trunk/libavformat/iff.c ============================================================================== --- trunk/libavformat/iff.c (original) +++ trunk/libavformat/iff.c Mon Mar 31 19:31:11 2008 @@ -1,5 +1,5 @@ /* - * Iff (.iff) File Demuxer + * IFF (.iff) file demuxer * Copyright (c) 2008 Jaikrishnan Menon <realityman at gmx.net> * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file iff.c - * iff file demuxer + * IFF file demuxer * by Jaikrishnan Menon * for more information on the .iff file format, visit: * http://wiki.multimedia.cx/index.php?title=IFF

1 0

r12657 - trunk/libavcodec/8svx.c
by subversion＠mplayerhq.hu 31 Mar '08

31 Mar '08

Author: diego Date: Mon Mar 31 19:30:50 2008 New Revision: 12657 Log: cosmetics: Write some Doxygen comments in a more compact fashion. Modified: trunk/libavcodec/8svx.c Modified: trunk/libavcodec/8svx.c ============================================================================== --- trunk/libavcodec/8svx.c (original) +++ trunk/libavcodec/8svx.c Mon Mar 31 19:30:50 2008 @@ -29,9 +29,7 @@ #include "avcodec.h" -/** - * decoder context - */ +/** decoder context */ typedef struct EightSvxContext { int16_t fib_acc; int16_t *table; @@ -42,9 +40,7 @@ const static int16_t fibonacci[16] = { const static int16_t exponential[16] = { -128<<8, -64<<8, -32<<8, -16<<8, -8<<8, -4<<8, -2<<8, -1<<8, 0, 1<<8, 2<<8, 4<<8, 8<<8, 16<<8, 32<<8, 64<<8 }; -/** - * decode a frame - */ +/** decode a frame */ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) { @@ -75,9 +71,7 @@ static int eightsvx_decode_frame(AVCodec return consumed; } -/** - * initialize 8svx decoder - */ +/** initialize 8svx decoder */ static av_cold int eightsvx_decode_init(AVCodecContext *avctx) { EightSvxContext *esc = avctx->priv_data;

1 0

r12656 - trunk/libavcodec/xvmcvideo.c
by subversion＠mplayerhq.hu 31 Mar '08

31 Mar '08

Author: diego Date: Mon Mar 31 19:16:51 2008 New Revision: 12656 Log: Fix a bunch of typos in comments. Modified: trunk/libavcodec/xvmcvideo.c Modified: trunk/libavcodec/xvmcvideo.c ============================================================================== --- trunk/libavcodec/xvmcvideo.c (original) +++ trunk/libavcodec/xvmcvideo.c Mon Mar 31 19:16:51 2008 @@ -29,8 +29,8 @@ #undef NDEBUG #include <assert.h> -//X11 includes are in the xvmc_render.h -//by replacing it with none-X one +//X11 includes are in xvmc_render.h +//by replacing it with non-X one //XvMC emulation could be performed #include "xvmc_render.h" @@ -44,7 +44,7 @@ xvmc_render_state_t * render; assert(render != NULL); if( (render == NULL) || (render->magic != MP_XVMC_RENDER_MAGIC) ){ assert(0); - return;//make sure that this is render packet + return;//make sure that this is a render packet } s->block =(DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64); } @@ -66,8 +66,8 @@ const int mb_block_count = 4+(1<<s->chro } } -//these functions should be called on every new field or/and frame -//They should be safe if they are called few times for same field! +//These functions should be called on every new field and/or frame. +//They should be safe if they are called a few times for the same field! int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx){ xvmc_render_state_t * render,* last, * next; @@ -147,8 +147,8 @@ const int mb_xy = s->mb_y * s->mb_stride s->mb_skipped = 0; - // do I need to export quant when I could not perform postprocessing? - // anyway, it doesn't hurrt + // Do I need to export quant when I could not perform postprocessing? + // Anyway, it doesn't hurt. s->current_picture.qscale_table[mb_xy] = s->qscale; //START OF XVMC specific code @@ -166,7 +166,7 @@ const int mb_xy = s->mb_y * s->mb_stride mv_block->x = s->mb_x; mv_block->y = s->mb_y; mv_block->dct_type = s->interlaced_dct;//XVMC_DCT_TYPE_FRAME/FIELD; -// mv_block->motion_type = 0; //zero to silense warnings +// mv_block->motion_type = 0; //zero to silence warnings if(s->mb_intra){ mv_block->macroblock_type = XVMC_MB_TYPE_INTRA;//no MC, all done }else{ @@ -231,7 +231,7 @@ const int mb_xy = s->mb_y * s->mb_stride mv_block->motion_vertical_field_select = 0; -//set correct field referenses +//set correct field references if(s->mv_type == MV_TYPE_FIELD || s->mv_type == MV_TYPE_16X8){ if( s->field_select[0][0] ) mv_block->motion_vertical_field_select|=1; if( s->field_select[1][0] ) mv_block->motion_vertical_field_select|=2; @@ -256,7 +256,7 @@ const int mb_xy = s->mb_y * s->mb_stride } if(s->flags & CODEC_FLAG_GRAY){ - if(s->mb_intra){//intra frames are alwasy full chroma block + if(s->mb_intra){//intra frames are always full chroma block for(i=4; i<blocks_per_mb; i++){ memset(s->pblocks[i],0,sizeof(short)*8*8);//so we need to clear them if(!render->unsigned_intra) @@ -264,7 +264,7 @@ const int mb_xy = s->mb_y * s->mb_stride } }else{ cbp&= 0xf << (blocks_per_mb - 4); - blocks_per_mb = 4;//Luminance blocks only + blocks_per_mb = 4;//luminance blocks only } } mv_block->coded_block_pattern = cbp; @@ -273,7 +273,7 @@ const int mb_xy = s->mb_y * s->mb_stride for(i=0; i<blocks_per_mb; i++){ if(s->block_last_index[i] >= 0){ - // I do not have unsigned_intra MOCO to test, hope it is OK + // I do not have unsigned_intra MOCO to test, hope it is OK. if( (s->mb_intra) && ( render->idct || (!render->idct && !render->unsigned_intra)) ) s->pblocks[i][0]-=1<<10; if(!render->idct){

1 0