June 2012 - ffmpeg-cvslog - lists.ffmpeg.org

os_support: Don't compare a negative number against socket descriptors
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Sun Jun 24 22:36:37 2012 +0300| [71078ad3338d850a24071e93b69d2109a943f73e] | committer: Martin Storsjö os_support: Don't compare a negative number against socket descriptors The fds are unsigned integers in the windows definition of struct sockfds. Due to this, the comparison if (fds[i].fd > n) was always false. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71078ad3338d850a2… --- libavformat/os_support.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 8054ba6..49ec0c6 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -286,7 +286,7 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) FD_ZERO(&write_set); FD_ZERO(&exception_set); - n = -1; + n = 0; for(i = 0; i < numfds; i++) { if (fds[i].fd < 0) continue; @@ -301,22 +301,22 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set); if (fds[i].events & POLLERR) FD_SET(fds[i].fd, &exception_set); - if (fds[i].fd > n) - n = fds[i].fd; + if (fds[i].fd >= n) + n = fds[i].fd + 1; }; - if (n == -1) + if (n == 0) /* Hey!? Nothing to poll, in fact!!! */ return 0; if (timeout < 0) - rc = select(n+1, &read_set, &write_set, &exception_set, NULL); + rc = select(n, &read_set, &write_set, &exception_set, NULL); else { struct timeval tv; tv.tv_sec = timeout / 1000; tv.tv_usec = 1000 * (timeout % 1000); - rc = select(n+1, &read_set, &write_set, &exception_set, &tv); + rc = select(n, &read_set, &write_set, &exception_set, &tv); }; if (rc < 0)

1 0

os_support: Include all the necessary headers for the win32 open function
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sun Jun 24 21:29:14 2012 +0300| [5aff37d28d6a140f70f6cae996e6f55b21b1106d] | committer: Martin Storsjö os_support: Include all the necessary headers for the win32 open function io.h is required for open and _wopen, and fcntl.h is required for the O_CREAT flag. On mingw, fcntl.h is included by os_support.h (and the mingw fcntl.h includes io.h), but include it explicitly here since this implementation requires it. Also move the #undef open up. open must not be defined to ff_win32_open while including the headers that declare the open function. On mingw, this happened in os_support.h before open was redirected. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5aff37d28d6a140f7… --- libavformat/os_support.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 0cbaf45..8054ba6 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -28,9 +28,11 @@ #include "os_support.h" #if defined(_WIN32) && !defined(__MINGW32CE__) +#undef open +#include <fcntl.h> +#include <io.h> #include <windows.h> -#undef open int ff_win32_open(const char *filename_utf8, int oflag, int pmode) { int fd;

1 0

x86: vc1: fix and enable optimised loop filter
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Mans Rullgard <mans(a)mansr.com> | Fri Jun 22 21:40:28 2012 +0100| [f2fd167835b6f039a593e46ab3a84e1b9a453660] | committer: Mans Rullgard x86: vc1: fix and enable optimised loop filter The problem is that the ssse3 psign instruction does the wrong thing here. Commit ea60dfe incorrectly removed a macro emulating this instruction for pre-ssse3 code. However, the emulation is incorrect, and the code relies on the behaviour of the macro. Specifically, the psign sets destination elements to zero where the corresponding source element is zero, whereas the emulation only negates destination elements where the source is negative. Furthermore, the PSIGNW_MMX macro in x86util.asm is totally bogus, which is why the original VC-1 code had an additional right shift when using it. Since the psign instruction cannot be used here, skip all the macro hell and use the working instruction sequence directly. None of this was noticed due a stray return statement in ff_vc1dsp_init_mmx() which meant that only the mmx version of the loop filter was ever used (before being removed in ea60dfe). Signed-off-by: Mans Rullgard <mans(a)mansr.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2fd167835b6f039a… --- libavcodec/x86/vc1dsp_mmx.c | 2 +- libavcodec/x86/vc1dsp_yasm.asm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 4e996f1..717f74f 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -797,7 +797,7 @@ void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) if (mm_flags & AV_CPU_FLAG_MMX) { dsp->put_no_rnd_vc1_chroma_pixels_tab[0]= ff_put_vc1_chroma_mc8_mmx_nornd; } - return; + if (mm_flags & AV_CPU_FLAG_MMX2) { ASSIGN_LF(mmx2); dsp->avg_no_rnd_vc1_chroma_pixels_tab[0]= ff_avg_vc1_chroma_mc8_mmx2_nornd; diff --git a/libavcodec/x86/vc1dsp_yasm.asm b/libavcodec/x86/vc1dsp_yasm.asm index 2c5cf22..ced2b5b 100644 --- a/libavcodec/x86/vc1dsp_yasm.asm +++ b/libavcodec/x86/vc1dsp_yasm.asm @@ -119,7 +119,9 @@ section .text pand m2, m6 pand m3, m2 ; d final - PSIGNW m3, m7 + psraw m7, 15 + pxor m3, m7 + psubw m3, m7 psubw m0, m3 paddw m1, m3 packuswb m0, m0 @@ -284,7 +286,6 @@ cglobal vc1_h_loop_filter8_sse2, 3,6,8 RET %define PABSW PABSW_SSSE3 -%define PSIGNW PSIGNW_SSSE3 INIT_MMX ; void ff_vc1_v_loop_filter4_ssse3(uint8_t *src, int stride, int pq)

1 0

ffmpeg: re-set frame_size after filter graph reset.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Sat Jun 30 21:33:48 2012 +0200| [be24f85176d8e46c3154f1f51013f235b273183e] | committer: Nicolas George ffmpeg: re-set frame_size after filter graph reset. The filter contexts are completely cleared, so the frame size can not be kept. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be24f85176d8e46c3… --- ffmpeg.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index b7f712e..df8de11 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2425,10 +2425,20 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ist->resample_channels = avctx->channels; for (i = 0; i < nb_filtergraphs; i++) - if (ist_in_filtergraph(filtergraphs[i], ist) && - configure_filtergraph(filtergraphs[i]) < 0) { - av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n"); - exit_program(1); + if (ist_in_filtergraph(filtergraphs[i], ist)) { + FilterGraph *fg = filtergraphs[i]; + int j; + if (configure_filtergraph(fg) < 0) { + av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n"); + exit_program(1); + } + for (j = 0; j < fg->nb_outputs; j++) { + OutputStream *ost = fg->outputs[j]->ost; + if (ost->enc->type == AVMEDIA_TYPE_AUDIO && + !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) + av_buffersink_set_frame_size(ost->filter->filter, + ost->st->codec->frame_size); + } } }

1 0

swr: fix MMX resample code, add emms
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 21:27:39 2012 +0200| [51d25783488c056b2323041eba2f54a9b6e932b7] | committer: Michael Niedermayer swr: fix MMX resample code, add emms Fixes Ticket1495 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51d25783488c056b2… --- libswresample/resample.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 8c8ef92..4aa53ee 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -412,6 +412,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){ int i, ret= -1; int mm_flags = av_get_cpu_flags(); + int need_emms= 0; for(i=0; i<dst->ch_count; i++){ #if ARCH_X86 @@ -419,15 +420,18 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_SSSE3)) ret= swri_resample_int16_ssse3(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); else #endif - if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_MMX2 )) ret= swri_resample_int16_mmx2 (c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); - else + if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_MMX2 )){ + ret= swri_resample_int16_mmx2 (c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); + need_emms= 1; + } else #endif if(c->format == AV_SAMPLE_FMT_S16P) ret= swri_resample_int16(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); else if(c->format == AV_SAMPLE_FMT_S32P) ret= swri_resample_int32(c, (int32_t*)dst->ch[i], (const int32_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); else if(c->format == AV_SAMPLE_FMT_FLTP) ret= swri_resample_float(c, (float *)dst->ch[i], (const float *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); else if(c->format == AV_SAMPLE_FMT_DBLP) ret= swri_resample_double(c,(double *)dst->ch[i], (const double *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); } - + if(need_emms) + emms_c(); return ret; }

1 0

wmaenc: fix off by 1 error in quantization loop
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 19:38:11 2012 +0200| [799df083f3196d96ead6ea4400426dbd178573b1] | committer: Michael Niedermayer wmaenc: fix off by 1 error in quantization loop Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=799df083f3196d96e… --- libavcodec/wmaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 93522af..360902a 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -379,7 +379,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, for(i=64; i; i>>=1){ int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain - i); - if(error<0) + if(error<=0) total_gain-= i; } #else

1 0

avcodec_encode_audio2: print error messages for errors
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 20:43:18 2012 +0200| [7001eee1f4bda539c449d191116af8a0ec88ee50] | committer: Michael Niedermayer avcodec_encode_audio2: print error messages for errors Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7001eee1f4bda539c… --- libavcodec/utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f7a34af..c2ccd8f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1103,8 +1103,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, /* check for valid frame size */ if (frame) { if (avctx->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { - if (frame->nb_samples > avctx->frame_size) + if (frame->nb_samples > avctx->frame_size) { + av_log(avctx, AV_LOG_ERROR, "more samples than frame size (avcodec_encode_audio2)\n"); return AVERROR(EINVAL); + } } else if (!(avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) { if (frame->nb_samples < avctx->frame_size && !avctx->internal->last_audio_frame) { @@ -1116,8 +1118,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, avctx->internal->last_audio_frame = 1; } - if (frame->nb_samples != avctx->frame_size) + if (frame->nb_samples != avctx->frame_size) { + av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d) (avcodec_encode_audio2)\n", frame->nb_samples, avctx->frame_size); return AVERROR(EINVAL); + } } }

1 0

wmaenc: rewrite 2nd stage quantization code
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 19:47:00 2012 +0200| [5968a076222ab892b3a657e51f14969e57d92646] | committer: Michael Niedermayer wmaenc: rewrite 2nd stage quantization code this is faster and more correct Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5968a076222ab892b… --- libavcodec/wmaenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 3e39df9..d3210d2 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -352,7 +352,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, { WMACodecContext *s = avctx->priv_data; const int16_t *samples = (const int16_t *)frame->data[0]; - int i, total_gain, ret; + int i, total_gain, ret, error; s->block_len_bits= s->frame_len_bits; //required by non variable block len s->block_len = 1 << s->block_len_bits; @@ -376,13 +376,14 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, total_gain= 128; for(i=64; i; i>>=1){ - int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, + error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain - i); if(error<=0) total_gain-= i; } - encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain); + while(total_gain <= 128 && error > 0) + error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain++); av_assert0((put_bits_count(&s->pb) & 7) == 0); i= s->block_align - (put_bits_count(&s->pb)+7)/8; av_assert0(i>=0);

1 0

wmaenc: remove alternative quantization loop
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 19:42:01 2012 +0200| [0755033f8af774cea34566adec455fbafd9f66bc] | committer: Michael Niedermayer wmaenc: remove alternative quantization loop Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0755033f8af774cea… --- libavcodec/wmaenc.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 360902a..3e39df9 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -374,7 +374,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * MAX_CODED_SUPERFRAME_SIZE))) return ret; -#if 1 total_gain= 128; for(i=64; i; i>>=1){ int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, @@ -382,22 +381,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, if(error<=0) total_gain-= i; } -#else - total_gain= 90; - best = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain); - for(i=32; i; i>>=1){ - int scoreL = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain - i); - int scoreR = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain + i); - av_log(NULL, AV_LOG_ERROR, "%d %d %d (%d)\n", scoreL, best, scoreR, total_gain); - if(scoreL < FFMIN(best, scoreR)){ - best = scoreL; - total_gain -= i; - }else if(scoreR < best){ - best = scoreR; - total_gain += i; - } - } -#endif encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain); av_assert0((put_bits_count(&s->pb) & 7) == 0);

1 0

wmaenc: change another assert to av_assert
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 19:36:38 2012 +0200| [e704ab3d5f390c3ee07762b84eab55bf6fb7aca1] | committer: Michael Niedermayer wmaenc: change another assert to av_assert Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e704ab3d5f390c3ee… --- libavcodec/wmaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 7fb8479..93522af 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -336,7 +336,7 @@ static int encode_frame(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], init_put_bits(&s->pb, buf, buf_size); if (s->use_bit_reservoir) { - assert(0);//FIXME not implemented + av_assert0(0);//FIXME not implemented }else{ if(encode_block(s, src_coefs, total_gain) < 0) return INT_MAX;

1 0