August 2012 - ffmpeg-cvslog - lists.ffmpeg.org

aac: reference supported sample rates in encoders.
by git＠videolan.org 06 Nov '12

06 Nov '12

ffmpeg | branch: master | Clément Bœsch <clement.boesch(a)smartjog.com> | Mon Mar 26 22:32:17 2012 +0200| [29679f4a372eb208af31c57177ab49f67c698362] | committer: Clément Bœsch aac: reference supported sample rates in encoders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29679f4a372eb208a… --- libavcodec/aacenc.c | 1 + libavcodec/libvo-aacenc.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index cf4aef9..fd72daf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -816,6 +816,7 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 8f7c581..c5191ec 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -193,6 +193,7 @@ AVCodec ff_libvo_aacenc_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_close, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

3 2

Add CPiA video decoder
by git＠videolan.org 02 Sep '12

02 Sep '12

ffmpeg | branch: master | Stephan Hilb <stephan(a)ecshi.net> | Thu Aug 23 18:40:22 2012 +0200| [6eac554659b6b6e9b348ec26c44b5105a3f4b11c] | committer: Michael Niedermayer Add CPiA video decoder The cpia video decoder is intended to be used with the v4l2 demuxer. There are some small changes to the v4l2 demuxer to support the variable frame length of the format. Fixes ticket #1537 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6eac554659b6b6e9b… --- Changelog | 1 + MAINTAINERS | 2 + doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 6 ++ libavcodec/cpia.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ libavdevice/v4l2.c | 18 +++- 9 files changed, 248 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 7e979f8..a8536e2 100644 --- a/Changelog +++ b/Changelog @@ -55,6 +55,7 @@ version next: - Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP instead of AV_CODEC_ID_TEXT - smartblur filter ported from MPlayer +- CPiA decoder version 0.11: diff --git a/MAINTAINERS b/MAINTAINERS index f774806..1860b6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -134,6 +134,7 @@ Codecs: cljr Alex Beregszaszi cllc.c Derek Buitenhuis cook.c, cookdata.h Benjamin Larsson + cpia.c Stephan Hilb crystalhd.c Philip Langdale cscd.c Reimar Doeffinger dca.c Kostya Shishkov, Benjamin Larsson @@ -440,4 +441,5 @@ Reynaldo H. Verdejo Pinochet 6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A Robert Swain EE7A 56EA 4A81 A7B5 2001 A521 67FA 362D A2FC 3E71 Sascha Sommer 38A0 F88B 868E 9D3A 97D4 D6A0 E823 706F 1E07 0D3C Stefano Sabatini 9A43 10F8 D32C D33C 48E7 C52C 5DF2 8E4D B2EE 066B +Stephan Hilb 4F38 0B3A 5F39 B99B F505 E562 8D5C 5554 4E17 8863 Tomas Härdin D133 29CA 4EEC 9DB4 7076 F697 B04B 7403 3313 41FD diff --git a/doc/general.texi b/doc/general.texi index 419eac7..301c98c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -512,6 +512,7 @@ following image formats are supported: @item Cinepak @tab @tab X @item Cirrus Logic AccuPak @tab X @tab X @tab fourcc: CLJR +@item CPiA Video Format @tab @tab X @item Creative YUV (CYUV) @tab @tab X @item DFA @tab @tab X @tab Codec used in Chronomaster game. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c3de2cb..e9b4806 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -141,6 +141,7 @@ OBJS-$(CONFIG_CLJR_DECODER) += cljr.o OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o OBJS-$(CONFIG_CLLC_DECODER) += cllc.o OBJS-$(CONFIG_COOK_DECODER) += cook.o +OBJS-$(CONFIG_CPIA_DECODER) += cpia.o OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 1ddd440..d0cec39 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -97,6 +97,7 @@ void avcodec_register_all(void) REGISTER_DECODER (CINEPAK, cinepak); REGISTER_ENCDEC (CLJR, cljr); REGISTER_DECODER (CLLC, cllc); + REGISTER_DECODER (CPIA, cpia); REGISTER_DECODER (CSCD, cscd); REGISTER_DECODER (CYUV, cyuv); REGISTER_DECODER (DFA, dfa); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f4ed8ce..97d0ae6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -280,6 +280,7 @@ enum AVCodecID { AV_CODEC_ID_SANM = MKBETAG('S','A','N','M'), AV_CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'), AV_CODEC_ID_AVRN = MKBETAG('A','V','R','n'), + AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'), /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0385f9c..c4bf433 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1183,6 +1183,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "avrn", .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), }, + { + .id = AV_CODEC_ID_CPIA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "cpia", + .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), + }, /* various PCM "codecs" */ { diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c new file mode 100644 index 0000000..c45936b --- /dev/null +++ b/libavcodec/cpia.c @@ -0,0 +1,218 @@ +/* + * CPiA video decoder. + * Copyright (c) 2010 Hans de Goede <hdegoede(a)redhat.com> + * + * This decoder is based on the LGPL code available at + * https://v4l4j.googlecode.com/svn/v4l4j/trunk/libvideo/libv4lconvert/cpia1.c + * + * 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 "avcodec.h" +#include "get_bits.h" + + +#define FRAME_HEADER_SIZE 64 +#define MAGIC_0 0x19 /**< First header byte */ +#define MAGIC_1 0x68 /**< Second header byte */ +#define SUBSAMPLE_420 0 +#define SUBSAMPLE_422 1 +#define YUVORDER_YUYV 0 +#define YUVORDER_UYVY 1 +#define NOT_COMPRESSED 0 +#define COMPRESSED 1 +#define NO_DECIMATION 0 +#define DECIMATION_ENAB 1 +#define EOL 0xfd /**< End Of Line marker */ +#define EOI 0xff /**< End Of Image marker */ + + +typedef struct { + AVFrame frame; +} CpiaContext; + + +static int cpia_decode_frame(AVCodecContext* avctx, + void* data, int* data_size, AVPacket* avpkt) +{ + CpiaContext* const cpia = avctx->priv_data; + int i,j,ret; + + uint8_t* const header = avpkt->data; + uint8_t* src; + int src_size; + uint16_t linelength; + uint8_t skip; + + AVFrame* const frame = &cpia->frame; + uint8_t *y, *u, *v, *y_end, *u_end, *v_end; + + // Get buffer filled with previous frame + if ((ret = avctx->reget_buffer(avctx, frame)) < 0) { + av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed!\n"); + return ret; + } + + // Check header + if ( avpkt->size < FRAME_HEADER_SIZE + || header[0] != MAGIC_0 || header[1] != MAGIC_1 + || (header[17] != SUBSAMPLE_420 && header[17] != SUBSAMPLE_422) + || (header[18] != YUVORDER_YUYV && header[18] != YUVORDER_UYVY) + || (header[28] != NOT_COMPRESSED && header[28] != COMPRESSED) + || (header[29] != NO_DECIMATION && header[29] != DECIMATION_ENAB) + ) { + av_log(avctx, AV_LOG_ERROR, "Invalid header!\n"); + return AVERROR_INVALIDDATA; + } + + // currently unsupported properties + if (header[17] == SUBSAMPLE_422) { + av_log(avctx, AV_LOG_ERROR, "Unsupported subsample!\n"); + return AVERROR_PATCHWELCOME; + } + if (header[18] == YUVORDER_UYVY) { + av_log(avctx, AV_LOG_ERROR, "Unsupported YUV byte order!\n"); + return AVERROR_PATCHWELCOME; + } + if (header[29] == DECIMATION_ENAB) { + av_log(avctx, AV_LOG_ERROR, "Decimation unsupported!\n"); + return AVERROR_PATCHWELCOME; + } + + src = header + FRAME_HEADER_SIZE; + src_size = avpkt->size - FRAME_HEADER_SIZE; + + if (header[28] == NOT_COMPRESSED) { + frame->pict_type = AV_PICTURE_TYPE_I; + frame->key_frame = 1; + } else { + frame->pict_type = AV_PICTURE_TYPE_P; + frame->key_frame = 0; + } + + + for ( i = 0; + i < frame->height; + i++, src += linelength, src_size -= linelength + ) { + // Read line length, two byte little endian + linelength = AV_RL16(src); + src += 2; + + if (src_size < linelength) { + frame->decode_error_flags = FF_DECODE_ERROR_INVALID_BITSTREAM; + av_log(avctx, AV_LOG_WARNING, "Frame ended enexpectedly!\n"); + break; + } + if (src[linelength - 1] != EOL) { + frame->decode_error_flags = FF_DECODE_ERROR_INVALID_BITSTREAM; + av_log(avctx, AV_LOG_WARNING, "Wrong line length %d or line not terminated properly (found 0x%02x)!\n", linelength, src[linelength - 1]); + break; + } + + /* Update the data pointers. Y data is on every line. + * U and V data on every second line + */ + y = &frame->data[0][i * frame->linesize[0]]; + u = &frame->data[1][(i >> 1) * frame->linesize[1]]; + v = &frame->data[2][(i >> 1) * frame->linesize[2]]; + y_end = y + frame->linesize[0] - 1; + u_end = u + frame->linesize[1] - 1; + v_end = v + frame->linesize[2] - 1; + + if ((i & 1) && header[17] == SUBSAMPLE_420) { + /* We are on a odd line and 420 subsample is used. + * On this line only Y values are specified, one per pixel. + */ + for (j = 0; j < linelength - 1; j++) { + if (y > y_end) { + frame->decode_error_flags = FF_DECODE_ERROR_INVALID_BITSTREAM; + av_log(avctx, AV_LOG_WARNING, "Decoded data exceeded linesize!\n"); + break; + } + if ((src[j] & 1) && header[28] == COMPRESSED) { + /* It seems that odd lines are always uncompressed, but + * we do it according to specification anyways. + */ + skip = src[j] >> 1; + y += skip; + } else { + *(y++) = src[j]; + } + } + } else if (header[17] == SUBSAMPLE_420) { + /* We are on an even line and 420 subsample is used. + * On this line each pair of pixels is described by four bytes. + */ + for (j = 0; j < linelength - 4; ) { + if (y + 1 > y_end || u > u_end || v > v_end) { + frame->decode_error_flags = FF_DECODE_ERROR_INVALID_BITSTREAM; + av_log(avctx, AV_LOG_WARNING, "Decoded data exceeded linesize!\n"); + break; + } + if ((src[j] & 1) && header[28] == COMPRESSED) { + // Skip amount of pixels and move forward one byte + skip = src[j] >> 1; + y += skip; + u += skip >> 1; + v += skip >> 1; + j++; + } else { + // Set image data as specified and move forward 4 bytes + *(y++) = src[j]; + *(u++) = src[j+1]; + *(y++) = src[j+2]; + *(v++) = src[j+3]; + j += 4; + } + } + } + } + + *data_size = sizeof(AVFrame); + *(AVFrame*) data = *frame; + + return avpkt->size; +} + +static av_cold int cpia_decode_init(AVCodecContext *avctx) +{ + // output pixel format + avctx->pix_fmt = PIX_FMT_YUV420P; + + /* The default timebase set by the v4l2 demuxer leads to probing which is buggy. + * Set some reasonable time_base to skip this. + */ + if (avctx->time_base.num == 1 && avctx->time_base.den == 1000000) { + avctx->time_base.num = 1; + avctx->time_base.den = 60; + } + + return 0; +} + + +AVCodec ff_cpia_decoder = { + .name = "cpia", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_CPIA, + .priv_data_size = sizeof(CpiaContext), + .init = cpia_decode_init, + .decode = cpia_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("CPiA video format"), +}; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 867c363..4b43688 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -150,6 +150,7 @@ static struct fmt_map fmt_conversion_table[] = { { PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, { PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, { PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, + { PIX_FMT_NONE, AV_CODEC_ID_CPIA, V4L2_PIX_FMT_CPIA1 }, }; static int device_open(AVFormatContext *ctx) @@ -549,6 +550,13 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) return AVERROR(errno); } av_assert0(buf.index < s->buffers); + + /* CPIA is a compressed format and we don't know the exact number of bytes + * used by a frame, so set it here as the driver announces it. + */ + if (ctx->video_codec_id == AV_CODEC_ID_CPIA) + s->frame_size = buf.bytesused; + if (s->frame_size > 0 && buf.bytesused != s->frame_size) { av_log(ctx, AV_LOG_ERROR, "The v4l2 frame is %d bytes, but %d bytes are expected\n", @@ -767,7 +775,7 @@ static int v4l2_read_header(AVFormatContext *s1) AVStream *st; int res = 0; uint32_t desired_format; - enum AVCodecID codec_id; + enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum PixelFormat pix_fmt = PIX_FMT_NONE; st = avformat_new_stream(s1, NULL); @@ -828,6 +836,14 @@ static int v4l2_read_header(AVFormatContext *s1) desired_format = device_try_init(s1, pix_fmt, &s->width, &s->height, &codec_id); + + /* If no pixel_format was specified, the codec_id was not known up + * until now. Set video_codec_id in the context, as codec_id will + * not be available outside this function + */ + if (codec_id != AV_CODEC_ID_NONE && s1->video_codec_id == AV_CODEC_ID_NONE) + s1->video_codec_id = codec_id; + if (desired_format == 0) { av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, pix_fmt);

4 5

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
by git＠videolan.org 01 Sep '12

01 Sep '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 31 12:04:17 2012 +0200| [98298eb1034bddb4557fa689553dae793c2b0092] | committer: Michael Niedermayer Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' * commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5': x86: Fix linking with some or all of yasm, mmx, optimizations disabled configure: Add more fine-grained SSE CPU capabilities flags avfilter: x86: Use more precise compile template names x86: cosmetics: Comment some #endifs for better readability g723_1: add comfort noise generation utvideoenc: Switch to dsputils' median prediction utvideoenc: Avoid writing into the input picture avtools: remove the distinction between func_arg and func2_arg. avconv: make the -passlogfile option per-stream. avconv: make the -pass option per-stream. cmdutils: make -codecs print lossy/lossless flags. lavc: add lossy/lossless codec properties. Conflicts: Changelog cmdutils.c configure doc/APIchanges ffmpeg.h ffmpeg_opt.c ffprobe.c libavcodec/codec_desc.c libavcodec/g723_1.c libavcodec/utvideoenc.c libavcodec/version.h libavcodec/x86/mpegaudiodec.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98298eb1034bddb45… ---

3 3

Add some missing _EXTERNAL suffixes to yasm source files.
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Aug 31 15:39:03 2012 +0200| [52be5428c0fb0942dfdb5628f26bb73574564d24] | committer: Carl Eugen Hoyos Add some missing _EXTERNAL suffixes to yasm source files. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52be5428c0fb0942d… --- libavcodec/x86/ac3dsp.asm | 2 +- libavcodec/x86/h264_deblock.asm | 6 +++--- libavcodec/x86/h264_deblock_10bit.asm | 8 ++++---- libavcodec/x86/imdct36.asm | 4 ++-- libavcodec/x86/proresdsp.asm | 2 +- libavcodec/x86/v210.asm | 4 ++-- libswresample/x86/audio_convert.asm | 2 +- libswresample/x86/rematrix.asm | 2 +- libswscale/x86/input.asm | 6 +++--- libswscale/x86/output.asm | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm index 9eaf743..b085eae 100644 --- a/libavcodec/x86/ac3dsp.asm +++ b/libavcodec/x86/ac3dsp.asm @@ -68,7 +68,7 @@ cglobal ac3_exponent_min_%1, 3,4,2, exp, reuse_blks, expn, offset %define LOOP_ALIGN INIT_MMX AC3_EXPONENT_MIN mmx -%if HAVE_MMXEXT +%if HAVE_MMXEXT_EXTERNAL %define PMINUB PMINUB_MMXEXT %define LOOP_ALIGN ALIGN 16 AC3_EXPONENT_MIN mmxext diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index a4ab087..6abdba2 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -390,7 +390,7 @@ cglobal deblock_h_luma_8, 5,9 INIT_XMM sse2 DEBLOCK_LUMA -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_LUMA %endif @@ -511,7 +511,7 @@ INIT_MMX mmx2 DEBLOCK_LUMA v8, 8 INIT_XMM sse2 DEBLOCK_LUMA v, 16 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_LUMA v, 16 %endif @@ -785,7 +785,7 @@ cglobal deblock_h_luma_intra_8, 2,4 INIT_XMM sse2 DEBLOCK_LUMA_INTRA v -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_LUMA_INTRA v %endif diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm index 8a6bbb9..0517605 100644 --- a/libavcodec/x86/h264_deblock_10bit.asm +++ b/libavcodec/x86/h264_deblock_10bit.asm @@ -418,7 +418,7 @@ cglobal deblock_h_luma_10, 5,7,15 INIT_XMM sse2 DEBLOCK_LUMA_64 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_LUMA_64 %endif @@ -715,7 +715,7 @@ cglobal deblock_h_luma_intra_10, 4,7,16 INIT_XMM sse2 DEBLOCK_LUMA_INTRA_64 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_LUMA_INTRA_64 %endif @@ -802,7 +802,7 @@ DEBLOCK_LUMA_INTRA INIT_XMM sse2 DEBLOCK_LUMA DEBLOCK_LUMA_INTRA -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_LUMA DEBLOCK_LUMA_INTRA @@ -918,7 +918,7 @@ DEBLOCK_CHROMA %endif INIT_XMM sse2 DEBLOCK_CHROMA -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEBLOCK_CHROMA %endif diff --git a/libavcodec/x86/imdct36.asm b/libavcodec/x86/imdct36.asm index 63cac10..50b6902 100644 --- a/libavcodec/x86/imdct36.asm +++ b/libavcodec/x86/imdct36.asm @@ -371,7 +371,7 @@ DEFINE_IMDCT INIT_XMM ssse3 DEFINE_IMDCT -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEFINE_IMDCT %endif @@ -719,7 +719,7 @@ cglobal four_imdct36_float, 5,5,16, out, buf, in, win, tmp INIT_XMM sse DEFINE_FOUR_IMDCT -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx DEFINE_FOUR_IMDCT %endif diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm index d626fdc..41f1087 100644 --- a/libavcodec/x86/proresdsp.asm +++ b/libavcodec/x86/proresdsp.asm @@ -319,7 +319,7 @@ INIT_XMM sse2 idct_put_fn 16 INIT_XMM sse4 idct_put_fn 16 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx idct_put_fn 16 %endif diff --git a/libavcodec/x86/v210.asm b/libavcodec/x86/v210.asm index f39419e..b7b2b64 100644 --- a/libavcodec/x86/v210.asm +++ b/libavcodec/x86/v210.asm @@ -76,14 +76,14 @@ cglobal v210_planar_unpack_%1_%2, 5, 5 INIT_XMM v210_planar_unpack unaligned, ssse3 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_AVX v210_planar_unpack unaligned, avx %endif INIT_XMM v210_planar_unpack aligned, ssse3 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_AVX v210_planar_unpack aligned, avx %endif diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index fcf856f..29701a5 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -446,7 +446,7 @@ PACK_6CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT PACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT PACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx PACK_6CH float, float, u, 2, 2, NOP_N, NOP_N PACK_6CH float, float, a, 2, 2, NOP_N, NOP_N diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm index a11872f..d63545f 100644 --- a/libswresample/x86/rematrix.asm +++ b/libswresample/x86/rematrix.asm @@ -243,7 +243,7 @@ MIX1_INT16 a MIX2_INT16 u MIX2_INT16 a -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_YMM avx MIX2_FLT u MIX2_FLT a diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index c4174ee..0124c66 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -304,7 +304,7 @@ RGB24_FUNCS 10, 12 INIT_XMM ssse3 RGB24_FUNCS 11, 13 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx RGB24_FUNCS 11, 13 %endif @@ -450,7 +450,7 @@ RGB32_FUNCS 0, 0 INIT_XMM sse2 RGB32_FUNCS 8, 12 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx RGB32_FUNCS 8, 12 %endif @@ -660,7 +660,7 @@ YUYV_TO_UV_FN 3, uyvy NVXX_TO_UV_FN 5, nv12 NVXX_TO_UV_FN 5, nv21 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx ; in theory, we could write a yuy2-to-y using vpand (i.e. AVX), but ; that's not faster in practice diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 01a946f..851165a 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -267,7 +267,7 @@ yuv2planeX_fn 9, 7, 5 yuv2planeX_fn 10, 7, 5 yuv2planeX_fn 16, 8, 5 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx yuv2planeX_fn 8, 10, 7 yuv2planeX_fn 9, 7, 5 @@ -407,7 +407,7 @@ yuv2plane1_fn 16, 6, 3 INIT_XMM sse4 yuv2plane1_fn 16, 5, 3 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx yuv2plane1_fn 8, 5, 5 yuv2plane1_fn 9, 5, 3

2 1

swr/resample: update SSSE3 flag to new name
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Sep 1 01:20:54 2012 +0200| [481432653319acabe8de50d33a32f049e2e0b6ed] | committer: Michael Niedermayer swr/resample: update SSSE3 flag to new name Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=481432653319acabe… --- libswresample/resample.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 7a5c7d7..ae08d10 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -401,7 +401,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio #undef FELEM_MAX #undef FILTER_SHIFT -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE #define COMMON_CORE COMMON_CORE_INT16_SSSE3 #define RENAME(N) N ## _int16_ssse3 #define FILTER_SHIFT 15 @@ -424,7 +424,7 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud for(i=0; i<dst->ch_count; i++){ #if ARCH_X86 -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE 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

1 0

flic: use AV_LOG_ERROR for error message
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Piotr Bandurski <ami_stuff(a)o2.pl> | Fri Aug 31 20:57:42 2012 +0200| [505916265985dc245c481b095b6a375533a41ed2] | committer: Michael Niedermayer flic: use AV_LOG_ERROR for error message Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=505916265985dc245… --- libavformat/flic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/flic.c b/libavformat/flic.c index f6aa3b0..db3f5d8 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -187,7 +187,7 @@ static int flic_read_header(AVFormatContext *s) (magic_number == FLIC_FILE_MAGIC_3)) { avpriv_set_pts_info(st, 64, speed, 1000); } else { - av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n"); + av_log(s, AV_LOG_ERROR, "Invalid or unsupported magic chunk in file\n"); return AVERROR_INVALIDDATA; }

1 0

filmstripdec: add new line to error message
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Piotr Bandurski <ami_stuff(a)o2.pl> | Fri Aug 31 20:50:20 2012 +0200| [d2b927d4fc6fb4ce906d910c5e969db6244c9497] | committer: Michael Niedermayer filmstripdec: add new line to error message Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2b927d4fc6fb4ce9… --- libavformat/filmstripdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 2f3aa6c..0d02818 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -45,7 +45,7 @@ static int read_header(AVFormatContext *s) avio_seek(pb, avio_size(pb) - 36, SEEK_SET); if (avio_rb32(pb) != RAND_TAG) { - av_log(s, AV_LOG_ERROR, "magic number not found"); + av_log(s, AV_LOG_ERROR, "magic number not found\n"); return AVERROR_INVALIDDATA; }

1 0

lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 31 20:35:27 2012 +0200| [dfb4757bbe110650b903bc763f8f61c930fa70a2] | committer: Michael Niedermayer lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfb4757bbe110650b… --- libavcodec/avcodec.h | 7 +++++++ libavcodec/imgconvert.c | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dc58c8c..199dd3b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4597,8 +4597,15 @@ enum PixelFormat avcodec_find_best_pix_fmt_of_2(enum PixelFormat dst_pix_fmt1, e enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); attribute_deprecated +#if AV_HAVE_INCOMPATIBLE_FORK_ABI +enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat *pix_fmt_list, + enum PixelFormat src_pix_fmt, + int has_alpha, int *loss_ptr); +#else enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat dst_pix_fmt1, enum PixelFormat dst_pix_fmt2, enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); +#endif + enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt); diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index cbd46cd..82da64b 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -577,11 +577,19 @@ enum PixelFormat avcodec_find_best_pix_fmt_of_2(enum PixelFormat dst_pix_fmt1, e return dst_pix_fmt; } +#if AV_HAVE_INCOMPATIBLE_FORK_ABI +enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat *pix_fmt_list, + enum PixelFormat src_pix_fmt, + int has_alpha, int *loss_ptr){ + return avcodec_find_best_pix_fmt_of_list(pix_fmt_list, src_pix_fmt, has_alpha, loss_ptr); +} +#else enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat dst_pix_fmt1, enum PixelFormat dst_pix_fmt2, enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) { return avcodec_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); } +#endif enum PixelFormat avcodec_find_best_pix_fmt_of_list(enum PixelFormat *pix_fmt_list, enum PixelFormat src_pix_fmt,

1 0

configure: add switch to enable debian/libav compatible ABI
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 31 20:34:33 2012 +0200| [42e78552c8a7d977c9573e6b1d5744ed65b6fc3f] | committer: Michael Niedermayer configure: add switch to enable debian/libav compatible ABI needed for avcodec_find_best_pix_fmt2() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42e78552c8a7d977c… --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index c2b76b3..576ada7b 100755 --- a/configure +++ b/configure @@ -1114,6 +1114,7 @@ CONFIG_LIST=" gpl gray hardcoded_tables + incompatible_fork_abi libaacplus libass libbluray @@ -1248,6 +1249,7 @@ ARCH_EXT_LIST=" HAVE_LIST_PUB=' bigendian fast_unaligned + incompatible_fork_abi ' HAVE_LIST="

1 0

avfiltergraph: use avcodec_find_best_pix_fmt_of_2()
by git＠videolan.org 31 Aug '12

31 Aug '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 31 20:18:43 2012 +0200| [7b607eb5e71f4ee18e6b311117a977e843b3f7fe] | committer: Michael Niedermayer avfiltergraph: use avcodec_find_best_pix_fmt_of_2() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b607eb5e71f4ee18… --- libavfilter/avfiltergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 7ab1124..f98e0e4 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -26,7 +26,7 @@ #include "libavutil/audioconvert.h" #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" -#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt2() +#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() #include "avfilter.h" #include "avfiltergraph.h" #include "formats.h" @@ -429,7 +429,7 @@ static int pick_format(AVFilterLink *link, AVFilterLink *ref) int i; for (i=0; i<link->in_formats->format_count; i++) { enum PixelFormat p = link->in_formats->formats[i]; - best= avcodec_find_best_pix_fmt2(best, p, ref->format, has_alpha, NULL); + best= avcodec_find_best_pix_fmt_of_2(best, p, ref->format, has_alpha, NULL); } av_log(link->src,AV_LOG_DEBUG, "picking %s out of %d ref:%s alpha:%d\n", av_get_pix_fmt_name(best), link->in_formats->format_count,

1 0