openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 05:00:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  dsputil: Move fdct function declarations to dct.h

Conflicts:
	libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-09 14:42:06 +01:00
commit 5cfc0ae825
13 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dct-test.c
View File

@ -39,7 +39,7 @@
#include "libavutil/lfg.h"
#include "libavutil/time.h"
#include "dsputil.h"
#include "dct.h"
#include "simple_idct.h"
#include "aandcttab.h"
#include "faandct.h"

18
libavcodec/dct.h
View File

@ -24,6 +24,8 @@
#ifndef AVCODEC_DCT_H
#define AVCODEC_DCT_H
#include <stdint.h>
#include "rdft.h"
struct DCTContext {
@ -49,4 +51,20 @@ void ff_dct_end (DCTContext *s);
void ff_dct_init_x86(DCTContext *s);
void ff_fdct_ifast(int16_t *data);
void ff_fdct_ifast248(int16_t *data);
void ff_jpeg_fdct_islow_8(int16_t *data);
void ff_jpeg_fdct_islow_10(int16_t *data);
void ff_fdct248_islow_8(int16_t *data);
void ff_fdct248_islow_10(int16_t *data);
void ff_j_rev_dct(int16_t *data);
void ff_j_rev_dct4(int16_t *data);
void ff_j_rev_dct2(int16_t *data);
void ff_j_rev_dct1(int16_t *data);
void ff_fdct_mmx(int16_t *block);
void ff_fdct_mmxext(int16_t *block);
void ff_fdct_sse2(int16_t *block);
#endif /* AVCODEC_DCT_H */

1
libavcodec/dsputil.c
View File

@ -31,6 +31,7 @@
#include "libavutil/internal.h"
#include "avcodec.h"
#include "copy_block.h"
#include "dct.h"
#include "dsputil.h"
#include "simple_idct.h"
#include "faandct.h"

17
libavcodec/dsputil.h
View File

@ -35,23 +35,6 @@
//#define DEBUG
/* dct code */
void ff_fdct_ifast(int16_t *data);
void ff_fdct_ifast248(int16_t *data);
void ff_jpeg_fdct_islow_8(int16_t *data);
void ff_jpeg_fdct_islow_10(int16_t *data);
void ff_fdct248_islow_8(int16_t *data);
void ff_fdct248_islow_10(int16_t *data);
void ff_j_rev_dct(int16_t *data);
void ff_j_rev_dct4(int16_t *data);
void ff_j_rev_dct2(int16_t *data);
void ff_j_rev_dct1(int16_t *data);
void ff_fdct_mmx(int16_t *block);
void ff_fdct_mmxext(int16_t *block);
void ff_fdct_sse2(int16_t *block);
/* encoding scans */
extern const uint8_t ff_alternate_horizontal_scan[64];

2
libavcodec/jfdctfst.c
View File

@ -69,7 +69,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "libavutil/common.h"
#include "dsputil.h"
#include "dct.h"
#define DCTSIZE 8
#define GLOBAL(x) x

2
libavcodec/jfdctint_template.c
View File

@ -60,7 +60,7 @@
*/
#include "libavutil/common.h"
#include "dsputil.h"
#include "dct.h"
#include "bit_depth_template.c"

2
libavcodec/jrevdct.c
View File

@ -63,7 +63,7 @@
*/
#include "libavutil/common.h"
#include "dsputil.h"
#include "dct.h"
#define EIGHT_BIT_SAMPLES

1
libavcodec/mpegvideo_enc.c
View File

@ -33,6 +33,7 @@
#include "libavutil/pixdesc.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "dct.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "h263.h"

1
libavcodec/proresdsp.c
View File

@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dct.h"
#include "dsputil.h"
#include "proresdsp.h"
#include "simple_idct.h"

1
libavcodec/proresenc_anatoliy.c
View File

@ -27,6 +27,7 @@
*/
#include "avcodec.h"
#include "dct.h"
#include "internal.h"
#include "put_bits.h"
#include "bytestream.h"

1
libavcodec/x86/dsputilenc_mmx.c
View File

@ -26,6 +26,7 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/dct.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "libavcodec/mathops.h"

2
libavcodec/x86/fdct.c
View File

@ -32,7 +32,7 @@
#include "libavutil/common.h"
#include "libavutil/x86/asm.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/dct.h"
#if HAVE_INLINE_ASM

2
libavcodec/x86/mpegvideoenc.c
View File

@ -24,7 +24,7 @@
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/dct.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"