* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/2/head
Michael Niedermayer
14 years ago
commit
0cb233cf46
61 changed files with 6208 additions and 410 deletions
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,50 @@ |
||||
/*
|
||||
* RV30/40 decoder motion compensation functions |
||||
* Copyright (c) 2008 Konstantin Shishkov |
||||
* |
||||
* 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 |
||||
*/ |
||||
|
||||
/**
|
||||
* @file |
||||
* RV30/40 decoder motion compensation functions |
||||
*/ |
||||
|
||||
#ifndef AVCODEC_RV34DSP_H |
||||
#define AVCODEC_RV34DSP_H |
||||
|
||||
#include "dsputil.h" |
||||
|
||||
typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/, |
||||
uint8_t *src1/*align width (8 or 16)*/, |
||||
uint8_t *src2/*align width (8 or 16)*/, |
||||
int w1, int w2, int stride); |
||||
|
||||
typedef struct RV34DSPContext { |
||||
qpel_mc_func put_pixels_tab[4][16]; |
||||
qpel_mc_func avg_pixels_tab[4][16]; |
||||
h264_chroma_mc_func put_chroma_pixels_tab[3]; |
||||
h264_chroma_mc_func avg_chroma_pixels_tab[3]; |
||||
rv40_weight_func rv40_weight_pixels_tab[2]; |
||||
} RV34DSPContext; |
||||
|
||||
void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp); |
||||
void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp); |
||||
|
||||
void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp); |
||||
|
||||
#endif /* AVCODEC_RV34DSP_H */ |
||||
@ -0,0 +1,60 @@ |
||||
/*
|
||||
* RV40 decoder motion compensation functions x86-optimised |
||||
* Copyright (c) 2008 Konstantin Shishkov |
||||
* |
||||
* 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 |
||||
*/ |
||||
|
||||
/**
|
||||
* @file |
||||
* RV40 decoder motion compensation functions x86-optimised |
||||
*/ |
||||
|
||||
#include "libavcodec/rv34dsp.h" |
||||
|
||||
void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, |
||||
int stride, int h, int x, int y); |
||||
void ff_avg_rv40_chroma_mc8_mmx2 (uint8_t *dst, uint8_t *src, |
||||
int stride, int h, int x, int y); |
||||
void ff_avg_rv40_chroma_mc8_3dnow(uint8_t *dst, uint8_t *src, |
||||
int stride, int h, int x, int y); |
||||
|
||||
void ff_put_rv40_chroma_mc4_mmx (uint8_t *dst, uint8_t *src, |
||||
int stride, int h, int x, int y); |
||||
void ff_avg_rv40_chroma_mc4_mmx2 (uint8_t *dst, uint8_t *src, |
||||
int stride, int h, int x, int y); |
||||
void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src, |
||||
int stride, int h, int x, int y); |
||||
|
||||
void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) |
||||
{ |
||||
av_unused int mm_flags = av_get_cpu_flags(); |
||||
|
||||
#if HAVE_YASM |
||||
if (mm_flags & AV_CPU_FLAG_MMX) { |
||||
c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; |
||||
c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; |
||||
} |
||||
if (mm_flags & AV_CPU_FLAG_MMX2) { |
||||
c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_mmx2; |
||||
c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_mmx2; |
||||
} else if (mm_flags & AV_CPU_FLAG_3DNOW) { |
||||
c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow; |
||||
c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow; |
||||
} |
||||
#endif |
||||
} |
||||
Loading…
Reference in new issue