October 2011 - ffmpeg-cvslog - lists.ffmpeg.org

mmsh: mmsh_read_seek()
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 20:50:04 2011 +0100| [8475ec190c688e39cc8d2b4aa9048196ca7e775e] | committer: Michael Niedermayer mmsh: mmsh_read_seek() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8475ec190c688e39c… --- libavformat/mmsh.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index 94dc167..beef0a8 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -366,6 +366,25 @@ static int mmsh_read(URLContext *h, uint8_t *buf, int size) return res; } +static int64_t mmsh_read_seek(URLContext *h, int stream_index, + int64_t timestamp, int flags) +{ + MMSHContext *mmsh = h->priv_data; + MMSContext *mms = &mmsh->mms; + int ret; + + ret= mmsh_open_internal(h, mmsh->location, 0, timestamp, 0); + if(ret>=0){ + if (mms->mms_hd) + ffurl_close(mms->mms_hd); + av_freep(&mms->streams); + av_freep(&mms->asf_header); + av_free(mmsh); + }else + h->priv_data= mmsh; + return ret; +} + URLProtocol ff_mmsh_protocol = { .name = "mmsh", .url_open = mmsh_open, @@ -373,4 +392,5 @@ URLProtocol ff_mmsh_protocol = { .url_write = NULL, .url_seek = NULL, .url_close = mmsh_close, + .url_read_seek = mmsh_read_seek, };

1 0

Revert "Remove detection of mmsh protocol in ffplay."
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 18:04:39 2011 +0100| [df98446ba3b4a7775d5b79d9115dd837f309d991] | committer: Michael Niedermayer Revert "Remove detection of mmsh protocol in ffplay." This reverts commit 2f642393381659f4a198d9c5a96896eebb23de18. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df98446ba3b4a7775… --- ffplay.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ffplay.c b/ffplay.c index 5a32d4e..ae9db33 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2543,8 +2543,10 @@ static int read_thread(void *arg) else av_read_play(ic); } -#if CONFIG_RTSP_DEMUXER - if (is->paused && !strcmp(ic->iformat->name, "rtsp")) { +#if CONFIG_RTSP_DEMUXER || CONFIG_MMSH_PROTOCOL + if (is->paused && + (!strcmp(ic->iformat->name, "rtsp") || + (ic->pb && !strcmp(url_fileno(ic->pb)->prot->name, "mmsh")))) { /* wait 10 ms to avoid trying to get another packet */ /* XXX: horrible */ SDL_Delay(10);

1 0

dirac: alignment for dirac_hpel_filter_v has been fixed
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 17:03:03 2011 +0100| [d2ea38ddb761e0fd5d04a53118222bbcd476568e] | committer: Michael Niedermayer dirac: alignment for dirac_hpel_filter_v has been fixed Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ea38ddb761e0fd5… --- libavcodec/x86/diracdsp_yasm.asm | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index dd13088..36aad53 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -51,26 +51,26 @@ cglobal dirac_hpel_filter_v_%1, 4,6,8, dst, src, stride, width, src0, stridex3 pxor m7, m7 .loop: ; 7*(src[0] + src[1]) - UNPACK_ADD m0, m1, [srcq], [srcq + strideq], u,u + UNPACK_ADD m0, m1, [srcq], [srcq + strideq], a,a pmullw m0, [pw_7] pmullw m1, [pw_7] ; 3*( ... + src[-2] + src[3]) - UNPACK_ADD m2, m3, [src0q + strideq], [srcq + stridex3q], u,u + UNPACK_ADD m2, m3, [src0q + strideq], [srcq + stridex3q], a,a paddw m0, m2 paddw m1, m3 pmullw m0, [pw_3] pmullw m1, [pw_3] ; ... - 7*(src[-1] + src[2]) - UNPACK_ADD m2, m3, [src0q + strideq*2], [srcq + strideq*2], u,u + UNPACK_ADD m2, m3, [src0q + strideq*2], [srcq + strideq*2], a,a pmullw m2, [pw_7] pmullw m3, [pw_7] psubw m0, m2 psubw m1, m3 ; ... - (src[-3] + src[4]) - UNPACK_ADD m2, m3, [src0q], [srcq + strideq*4], u,u + UNPACK_ADD m2, m3, [src0q], [srcq + strideq*4], a,a psubw m0, m2 psubw m1, m3

1 0

dirac: alignment for put_signed_rect_clamped has been fixed
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 17:00:03 2011 +0100| [66b6d7bcd7b966ff2465436d83937918345e6aad] | committer: Michael Niedermayer dirac: alignment for put_signed_rect_clamped has been fixed Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66b6d7bcd7b966ff2… --- libavcodec/x86/diracdsp_yasm.asm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index e563bbf..154af19 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -157,8 +157,8 @@ cglobal put_signed_rect_clamped_%1, 5,7,3, dst, dst_stride, src, src_stride, w, packsswb m2, [src2q+2*wq+mmsize] paddb m1, m0 paddb m2, m0 - movu [dstq +wq], m1 - movu [dst2q+wq], m2 + mova [dstq +wq], m1 + mova [dst2q+wq], m2 jg .loopx lea srcq, [srcq+src_strideq*4]

1 0

dirac: alignment for add_dirac_obmc has been fixed
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 17:00:59 2011 +0100| [18f2ae3b77e55ac5457cee06cf7f751f746dca6c] | committer: Michael Niedermayer dirac: alignment for add_dirac_obmc has been fixed Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18f2ae3b77e55ac54… --- libavcodec/x86/diracdsp_yasm.asm | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index 10f3369..dd13088 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -224,12 +224,12 @@ cglobal add_dirac_obmc%1_%2, 6,6,5, dst, src, stride, obmc, yblen punpckhbw m3, m4 pmullw m0, m2 pmullw m1, m3 - movu m2, [dstq+2*i] - movu m3, [dstq+2*i+mmsize] + mova m2, [dstq+2*i] + mova m3, [dstq+2*i+mmsize] paddw m0, m2 paddw m1, m3 - movu [dstq+2*i], m0 - movu [dstq+2*i+mmsize], m1 + mova [dstq+2*i], m0 + mova [dstq+2*i+mmsize], m1 %assign i i+mmsize %endrep lea srcq, [srcq+strideq]

1 0

dirac: alignment for add_rect_clamped has been fixed
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 17:00:40 2011 +0100| [4debdee6ce5ac2a6c15741cb51920b7f714637e9] | committer: Michael Niedermayer dirac: alignment for add_rect_clamped has been fixed Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4debdee6ce5ac2a6c… --- libavcodec/x86/diracdsp_yasm.asm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index 154af19..10f3369 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -195,7 +195,7 @@ cglobal add_rect_clamped_%1, 7,7,3, dst, src, stride, idwt, idwt_stride, w, h paddw m1, [idwtq+2*wq] paddw m2, [idwtq+2*wq+mmsize] packuswb m1, m2 - movu [dstq +wq], m1 + mova [dstq +wq], m1 jg .loop lea srcq, [srcq + 2*strideq]

1 0

dirac: alignment for dirac_hpel_filter_v() has been fixed
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 16:59:23 2011 +0100| [2eecf63086ab58927c274ec10525f933785bb957] | committer: Michael Niedermayer dirac: alignment for dirac_hpel_filter_v() has been fixed Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2eecf63086ab58927… --- libavcodec/x86/diracdsp_yasm.asm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index bda791c..e563bbf 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -79,7 +79,7 @@ cglobal dirac_hpel_filter_v_%1, 4,6,8, dst, src, stride, width, src0, stridex3 psraw m0, 5 psraw m1, 5 packuswb m0, m1 - movu [dstq], m0 + mova [dstq], m0 add dstq, mmsize add srcq, mmsize add src0q, mmsize @@ -122,7 +122,7 @@ cglobal dirac_hpel_filter_h_%1, 3,3,8, dst, src, width psraw m0, 5 psraw m1, 5 packuswb m0, m1 - movu [dstq + widthq], m0 + mova [dstq + widthq], m0 sub widthd, mmsize jge .loop RET

1 0

dirac: fix stride alignment
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 16:46:50 2011 +0100| [08bef053a087d71a795672f6a58c4c28ec84ef13] | committer: Michael Niedermayer dirac: fix stride alignment This code was already added by Yuvi in c82cbea68273c6f08c4d0e94fc9fd50bfdea4e2b It was subsequently lost somehow Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08bef053a087d71a7… --- libavcodec/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 80e4e74..e494226 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -224,7 +224,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l #if HAVE_MMX if(s->codec_id == CODEC_ID_SVQ1 || s->codec_id == CODEC_ID_VP5 || s->codec_id == CODEC_ID_VP6 || s->codec_id == CODEC_ID_VP6F || - s->codec_id == CODEC_ID_VP6A) { + s->codec_id == CODEC_ID_VP6A || s->codec_id == CODEC_ID_DIRAC) { linesize_align[0] = linesize_align[1] = linesize_align[2] = 16;

1 0

dirac: fix segfault in horizontal_compose_haar
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 16:34:26 2011 +0100| [a14a0d7c2cd85e8e360d97d110f82591bacc880d] | committer: Michael Niedermayer dirac: fix segfault in horizontal_compose_haar Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a14a0d7c2cd85e8e3… --- libavcodec/x86/dwt_yasm.asm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/dwt_yasm.asm b/libavcodec/x86/dwt_yasm.asm index bdff9dd..b008906 100644 --- a/libavcodec/x86/dwt_yasm.asm +++ b/libavcodec/x86/dwt_yasm.asm @@ -209,7 +209,7 @@ cglobal horizontal_compose_haar%2i_%1, 3,6,4, b, tmp, w, x, w2, b_w2 jl .end .highpass_loop: - mova m1, [b_w2q + 2*xq] + movu m1, [b_w2q + 2*xq] mova m0, [tmpq + 2*xq] paddw m1, m0

1 0

lavfi: bump micro after recent changes in the overlay filter
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Mon Oct 31 11:19:53 2011 +0100| [30647fb45aa09f0e456d4fa3e794ae9f3d94d645] | committer: Stefano Sabatini lavfi: bump micro after recent changes in the overlay filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30647fb45aa09f0e4… --- libavfilter/avfilter.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 7607833..9c67b35 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 45 -#define LIBAVFILTER_VERSION_MICRO 2 +#define LIBAVFILTER_VERSION_MICRO 3 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \

1 0