* qatar/master: (21 commits) utils: Check for extradata size overflows. ARM: rv34: fix asm syntax in dc transform functions avio: Fix the value of the deprecated URL_FLAG_NONBLOCK rv34: fix and optimise frame dependency checking rv34: NEON optimised dc only inverse transform avprobe: use avio_size() instead of deprecated AVFormatContext.file_size. ffmenc: remove references to deprecated AVFormatContext.timestamp. lavf: undeprecate read_seek(). avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY. lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I lavc: ifdef out parse_only AVOption nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT mpegvideo_enc: ifdef out/replace references to deprecated codec flags. riff: remove references to sonic codec ids indeo4: add some missing static and const qualifiers rv34: DC-only inverse transform avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields lavfi: move version macros to a new installed header version.h vsrc_buffer: release the buffer on uninit. rgb2rgb: rgb12tobgr12() ... Conflicts: avconv.c doc/APIchanges ffprobe.c libavfilter/Makefile libavfilter/avfilter.h libswscale/rgb2rgb.c libswscale/rgb2rgb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/3/head
Michael Niedermayer
14 years ago
commit
b18e17eabf
30 changed files with 364 additions and 149 deletions
@ -0,0 +1,55 @@ |
|||||||
|
;****************************************************************************** |
||||||
|
;* MMX/SSE2-optimized functions for the RV30 and RV40 decoders |
||||||
|
;* Copyright (C) 2012 Christophe Gisquet <christophe.gisquet@gmail.com> |
||||||
|
;* |
||||||
|
;* This file is part of Libav. |
||||||
|
;* |
||||||
|
;* Libav 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. |
||||||
|
;* |
||||||
|
;* Libav 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 Libav; if not, write to the Free Software |
||||||
|
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||||
|
;****************************************************************************** |
||||||
|
|
||||||
|
%include "x86inc.asm" |
||||||
|
%include "x86util.asm" |
||||||
|
|
||||||
|
SECTION .text |
||||||
|
|
||||||
|
%macro IDCT_DC_NOROUND 1 |
||||||
|
imul %1, 13*13*3 |
||||||
|
sar %1, 11 |
||||||
|
%endmacro |
||||||
|
|
||||||
|
%macro IDCT_DC_ROUND 1 |
||||||
|
imul %1, 13*13 |
||||||
|
add %1, 0x200 |
||||||
|
sar %1, 10 |
||||||
|
%endmacro |
||||||
|
|
||||||
|
%macro rv34_idct_dequant4x4_dc 1 |
||||||
|
cglobal rv34_idct_dequant4x4_%1_mmx2, 1, 2, 0 |
||||||
|
movsx r1, word [r0] |
||||||
|
IDCT_DC r1 |
||||||
|
movd mm0, r1 |
||||||
|
pshufw mm0, mm0, 0 |
||||||
|
movq [r0+ 0], mm0 |
||||||
|
movq [r0+16], mm0 |
||||||
|
movq [r0+32], mm0 |
||||||
|
movq [r0+48], mm0 |
||||||
|
REP_RET |
||||||
|
%endmacro |
||||||
|
|
||||||
|
INIT_MMX |
||||||
|
%define IDCT_DC IDCT_DC_ROUND |
||||||
|
rv34_idct_dequant4x4_dc dc |
||||||
|
%define IDCT_DC IDCT_DC_NOROUND |
||||||
|
rv34_idct_dequant4x4_dc dc_noround |
||||||
@ -0,0 +1,40 @@ |
|||||||
|
/*
|
||||||
|
* RV30/40 MMX/SSE2 optimizations |
||||||
|
* Copyright (C) 2012 Christophe Gisquet <christophe.gisquet@gmail.com> |
||||||
|
* |
||||||
|
* This file is part of Libav. |
||||||
|
* |
||||||
|
* Libav 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. |
||||||
|
* |
||||||
|
* Libav 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 Libav; if not, write to the Free Software |
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "libavutil/cpu.h" |
||||||
|
#include "libavutil/x86_cpu.h" |
||||||
|
#include "libavcodec/dsputil.h" |
||||||
|
#include "libavcodec/rv34dsp.h" |
||||||
|
|
||||||
|
void ff_rv34_idct_dequant4x4_dc_mmx2(DCTELEM *block); |
||||||
|
void ff_rv34_idct_dequant4x4_dc_noround_mmx2(DCTELEM *block); |
||||||
|
|
||||||
|
av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) |
||||||
|
{ |
||||||
|
#if HAVE_YASM |
||||||
|
int mm_flags = av_get_cpu_flags(); |
||||||
|
|
||||||
|
if (mm_flags & AV_CPU_FLAG_MMX2) { |
||||||
|
c->rv34_inv_transform_dc_tab[0] = ff_rv34_idct_dequant4x4_dc_mmx2; |
||||||
|
c->rv34_inv_transform_dc_tab[1] = ff_rv34_idct_dequant4x4_dc_noround_mmx2; |
||||||
|
} |
||||||
|
#endif |
||||||
|
} |
||||||
@ -0,0 +1,43 @@ |
|||||||
|
/*
|
||||||
|
* Version macros. |
||||||
|
* |
||||||
|
* This file is part of Libav. |
||||||
|
* |
||||||
|
* Libav 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. |
||||||
|
* |
||||||
|
* Libav 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 Libav; if not, write to the Free Software |
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef AVFILTER_VERSION_H |
||||||
|
#define AVFILTER_VERSION_H |
||||||
|
|
||||||
|
/**
|
||||||
|
* @file |
||||||
|
* Libavfilter version macros |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "libavutil/avutil.h" |
||||||
|
|
||||||
|
#define LIBAVFILTER_VERSION_MAJOR 2 |
||||||
|
#define LIBAVFILTER_VERSION_MINOR 59 |
||||||
|
#define LIBAVFILTER_VERSION_MICRO 100 |
||||||
|
|
||||||
|
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
||||||
|
LIBAVFILTER_VERSION_MINOR, \
|
||||||
|
LIBAVFILTER_VERSION_MICRO) |
||||||
|
#define LIBAVFILTER_VERSION AV_VERSION(LIBAVFILTER_VERSION_MAJOR, \ |
||||||
|
LIBAVFILTER_VERSION_MINOR, \
|
||||||
|
LIBAVFILTER_VERSION_MICRO) |
||||||
|
#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT |
||||||
|
|
||||||
|
#endif // AVFILTER_VERSION_H
|
||||||
Loading…
Reference in new issue