May 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r31279 - in trunk/libswscale/x86: yuv2rgb_mmx.c yuv2rgb_template.c yuv2rgb_template2.c
by subversion＠mplayerhq.hu 30 May '10

30 May '10

Author: diego Date: Sun May 30 10:44:05 2010 New Revision: 31279 Log: Rename yuv2rgb_template2.c --> yuv2rgb_template.c now that the other is gone. Added: trunk/libswscale/x86/yuv2rgb_template.c - copied unchanged from r31277, trunk/libswscale/x86/yuv2rgb_template2.c Deleted: trunk/libswscale/x86/yuv2rgb_template2.c Modified: trunk/libswscale/x86/yuv2rgb_mmx.c Modified: trunk/libswscale/x86/yuv2rgb_mmx.c ============================================================================== --- trunk/libswscale/x86/yuv2rgb_mmx.c Sun May 30 10:31:23 2010 (r31278) +++ trunk/libswscale/x86/yuv2rgb_mmx.c Sun May 30 10:44:05 2010 (r31279) @@ -52,14 +52,14 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = #define HAVE_MMX2 0 #define HAVE_AMD3DNOW 0 #define RENAME(a) a ## _MMX -#include "yuv2rgb_template2.c" +#include "yuv2rgb_template.c" //MMX2 versions #undef RENAME #undef HAVE_MMX2 #define HAVE_MMX2 1 #define RENAME(a) a ## _MMX2 -#include "yuv2rgb_template2.c" +#include "yuv2rgb_template.c" SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) {

1 0

r23387 - trunk/LICENSE
by subversion＠mplayerhq.hu 30 May '10

30 May '10

Author: diego Date: Sun May 30 10:31:50 2010 New Revision: 23387 Log: The GPL-licensed optimizations in libswscale have been replaced. Modified: trunk/LICENSE Modified: trunk/LICENSE ============================================================================== --- trunk/LICENSE Sat May 29 17:29:40 2010 (r23386) +++ trunk/LICENSE Sun May 30 10:31:50 2010 (r23387) @@ -14,8 +14,6 @@ configure to activate them. In this case Specifically, the GPL parts of FFmpeg are - libpostproc -- optional MMX optimizations for YUV to RGB colorspace conversion in - libswscale/x86/yuv2rgb_template.c - optional x86 optimizations in the files libavcodec/x86/h264_deblock_sse2.asm libavcodec/x86/h264_idct_sse2.asm

1 0

r31278 - in trunk/libswscale/x86: yuv2rgb_mmx.c yuv2rgb_template.c
by subversion＠mplayerhq.hu 30 May '10

30 May '10

Author: diego Date: Sun May 30 10:31:23 2010 New Revision: 31278 Log: Remove GPL-licensed YUV to RGB MMX routines. We now have an LGPL replacement that is at least equally fast. Deleted: trunk/libswscale/x86/yuv2rgb_template.c Modified: trunk/libswscale/x86/yuv2rgb_mmx.c Modified: trunk/libswscale/x86/yuv2rgb_mmx.c ============================================================================== --- trunk/libswscale/x86/yuv2rgb_mmx.c Sun May 30 07:16:29 2010 (r31277) +++ trunk/libswscale/x86/yuv2rgb_mmx.c Sun May 30 10:31:23 2010 (r31278) @@ -52,22 +52,14 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = #define HAVE_MMX2 0 #define HAVE_AMD3DNOW 0 #define RENAME(a) a ## _MMX -#if CONFIG_GPL -#include "yuv2rgb_template.c" -#else #include "yuv2rgb_template2.c" -#endif //MMX2 versions #undef RENAME #undef HAVE_MMX2 #define HAVE_MMX2 1 #define RENAME(a) a ## _MMX2 -#if CONFIG_GPL -#include "yuv2rgb_template.c" -#else #include "yuv2rgb_template2.c" -#endif SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) {

1 0

r23386 - in trunk/libavcodec/arm: Makefile mpegvideo_arm.c mpegvideo_neon.S
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: mru Date: Sat May 29 17:29:40 2010 New Revision: 23386 Log: ARM: NEON optimised dct_unquantize_h263_{intra,inter} Added: trunk/libavcodec/arm/mpegvideo_neon.S Modified: trunk/libavcodec/arm/Makefile trunk/libavcodec/arm/mpegvideo_arm.c Modified: trunk/libavcodec/arm/Makefile ============================================================================== --- trunk/libavcodec/arm/Makefile Sat May 29 17:07:08 2010 (r23385) +++ trunk/libavcodec/arm/Makefile Sat May 29 17:29:40 2010 (r23386) @@ -49,5 +49,6 @@ NEON-OBJS-$(CONFIG_VP6_DECODER) + OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \ arm/dsputil_neon.o \ arm/int_neon.o \ + arm/mpegvideo_neon.o \ arm/simple_idct_neon.o \ $(NEON-OBJS-yes) Modified: trunk/libavcodec/arm/mpegvideo_arm.c ============================================================================== --- trunk/libavcodec/arm/mpegvideo_arm.c Sat May 29 17:07:08 2010 (r23385) +++ trunk/libavcodec/arm/mpegvideo_arm.c Sat May 29 17:29:40 2010 (r23386) @@ -23,6 +23,11 @@ #include "libavcodec/mpegvideo.h" #include "mpegvideo_arm.h" +void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, DCTELEM *block, + int n, int qscale); +void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, DCTELEM *block, + int n, int qscale); + void MPV_common_init_arm(MpegEncContext *s) { /* IWMMXT support is a superset of armv5te, so @@ -35,4 +40,9 @@ void MPV_common_init_arm(MpegEncContext #if HAVE_IWMMXT MPV_common_init_iwmmxt(s); #endif + + if (HAVE_NEON) { + s->dct_unquantize_h263_intra = ff_dct_unquantize_h263_intra_neon; + s->dct_unquantize_h263_inter = ff_dct_unquantize_h263_inter_neon; + } } Added: trunk/libavcodec/arm/mpegvideo_neon.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavcodec/arm/mpegvideo_neon.S Sat May 29 17:29:40 2010 (r23386) @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2010 Mans Rullgard + * + * 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 + */ + +#include "asm.S" + +#define Y_DC_SCALE 0xa54 +#define C_DC_SCALE 0xa58 +#define AC_PRED 0xa80 +#define BLOCK_LAST_INDEX 0x2278 +#define INTER_SCANTAB_RASTER_END 0x2478 +#define H263_AIC 0x2728 + +function ff_dct_unquantize_h263_inter_neon, export=1 + add r0, r0, #0x2200 + add r12, r0, #BLOCK_LAST_INDEX-0x2200 + ldr r12, [r12, r2, lsl #2] + add r0, r0, #INTER_SCANTAB_RASTER_END-0x2200 + ldrb r12, [r0, r12] + sub r2, r3, #1 + lsl r0, r3, #1 + orr r2, r2, #1 + add r3, r12, #1 +endfunc + +function ff_dct_unquantize_h263_neon, export=1 + vdup.16 q15, r0 @ qmul + vdup.16 q14, r2 @ qadd + vneg.s16 q13, q14 + cmp r3, #4 + mov r0, r1 + ble 2f +1: + vld1.16 {q0}, [r0,:128]! + vclt.s16 q3, q0, #0 + vld1.16 {q8}, [r0,:128]! + vceq.s16 q1, q0, #0 + vmul.s16 q2, q0, q15 + vclt.s16 q11, q8, #0 + vmul.s16 q10, q8, q15 + vbsl q3, q13, q14 + vbsl q11, q13, q14 + vadd.s16 q2, q2, q3 + vceq.s16 q9, q8, #0 + vadd.s16 q10, q10, q11 + vbif q0, q2, q1 + vbif q8, q10, q9 + subs r3, r3, #16 + vst1.16 {q0}, [r1,:128]! + vst1.16 {q8}, [r1,:128]! + bxle lr + cmp r3, #8 + bgt 1b +2: + vld1.16 {d0}, [r0,:64] + vclt.s16 d3, d0, #0 + vceq.s16 d1, d0, #0 + vmul.s16 d2, d0, d30 + vbsl d3, d26, d28 + vadd.s16 d2, d2, d3 + vbif d0, d2, d1 + vst1.16 {d0}, [r1,:64] + bx lr +endfunc + +function ff_dct_unquantize_h263_intra_neon, export=1 + push {r4-r6,lr} + ldr r6, [r0, #AC_PRED] + add r5, r0, #0x2700 + cmp r6, #0 + movne r12, #63 + bne 1f + add lr, r0, #0x2200 + add r12, lr, #BLOCK_LAST_INDEX-0x2200 + add lr, lr, #INTER_SCANTAB_RASTER_END-0x2200 + ldr r12, [r12, r2, lsl #2] + ldrb r12, [lr, r12] +1: ldr r5, [r5, #H263_AIC-0x2700] + ldrsh r4, [r1] + cmp r5, #0 + mov r5, r1 + movne r2, #0 + bne 2f + cmp r2, #4 + addge r0, r0, #4 + sub r2, r3, #1 + ldr r6, [r0, #Y_DC_SCALE] + orr r2, r2, #1 + smulbb r4, r4, r6 +2: lsl r0, r3, #1 + add r3, r12, #1 + bl ff_dct_unquantize_h263_neon + vmov.16 d0[0], r4 + vst1.16 {d0[0]}, [r5] + pop {r4-r6,pc} +endfunc

1 0

r23385 - in branches/0.6: . libavcodec/h263dec.c
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: siretart Date: Sat May 29 17:07:08 2010 New Revision: 23385 Log: Treat SIPP like xvid, fixed issue1966 backport r23336 by michael Modified: branches/0.6/ (props changed) branches/0.6/libavcodec/h263dec.c Modified: branches/0.6/libavcodec/h263dec.c ============================================================================== --- branches/0.6/libavcodec/h263dec.c Sat May 29 16:45:13 2010 (r23384) +++ branches/0.6/libavcodec/h263dec.c Sat May 29 17:07:08 2010 (r23385) @@ -428,7 +428,9 @@ retry: if(s->xvid_build==-1 && s->divx_version==-1 && s->lavc_build==-1){ if(s->stream_codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || - s->codec_tag == AV_RL32("RMP4")) + s->codec_tag == AV_RL32("RMP4") || + s->codec_tag == AV_RL32("SIPP") + ) s->xvid_build= 0; #if 0 if(s->codec_tag == AV_RL32("DIVX") && s->vo_type==0 && s->vol_control_parameters==1

1 0

r23384 - in branches/0.6: . libavformat/riff.c
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: siretart Date: Sat May 29 16:45:13 2010 New Revision: 23384 Log: Samsung uses SIPP as FourCC for MPEG-4 ASP. backport r23309 by cehoyos Modified: branches/0.6/ (props changed) branches/0.6/libavformat/riff.c Modified: branches/0.6/libavformat/riff.c ============================================================================== --- branches/0.6/libavformat/riff.c Sat May 29 16:41:26 2010 (r23383) +++ branches/0.6/libavformat/riff.c Sat May 29 16:45:13 2010 (r23384) @@ -80,6 +80,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, { CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, + { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */ { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },

1 0

r23383 - in branches/0.6: . ffserver.c
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: siretart Date: Sat May 29 16:41:26 2010 New Revision: 23383 Log: ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests This is needed for QuickTime Player to be able to connect properly. backport r23325 by mstorsjo Modified: branches/0.6/ (props changed) branches/0.6/ffserver.c Modified: branches/0.6/ffserver.c ============================================================================== --- branches/0.6/ffserver.c Sat May 29 16:40:31 2010 (r23382) +++ branches/0.6/ffserver.c Sat May 29 16:41:26 2010 (r23383) @@ -3012,6 +3012,7 @@ static void rtsp_cmd_describe(HTTPContex return; } rtsp_reply_header(c, RTSP_STATUS_OK); + url_fprintf(c->pb, "Content-Base: %s/\r\n", url); url_fprintf(c->pb, "Content-Type: application/sdp\r\n"); url_fprintf(c->pb, "Content-Length: %d\r\n", content_length); url_fprintf(c->pb, "\r\n");

1 0

r23382 - in branches/0.6: . ffserver.c
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: siretart Date: Sat May 29 16:40:31 2010 New Revision: 23382 Log: backport latest ffserver fixes like memory leaks and invalid reads Patches by Howard Chu, hyc at highlandsun dot com backport r23290-23295 by mstorsjo Modified: branches/0.6/ (props changed) branches/0.6/ffserver.c Modified: branches/0.6/ffserver.c ============================================================================== --- branches/0.6/ffserver.c Sat May 29 16:34:37 2010 (r23381) +++ branches/0.6/ffserver.c Sat May 29 16:40:31 2010 (r23382) @@ -847,6 +847,8 @@ static void close_connection(HTTPContext ctx = c->rtp_ctx[i]; if (ctx) { av_write_trailer(ctx); + av_metadata_free(&ctx->metadata); + av_free(ctx->streams[0]); av_free(ctx); } h = c->rtp_handles[i]; @@ -2280,6 +2282,7 @@ static int http_prepare_data(HTTPContext http_log("Error writing output header\n"); return -1; } + av_metadata_free(&c->fmt_ctx.metadata); len = url_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer); c->buffer_ptr = c->pb_buffer; @@ -2343,7 +2346,7 @@ static int http_prepare_data(HTTPContext } } for(i=0;i<c->stream->nb_streams;i++) { - if (c->feed_streams[i] == pkt.stream_index) { + if (c->stream->feed_streams[i] == pkt.stream_index) { AVStream *st = c->fmt_in->streams[source_index]; pkt.stream_index = i; if (pkt.flags & AV_PKT_FLAG_KEY && @@ -2879,7 +2882,7 @@ static int rtsp_parse_request(HTTPContex if (*p == '\n') p++; while (*p != '\0') { - p1 = strchr(p, '\n'); + p1 = memchr(p, '\n', (char *)c->buffer_ptr - p); if (!p1) break; p2 = p1; @@ -2956,6 +2959,7 @@ static int prepare_sdp_description(FFStr } *pbuffer = av_mallocz(2048); avf_sdp_create(&avc, 1, *pbuffer, 2048); + av_metadata_free(&avc->metadata); av_free(avc); return strlen(*pbuffer); @@ -3012,6 +3016,7 @@ static void rtsp_cmd_describe(HTTPContex url_fprintf(c->pb, "Content-Length: %d\r\n", content_length); url_fprintf(c->pb, "\r\n"); put_buffer(c->pb, content, content_length); + av_free(content); } static HTTPContext *find_rtp_session(const char *session_id) @@ -3378,7 +3383,6 @@ static int rtp_new_av_stream(HTTPContext st = av_mallocz(sizeof(AVStream)); if (!st) goto fail; - st->codec= avcodec_alloc_context(); ctx->nb_streams = 1; ctx->streams[0] = st; @@ -3454,16 +3458,28 @@ static int rtp_new_av_stream(HTTPContext /********************************************************************/ /* ffserver initialization */ -static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec) +static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int copy) { AVStream *fst; fst = av_mallocz(sizeof(AVStream)); if (!fst) return NULL; - fst->codec= avcodec_alloc_context(); + if (copy) { + fst->codec= avcodec_alloc_context(); + memcpy(fst->codec, codec, sizeof(AVCodecContext)); + if (codec->extradata_size) { + fst->codec->extradata = av_malloc(codec->extradata_size); + memcpy(fst->codec->extradata, codec->extradata, + codec->extradata_size); + } + } else { + /* live streams must use the actual feed's codec since it may be + * updated later to carry extradata needed by the streams. + */ + fst->codec = codec; + } fst->priv_data = av_mallocz(sizeof(FeedData)); - memcpy(fst->codec, codec, sizeof(AVCodecContext)); fst->index = stream->nb_streams; av_set_pts_info(fst, 33, 1, 90000); stream->streams[stream->nb_streams++] = fst; @@ -3505,7 +3521,7 @@ static int add_av_stream(FFStream *feed, } } - fst = add_av_stream1(feed, av); + fst = add_av_stream1(feed, av, 0); if (!fst) return -1; return feed->nb_streams - 1; @@ -3616,7 +3632,7 @@ static void build_file_streams(void) extract_mpeg4_header(infile); for(i=0;i<infile->nb_streams;i++) - add_av_stream1(stream, infile->streams[i]->codec); + add_av_stream1(stream, infile->streams[i]->codec, 1); av_close_input_file(infile); } @@ -3683,7 +3699,7 @@ static void build_feed_streams(void) ccs = ss->codec; #define CHECK_CODEC(x) (ccf->x != ccs->x) - if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) { + if (CHECK_CODEC(codec_id) || CHECK_CODEC(codec_type)) { http_log("Codecs do not match for stream %d\n", i); matches = 0; } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) {

1 0

r23381 - in branches/0.6: . libavcodec/vorbis_enc.c
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: siretart Date: Sat May 29 16:34:37 2010 New Revision: 23381 Log: Mark vorbis encoder as experimental. backport r23339 by cehoyos Modified: branches/0.6/ (props changed) branches/0.6/libavcodec/vorbis_enc.c Modified: branches/0.6/libavcodec/vorbis_enc.c ============================================================================== --- branches/0.6/libavcodec/vorbis_enc.c Sat May 29 16:33:50 2010 (r23380) +++ branches/0.6/libavcodec/vorbis_enc.c Sat May 29 16:34:37 2010 (r23381) @@ -1099,7 +1099,7 @@ AVCodec vorbis_encoder = { vorbis_encode_init, vorbis_encode_frame, vorbis_encode_close, - .capabilities= CODEC_CAP_DELAY, + .capabilities= CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), };

1 0

r23380 - in branches/0.6: . libavcodec/aacenc.c
by subversion＠mplayerhq.hu 29 May '10

29 May '10

Author: siretart Date: Sat May 29 16:33:50 2010 New Revision: 23380 Log: Mark AAC encoder as experimental. backport r23350 by alexc Modified: branches/0.6/ (props changed) branches/0.6/libavcodec/aacenc.c Modified: branches/0.6/libavcodec/aacenc.c ============================================================================== --- branches/0.6/libavcodec/aacenc.c Sat May 29 16:33:02 2010 (r23379) +++ branches/0.6/libavcodec/aacenc.c Sat May 29 16:33:50 2010 (r23380) @@ -645,7 +645,7 @@ AVCodec aac_encoder = { aac_encode_init, aac_encode_frame, aac_encode_end, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, + .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), };

1 0