December 2007 - 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

r11039 - trunk/libavformat/rmdec.c
by galileo.m2＠gmail.com 17 Jan '08

17 Jan '08

Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c (original) +++ trunk/libavformat/rmdec.c Thu Nov 15 22:04:06 2007 @@ -615,6 +615,7 @@ ff_rm_parse_packet (AVFormatContext *s, } } else av_get_packet(pb, pkt, len); + rm_ac3_swap_bytes(st, pkt); } else av_get_packet(pb, pkt, len); I think this is missing a pair of braces.

3 2

r11326 - in trunk: configure libavutil/internal.h
by subversion＠mplayerhq.hu 10 Jan '08

10 Jan '08

Author: diego Date: Thu Dec 27 02:53:02 2007 New Revision: 11326 Log: Check for the presence of llrint(), lrint(), round() and roundf() and provide simple replacements if they are unavailable. patch by Michael Kostylev, mik niipt ru Modified: trunk/configure trunk/libavutil/internal.h Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu Dec 27 02:53:02 2007 @@ -706,6 +706,8 @@ HAVE_LIST=" getrusage imlib2 inet_aton + llrint + lrint lrintf machine_ioctl_bt848_h machine_ioctl_meteor_h @@ -714,6 +716,8 @@ HAVE_LIST=" mkstemp mlib ppc64 + round + roundf sdl sdl_video_size soundcard_h @@ -1593,12 +1597,14 @@ done check_lib math.h sin -lm -# test for lrintf in math.h -check_exec <<EOF && enable lrintf || disable lrintf +# test for C99 functions in math.h +for func in llrint lrint lrintf round roundf; do + check_exec <<EOF && enable $func || disable $func #define _ISOC9X_SOURCE 1 #include <math.h> -int main(void) { return (lrintf(3.999f) > 0)?0:1; } +int main(void) { return ($func(3.999f) > 0)?0:1; } EOF +done enabled_any libamr_nb libamr_wb && enable libamr Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h (original) +++ trunk/libavutil/internal.h Thu Dec 27 02:53:02 2007 @@ -270,6 +270,20 @@ if((y)<(x)){\ }\ } +#ifndef HAVE_LLRINT +static av_always_inline long long llrint(double x) +{ + return rint(x); +} +#endif /* HAVE_LLRINT */ + +#ifndef HAVE_LRINT +static av_always_inline long int lrint(double x) +{ + return rint(x); +} +#endif /* HAVE_LRINT */ + #ifndef HAVE_LRINTF static av_always_inline long int lrintf(float x) { @@ -277,4 +291,18 @@ static av_always_inline long int lrintf( } #endif /* HAVE_LRINTF */ +#ifndef HAVE_ROUND +static av_always_inline double round(double x) +{ + return (x > 0) ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif /* HAVE_ROUND */ + +#ifndef HAVE_ROUNDF +static av_always_inline float roundf(float x) +{ + return (x > 0) ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif /* HAVE_ROUNDF */ + #endif /* FFMPEG_INTERNAL_H */

6 10

r11361 - trunk/libavcodec/rv34.c
by subversion＠mplayerhq.hu 31 Dec '07

31 Dec '07

Author: kostya Date: Mon Dec 31 08:12:50 2007 New Revision: 11361 Log: Direct blocks should use motion vectors from the second reference frame Modified: trunk/libavcodec/rv34.c Modified: trunk/libavcodec/rv34.c ============================================================================== --- trunk/libavcodec/rv34.c (original) +++ trunk/libavcodec/rv34.c Mon Dec 31 08:12:50 2007 @@ -474,6 +474,21 @@ static void rv34_pred_mv(RV34DecContext } /** + * Calculate motion vector component that should be added for direct blocks. + */ +static int calc_add_mv(MpegEncContext *s, int dir, int component) +{ + int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride; + int sum; + + sum = (s->next_picture_ptr->motion_val[0][mv_pos][component] + + s->next_picture_ptr->motion_val[0][mv_pos + 1][component] + + s->next_picture_ptr->motion_val[0][mv_pos + s->b8_stride][component] + + s->next_picture_ptr->motion_val[0][mv_pos + s->b8_stride + 1][component]) >> 2; + return dir ? -(sum >> 1) : ((sum + 1) >> 1); +} + +/** * Predict motion vector for B-frame macroblock. */ static inline void rv34_pred_b_vector(int A[2], int B[2], int C[2], @@ -536,7 +551,11 @@ static void rv34_pred_mv_b(RV34DecContex mx += r->dmv[dir][0]; my += r->dmv[dir][1]; - //XXX add vector for bidirectionally predicted blocks + + if(block_type == RV34_MB_B_DIRECT){ + mx += calc_add_mv(s, dir, 0); + my += calc_add_mv(s, dir, 1); + } for(j = 0; j < 2; j++){ for(i = 0; i < 2; i++){ cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][0] = mx;

2 1

r11364 - trunk/libavformat/avformat.h
by subversion＠mplayerhq.hu 31 Dec '07

31 Dec '07

Author: michael Date: Mon Dec 31 17:49:18 2007 New Revision: 11364 Log: Correct doxy about timestamp units of read_timestamp(). Modified: trunk/libavformat/avformat.h Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h (original) +++ trunk/libavformat/avformat.h Mon Dec 31 17:49:18 2007 @@ -226,7 +226,7 @@ typedef struct AVInputFormat { int (*read_seek)(struct AVFormatContext *, int stream_index, int64_t timestamp, int flags); /** - * gets the next timestamp in AV_TIME_BASE units. + * gets the next timestamp in stream[stream_index].time_base units. * @return the timestamp or AV_NOPTS_VALUE if an error occured */ int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,

1 0

r11363 - trunk/libavformat/avformat.h
by subversion＠mplayerhq.hu 31 Dec '07

31 Dec '07

Author: michael Date: Mon Dec 31 17:47:25 2007 New Revision: 11363 Log: Document return of read_timestamp. Modified: trunk/libavformat/avformat.h Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h (original) +++ trunk/libavformat/avformat.h Mon Dec 31 17:47:25 2007 @@ -227,6 +227,7 @@ typedef struct AVInputFormat { int stream_index, int64_t timestamp, int flags); /** * gets the next timestamp in AV_TIME_BASE units. + * @return the timestamp or AV_NOPTS_VALUE if an error occured */ int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);

1 0

r11362 - trunk/libavformat/nutdec.c
by subversion＠mplayerhq.hu 31 Dec '07

31 Dec '07

Author: michael Date: Mon Dec 31 17:43:35 2007 New Revision: 11362 Log: More verbose aspect ratio error msg. Modified: trunk/libavformat/nutdec.c Modified: trunk/libavformat/nutdec.c ============================================================================== --- trunk/libavformat/nutdec.c (original) +++ trunk/libavformat/nutdec.c Mon Dec 31 17:43:35 2007 @@ -330,7 +330,7 @@ static int decode_stream_header(NUTConte st->codec->sample_aspect_ratio.num= ff_get_v(bc); st->codec->sample_aspect_ratio.den= ff_get_v(bc); if((!st->codec->sample_aspect_ratio.num) != (!st->codec->sample_aspect_ratio.den)){ - av_log(s, AV_LOG_ERROR, "invalid aspect ratio\n"); + av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n", st->codec->sample_aspect_ratio.num, st->codec->sample_aspect_ratio.den); return -1; } ff_get_v(bc); /* csp type */

1 0

r11360 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 23:58:20 2007 New Revision: 11360 Log: simplify Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sun Dec 30 23:58:20 2007 @@ -577,13 +577,13 @@ static void remove_dithering(AC3DecodeCo else end = s->end_freq[ch]; for(i=0; i<end; i++) { - if(bap[i] == 0) + if(!bap[i]) coeffs[i] = 0.0f; } if(s->channel_in_cpl[ch]) { bap = s->bap[CPL_CH]; for(; i<s->end_freq[CPL_CH]; i++) { - if(bap[i] == 0) + if(!bap[i]) coeffs[i] = 0.0f; } }

1 0

r11359 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 23:28:17 2007 New Revision: 11359 Log: pass an AC3DecodeContext to ac3_downmix() instead of multiple arguments Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sun Dec 30 23:28:17 2007 @@ -735,27 +735,26 @@ static inline void do_imdct(AC3DecodeCon /** * Downmix the output to mono or stereo. */ -static void ac3_downmix(float samples[AC3_MAX_CHANNELS][256], int fbw_channels, - int output_mode, float coef[AC3_MAX_CHANNELS][2]) +static void ac3_downmix(AC3DecodeContext *s) { int i, j; float v0, v1, s0, s1; for(i=0; i<256; i++) { v0 = v1 = s0 = s1 = 0.0f; - for(j=0; j<fbw_channels; j++) { - v0 += samples[j][i] * coef[j][0]; - v1 += samples[j][i] * coef[j][1]; - s0 += coef[j][0]; - s1 += coef[j][1]; + for(j=0; j<s->fbw_channels; j++) { + v0 += s->output[j][i] * s->downmix_coeffs[j][0]; + v1 += s->output[j][i] * s->downmix_coeffs[j][1]; + s0 += s->downmix_coeffs[j][0]; + s1 += s->downmix_coeffs[j][1]; } v0 /= s0; v1 /= s1; - if(output_mode == AC3_CHMODE_MONO) { - samples[0][i] = (v0 + v1) * LEVEL_MINUS_3DB; - } else if(output_mode == AC3_CHMODE_STEREO) { - samples[0][i] = v0; - samples[1][i] = v1; + if(s->output_mode == AC3_CHMODE_MONO) { + s->output[0][i] = (v0 + v1) * LEVEL_MINUS_3DB; + } else if(s->output_mode == AC3_CHMODE_STEREO) { + s->output[0][i] = v0; + s->output[1][i] = v1; } } } @@ -1053,8 +1052,7 @@ static int ac3_parse_audio_block(AC3Deco /* downmix output if needed */ if(s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) && s->fbw_channels == s->out_channels)) { - ac3_downmix(s->output, s->fbw_channels, s->output_mode, - s->downmix_coeffs); + ac3_downmix(s); } /* convert float to 16-bit integer */

1 0

[propchange]: r11358 - svn:log
by subversion＠mplayerhq.hu 30 Dec '07

30 Dec '07

Author: jbr Revision: 11358 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -rename sampling_rate to sample_rate \ No newline at end of file +cosmetics: rename sampling_rate to sample_rate

1 0