October 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r15641 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 23 Dec '10

23 Dec '10

Author: michael Date: Sun Oct 19 03:02:48 2008 New Revision: 15641 Log: Check for pts==dts on I/P frames in the presence of non low delay decoding and discard these invalid timestamps. fixes issue171. Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Sun Oct 19 03:02:48 2008 @@ -838,6 +838,14 @@ static void compute_pkt_fields(AVFormatC pkt->dts -= 1LL<<st->pts_wrap_bits; } + // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg) + // we take the conservative approach and discard both + // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. + if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ + av_log(s, AV_LOG_ERROR, "invalid dts/pts combination\n"); + pkt->dts= pkt->pts= AV_NOPTS_VALUE; + } + if (pkt->duration == 0) { compute_frame_duration(&num, &den, st, pc, pkt); if (den && num) {

2 1

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

r15595 - trunk/libavcodec/aac_parser.c
by subversion＠mplayerhq.hu 02 Dec '08

02 Dec '08

Author: mru Date: Sat Oct 11 13:21:45 2008 New Revision: 15595 Log: aac_parser: fix strict aliasing violation Modified: trunk/libavcodec/aac_parser.c Modified: trunk/libavcodec/aac_parser.c ============================================================================== --- trunk/libavcodec/aac_parser.c (original) +++ trunk/libavcodec/aac_parser.c Sat Oct 11 13:21:45 2008 @@ -32,9 +32,10 @@ static int aac_sync(uint64_t state, AACA { GetBitContext bits; int size, rdb, ch, sr; - uint64_t tmp = be2me_64(state); + uint8_t tmp[8]; - init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); + AV_WB64(tmp, state); + init_get_bits(&bits, tmp+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); if(get_bits(&bits, 12) != 0xfff) return 0;

5 11

r15761 - trunk/libavcodec/celp_math.c
by subversion＠mplayerhq.hu 31 Oct '08

31 Oct '08

Author: mmu_man Date: Fri Oct 31 20:31:36 2008 New Revision: 15761 Log: Fix build. Modified: trunk/libavcodec/celp_math.c Modified: trunk/libavcodec/celp_math.c ============================================================================== --- trunk/libavcodec/celp_math.c (original) +++ trunk/libavcodec/celp_math.c Fri Oct 31 20:31:36 2008 @@ -148,7 +148,7 @@ int ff_exp2(uint16_t power) { unsigned int result= exp2a[power>>10] + 0x10000; - assert(arg <= 0x7fff); + assert(power <= 0x7fff); result= (result<<3) + ((result*exp2b[(power>>5)&31])>>17); return result + ((result*(power&31)*89)>>22);

1 0

r15760 - trunk/libavutil/pca.c
by subversion＠mplayerhq.hu 31 Oct '08

31 Oct '08

Author: diego Date: Fri Oct 31 07:52:37 2008 New Revision: 15760 Log: Initialize variable to silence the warning: libavutil/pca.c:72: warning: ?k? may be used uninitialized in this function Modified: trunk/libavutil/pca.c Modified: trunk/libavutil/pca.c ============================================================================== --- trunk/libavutil/pca.c (original) +++ trunk/libavutil/pca.c Fri Oct 31 07:52:37 2008 @@ -67,7 +67,8 @@ void ff_pca_add(PCA *pca, double *v){ } int ff_pca(PCA *pca, double *eigenvector, double *eigenvalue){ - int i, j, k, pass; + int i, j, pass; + int k=0; const int n= pca->n; double z[n];

1 0

r15759 - trunk/libavcodec/qcelpdec.c
by subversion＠mplayerhq.hu 30 Oct '08

30 Oct '08

Author: vitor Date: Thu Oct 30 23:37:18 2008 New Revision: 15759 Log: OKed parts of the QCELP decoder patch by Kenan Gillet, kenan.gillet gmail com Added: trunk/libavcodec/qcelpdec.c Added: trunk/libavcodec/qcelpdec.c ============================================================================== --- (empty file) +++ trunk/libavcodec/qcelpdec.c Thu Oct 30 23:37:18 2008 @@ -0,0 +1,96 @@ +/* + * QCELP decoder + * Copyright (c) 2007 Reynaldo H. Verdejo Pinochet + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ +/** + * @file qcelpdec.c + * QCELP decoder + * @author Reynaldo H. Verdejo Pinochet + */ + +#include <stddef.h> + +#include "avcodec.h" +#include "bitstream.h" + +#include "qcelp.h" +#include "qcelpdata.h" + +#include "celp_math.h" +#include "celp_filters.h" + +#undef NDEBUG +#include <assert.h> + +/** + * Apply filter in pitch-subframe steps. + * + * @param memory buffer for the previous state of the filter + * - must be able to contain 303 elements + * - the 143 first elements are from the previous state + * - the next 160 are for output + * @param v_in input filter vector + * @param gain per-subframe gain array, each element is between 0.0 and 2.0 + * @param lag per-subframe lag array, each element is + * - between 16 and 143 if its corresponding pfrac is 0, + * - between 16 and 139 otherwise + * @param pfrac per-subframe boolean array, 1 if the lag is fractional, 0 otherwise + * + * @return filter output vector + */ +static const float *do_pitchfilter(float memory[303], + const float v_in[160], + const float gain[4], + const uint8_t *lag, + const uint8_t pfrac[4]) { + int i, j; + float *v_lag, *v_out; + const float *v_len; + + v_out = memory + 143; // Output vector starts at memory[143]. + + for (i = 0; i < 4; i++) + if (gain[i]) { + v_lag = memory + 143 + 40 * i - lag[i]; + for (v_len = v_in + 40; v_in < v_len; v_in++) { + if (pfrac[i]) { // If it is a fractional lag... + for (j = 0, *v_out = 0.; j < 4; j++) + *v_out += qcelp_hammsinc_table[j] * (v_lag[j-4] + v_lag[3-j]); + } else + *v_out = *v_lag; + + *v_out = *v_in + gain[i] * *v_out; + + v_lag++; + v_out++; + } + } else { + memcpy(v_out, v_in, 40 * sizeof(float)); + v_in += 40; + v_out += 40; + } + + memmove(memory, memory + 160, 143 * sizeof(float)); + return memory + 143; +} + +static void warn_insufficient_frame_quality(AVCodecContext *avctx, + const char *message) { + av_log(avctx, AV_LOG_WARNING, "Frame #%d, IFQ: %s\n", avctx->frame_number, message); +}

1 0

r15758 - trunk/libavcodec/celp_filters.h
by subversion＠mplayerhq.hu 30 Oct '08

30 Oct '08

Author: diego Date: Thu Oct 30 23:32:43 2008 New Revision: 15758 Log: Fix numbers in Doxygen comments, patch by Kenan Gillet, kenan.gillet gmail com. Modified: trunk/libavcodec/celp_filters.h Modified: trunk/libavcodec/celp_filters.h ============================================================================== --- trunk/libavcodec/celp_filters.h (original) +++ trunk/libavcodec/celp_filters.h Thu Oct 30 23:32:43 2008 @@ -55,7 +55,7 @@ void ff_celp_convolve_circ( * * @return 1 if overflow occurred, 0 - otherwise * - * @note Output buffer must contain 10 samples of past + * @note Output buffer must contain filter_length samples of past * speech data before pointer. * * Routine applies 1/A(z) filter to given speech data. @@ -79,7 +79,7 @@ int ff_celp_lp_synthesis_filter( * @param buffer_length amount of data to process * @param filter_length filter length (10 for 10th order LP filter) * - * @note Output buffer must contain 10 samples of past + * @note Output buffer must contain filter_length samples of past * speech data before pointer. * * Routine applies 1/A(z) filter to given speech data.

1 0

r15757 - in trunk/libavcodec: Makefile ra288.c
by subversion＠mplayerhq.hu 30 Oct '08

30 Oct '08

Author: vitor Date: Thu Oct 30 23:24:40 2008 New Revision: 15757 Log: Use ff_dot_productf() in ra288.c Modified: trunk/libavcodec/Makefile trunk/libavcodec/ra288.c Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Thu Oct 30 23:24:40 2008 @@ -160,7 +160,7 @@ OBJS-$(CONFIG_QPEG_DECODER) + OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o OBJS-$(CONFIG_QTRLE_ENCODER) += qtrleenc.o OBJS-$(CONFIG_RA_144_DECODER) += ra144.o celp_filters.o -OBJS-$(CONFIG_RA_288_DECODER) += ra288.o +OBJS-$(CONFIG_RA_288_DECODER) += ra288.o celp_math.o OBJS-$(CONFIG_RAWVIDEO_DECODER) += rawdec.o OBJS-$(CONFIG_RAWVIDEO_ENCODER) += rawenc.o OBJS-$(CONFIG_RL2_DECODER) += rl2.o Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c (original) +++ trunk/libavcodec/ra288.c Thu Oct 30 23:24:40 2008 @@ -24,6 +24,7 @@ #include "bitstream.h" #include "ra288.h" #include "lpc.h" +#include "celp_math.h" typedef struct { float sp_lpc[36]; ///< LPC coefficients for speech data (spec: A) @@ -52,17 +53,6 @@ static av_cold int ra288_decode_init(AVC return 0; } -static inline float scalar_product_float(const float * v1, const float * v2, - int size) -{ - float res = 0.; - - while (size--) - res += *v1++ * *v2++; - - return res; -} - static void apply_window(float *tgt, const float *m1, const float *m2, int n) { while (n--) @@ -72,7 +62,7 @@ static void apply_window(float *tgt, con static void convolve(float *tgt, const float *src, int len, int n) { for (; n >= 0; n--) - tgt[n] = scalar_product_float(src, src - n, len); + tgt[n] = ff_dot_productf(src, src - n, len); } @@ -101,7 +91,7 @@ static void decode(RA288Context *ractx, for (i=0; i < 5; i++) buffer[i] = codetable[cb_coef][i] * sumsum; - sum = scalar_product_float(buffer, buffer, 5) * ((1<<24)/5.); + sum = ff_dot_productf(buffer, buffer, 5) * ((1<<24)/5.); sum = FFMAX(sum, 1);

1 0

r15756 - trunk/libavcodec/celp_filters.h
by subversion＠mplayerhq.hu 30 Oct '08

30 Oct '08

Author: diego Date: Thu Oct 30 23:12:43 2008 New Revision: 15756 Log: Remove nonsense @return Doxygen comment for void function. Modified: trunk/libavcodec/celp_filters.h Modified: trunk/libavcodec/celp_filters.h ============================================================================== --- trunk/libavcodec/celp_filters.h (original) +++ trunk/libavcodec/celp_filters.h Thu Oct 30 23:12:43 2008 @@ -79,8 +79,6 @@ int ff_celp_lp_synthesis_filter( * @param buffer_length amount of data to process * @param filter_length filter length (10 for 10th order LP filter) * - * @return 1 if overflow occurred, 0 - otherwise - * * @note Output buffer must contain 10 samples of past * speech data before pointer. *

1 0