December 2007 - ffmpeg-cvslog

r11339 - trunk/libavformat/rtsp.c
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: lu_zero Date: Fri Dec 28 12:10:17 2007 New Revision: 11339 Log: Real RTSP support, from Ronald S. Bultje rsbultje gmail - part 1 Comment Modified: trunk/libavformat/rtsp.c Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Fri Dec 28 12:10:17 2007 @@ -606,7 +606,7 @@ static void rtsp_parse_transport(RTSPHea p++; get_word_sep(profile, sizeof(profile), "/;,", &p); lower_transport[0] = '\0'; - if (*p == '/') { + if (*p == '/') { /* rtp/avp/<protocol> */ p++; get_word_sep(lower_transport, sizeof(lower_transport), ";,", &p);

1 0

r11338 - in trunk/libavcodec: ac3enc.c avcodec.h
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: jbr Date: Fri Dec 28 07:13:55 2007 New Revision: 11338 Log: use cutoff frequency to adjust bandwidth in ac3 encoder Modified: trunk/libavcodec/ac3enc.c trunk/libavcodec/avcodec.h Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c (original) +++ trunk/libavcodec/ac3enc.c Fri Dec 28 07:13:55 2007 @@ -632,6 +632,7 @@ static int AC3_encode_init(AVCodecContex AC3EncodeContext *s = avctx->priv_data; int i, j, ch; float alpha; + int bw_code; static const uint8_t channel_mode_defs[6] = { 0x01, /* C */ 0x02, /* L R */ @@ -683,12 +684,21 @@ static int AC3_encode_init(AVCodecContex s->frame_size = s->frame_size_min; /* bit allocation init */ - for(ch=0;ch<s->nb_channels;ch++) { - /* bandwidth for each channel */ + if(avctx->cutoff) { + /* calculate bandwidth based on user-specified cutoff frequency */ + int cutoff = av_clip(avctx->cutoff, 1, s->sample_rate >> 1); + int fbw_coeffs = cutoff * 512 / s->sample_rate; + bw_code = av_clip((fbw_coeffs - 73) / 3, 0, 60); + } else { + /* use default bandwidth setting */ /* XXX: should compute the bandwidth according to the frame size, so that we avoid anoying high freq artefacts */ - s->chbwcod[ch] = 50; /* sample bandwidth as mpeg audio layer 2 table 0 */ - s->nb_coefs[ch] = ((s->chbwcod[ch] + 12) * 3) + 37; + bw_code = 50; + } + for(ch=0;ch<s->nb_channels;ch++) { + /* bandwidth for each channel */ + s->chbwcod[ch] = bw_code; + s->nb_coefs[ch] = bw_code * 3 + 73; } if (s->lfe) { s->nb_coefs[s->lfe_channel] = 7; /* fixed */ Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Fri Dec 28 07:13:55 2007 @@ -2072,7 +2072,7 @@ typedef struct AVCodecContext { int directpred; /** - * Audio cutoff bandwidth (0 means "automatic"), currently used only by FAAC. + * Audio cutoff bandwidth (0 means "automatic") * - encoding: Set by user. * - decoding: unused */

1 0

r11337 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: jbr Date: Fri Dec 28 06:32:12 2007 New Revision: 11337 Log: use bps instead of kbps for bitrate Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c (original) +++ trunk/libavcodec/ac3enc.c Fri Dec 28 06:32:12 2007 @@ -669,9 +669,8 @@ static int AC3_encode_init(AVCodecContex s->bitstream_mode = 0; /* complete main audio service */ /* bitrate & frame size */ - bitrate /= 1000; for(i=0;i<19;i++) { - if ((ff_ac3_bitrate_tab[i] >> s->sr_shift) == bitrate) + if ((ff_ac3_bitrate_tab[i] >> s->sr_shift)*1000 == bitrate) break; } if (i == 19) @@ -1240,11 +1239,11 @@ static int AC3_encode_frame(AVCodecConte } /* adjust for fractional frame sizes */ - while(s->bits_written >= s->bit_rate*1000 && s->samples_written >= s->sample_rate) { - s->bits_written -= s->bit_rate*1000; + while(s->bits_written >= s->bit_rate && s->samples_written >= s->sample_rate) { + s->bits_written -= s->bit_rate; s->samples_written -= s->sample_rate; } - s->frame_size = s->frame_size_min + (s->bits_written * s->sample_rate < s->samples_written * s->bit_rate*1000); + s->frame_size = s->frame_size_min + (s->bits_written * s->sample_rate < s->samples_written * s->bit_rate); s->bits_written += s->frame_size * 16; s->samples_written += AC3_FRAME_SIZE;

1 0

r11336 - trunk/libavformat/http.c
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: michael Date: Fri Dec 28 04:32:32 2007 New Revision: 11336 Log: Revert hack which should have never been commited. ------------------------------------------------------------------------ r464 | philipjsg | 2002-05-09 03:19:15 +0200 (Thu, 09 May 2002) | 3 lines * Add a sleep when doing the post to ffserver. Yes, this is the wrong solution. Modified: trunk/libavformat/http.c Modified: trunk/libavformat/http.c ============================================================================== --- trunk/libavformat/http.c (original) +++ trunk/libavformat/http.c Fri Dec 28 04:32:32 2007 @@ -247,7 +247,6 @@ static int http_connect(URLContext *h, c s->off = 0; s->filesize = -1; if (post) { - usleep(1000*1000); return 0; }

1 0

r11334 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: jbr Date: Fri Dec 28 04:12:24 2007 New Revision: 11334 Log: Do not give advice for which bitrate to choose. Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c (original) +++ trunk/libavcodec/ac3enc.c Fri Dec 28 04:12:24 2007 @@ -573,7 +573,7 @@ static int compute_bit_allocation(AC3Enc bit_alloc(s, mask, psd, bap, frame_bits, coarse_snr_offset, 0) < 0) coarse_snr_offset -= SNR_INC1; if (coarse_snr_offset < 0) { - av_log(NULL, AV_LOG_ERROR, "Bit allocation failed, try increasing the bitrate, -ab 384k for example!\n"); + av_log(NULL, AV_LOG_ERROR, "Bit allocation failed. Try increasing the bitrate.\n"); return -1; } while ((coarse_snr_offset + SNR_INC1) <= 63 &&

1 0

r11333 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: jbr Date: Fri Dec 28 04:05:49 2007 New Revision: 11333 Log: fix typo Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c (original) +++ trunk/libavcodec/ac3enc.c Fri Dec 28 04:05:49 2007 @@ -738,7 +738,7 @@ static void output_frame_header(AC3Encod put_bits(&s->pb, 1, 1); /* original bitstream */ put_bits(&s->pb, 1, 0); /* no time code 1 */ put_bits(&s->pb, 1, 0); /* no time code 2 */ - put_bits(&s->pb, 1, 0); /* no addtional bit stream info */ + put_bits(&s->pb, 1, 0); /* no additional bit stream info */ } /* symetric quantization on 'levels' levels */

1 0

r11332 - trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
by subversion＠mplayerhq.hu 28 Dec '07

28 Dec '07

Author: diego Date: Fri Dec 28 02:42:58 2007 New Revision: 11332 Log: Remove mistakenly added multiple inclusion guards. Modified: trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h Modified: trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h ============================================================================== --- trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h (original) +++ trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h Fri Dec 28 02:42:58 2007 @@ -19,8 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_IWMMXT_RND_H -#define FFMPEG_DSPUTIL_IWMMXT_RND_H +/* This header intentionally has no multiple inclusion guards. It is meant to + * be included multiple times and generates different code depending on the + * value of certain #defines. */ void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) { @@ -1115,5 +1116,3 @@ void DEF(avg, pixels16_xy2)(uint8_t *blo : [line_size]"r"(line_size) : "r12", "memory"); } - -#endif /* FFMPEG_DSPUTIL_IWMMXT_RND_H */

1 0

r11331 - in trunk/libavcodec/ppc: dsputil_altivec.h gcc_fixes.h imgresample_altivec.h util_altivec.h
by subversion＠mplayerhq.hu 27 Dec '07

27 Dec '07

Author: diego Date: Thu Dec 27 13:56:49 2007 New Revision: 11331 Log: Fix make checkheaders. Modified: trunk/libavcodec/ppc/dsputil_altivec.h trunk/libavcodec/ppc/gcc_fixes.h trunk/libavcodec/ppc/imgresample_altivec.h trunk/libavcodec/ppc/util_altivec.h Modified: trunk/libavcodec/ppc/dsputil_altivec.h ============================================================================== --- trunk/libavcodec/ppc/dsputil_altivec.h (original) +++ trunk/libavcodec/ppc/dsputil_altivec.h Thu Dec 27 13:56:49 2007 @@ -23,6 +23,8 @@ #ifndef FFMPEG_DSPUTIL_ALTIVEC_H #define FFMPEG_DSPUTIL_ALTIVEC_H +#include <stdint.h> + #include "dsputil_ppc.h" extern int has_altivec(void); Modified: trunk/libavcodec/ppc/gcc_fixes.h ============================================================================== --- trunk/libavcodec/ppc/gcc_fixes.h (original) +++ trunk/libavcodec/ppc/gcc_fixes.h Thu Dec 27 13:56:49 2007 @@ -23,6 +23,8 @@ #ifndef FFMPEG_GCC_FIXES_H #define FFMPEG_GCC_FIXES_H +#include "config.h" + #ifdef HAVE_ALTIVEC_H #include <altivec.h> #endif Modified: trunk/libavcodec/ppc/imgresample_altivec.h ============================================================================== --- trunk/libavcodec/ppc/imgresample_altivec.h (original) +++ trunk/libavcodec/ppc/imgresample_altivec.h Thu Dec 27 13:56:49 2007 @@ -19,6 +19,8 @@ #ifndef FFMPEG_IMGRESAMPLE_ALTIVEC_H #define FFMPEG_IMGRESAMPLE_ALTIVEC_H +#include <stdint.h> + void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src, int wrap, int16_t *filter); #endif /* FFMPEG_IMGRESAMPLE_ALTIVEC_H */ Modified: trunk/libavcodec/ppc/util_altivec.h ============================================================================== --- trunk/libavcodec/ppc/util_altivec.h (original) +++ trunk/libavcodec/ppc/util_altivec.h Thu Dec 27 13:56:49 2007 @@ -24,6 +24,14 @@ #ifndef FFMPEG_UTIL_ALTIVEC_H #define FFMPEG_UTIL_ALTIVEC_H +#include <stdint.h> + +#include "config.h" + +#ifdef HAVE_ALTIVEC_H +#include <altivec.h> +#endif + // used to build registers permutation vectors (vcprm) // the 's' are for words in the _s_econd vector #define WORD_0 0x00,0x01,0x02,0x03

1 0

r11330 - trunk/libavcodec/ppc/h264_altivec.c
by subversion＠mplayerhq.hu 27 Dec '07

27 Dec '07

Author: diego Date: Thu Dec 27 13:31:23 2007 New Revision: 11330 Log: Add necessary #include, fixes the warnings: ppc/h264_altivec.c: In function ?put_h264_qpel16_mc00_altivec?: ppc/h264_altivec.c:394: warning: implicit declaration of function ?put_pixels16_altivec? ppc/h264_altivec.c: In function ?avg_h264_qpel16_mc00_altivec?: ppc/h264_altivec.c:395: warning: implicit declaration of function ?avg_pixels16_altivec? ppc/h264_altivec.c: In function ?dsputil_h264_init_ppc?: ppc/h264_altivec.c:872: warning: implicit declaration of function ?has_altivec? Modified: trunk/libavcodec/ppc/h264_altivec.c Modified: trunk/libavcodec/ppc/h264_altivec.c ============================================================================== --- trunk/libavcodec/ppc/h264_altivec.c (original) +++ trunk/libavcodec/ppc/h264_altivec.c Thu Dec 27 13:31:23 2007 @@ -23,6 +23,7 @@ #include "gcc_fixes.h" #include "dsputil_ppc.h" +#include "dsputil_altivec.h" #include "util_altivec.h" #include "types_altivec.h"

1 0

r11329 - trunk/libavcodec/adpcm.c
by subversion＠mplayerhq.hu 27 Dec '07

27 Dec '07

Author: diego Date: Thu Dec 27 12:55:53 2007 New Revision: 11329 Log: Fix clicking sound in xa-adpcm. patch by Alexander Strange, astrange ithinksw com Subject: Re: [FFmpeg-devel] [PATCH] fix clicking sound in xa-adpcm Date: Thu, 27 Dec 2007 03:20:24 -0500 Modified: trunk/libavcodec/adpcm.c Modified: trunk/libavcodec/adpcm.c ============================================================================== --- trunk/libavcodec/adpcm.c (original) +++ trunk/libavcodec/adpcm.c Thu Dec 27 12:55:53 2007 @@ -1121,8 +1121,6 @@ static int adpcm_decode_frame(AVCodecCon } break; case CODEC_ID_ADPCM_XA: - c->status[0].sample1 = c->status[0].sample2 = - c->status[1].sample1 = c->status[1].sample2 = 0; while (buf_size >= 128) { xa_decode(samples, src, &c->status[0], &c->status[1], avctx->channels);

1 0