generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'

Browse Source 
* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
  simple_idct: Move x86-specific declarations to a header in the x86 directory

Conflicts:
	libavcodec/x86/simple_idct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-19 13:56:08 +02:00
commit 776647360d
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/dct-test.c
View File

@ -47,6 +47,7 @@
#include "faanidct.h"
#include "x86/fdct.h"
#include "x86/idct_xvid.h"
#include "x86/simple_idct.h"
#include "dctref.h"
// ALTIVEC

4
libavcodec/simple_idct.h
View File

@ -49,10 +49,6 @@ void ff_simple_idct_12(int16_t *block);
*/
void ff_prores_idct(int16_t *block, const int16_t *qmat);
void ff_simple_idct_mmx(int16_t *block);
void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block);
void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block);

2
libavcodec/x86/idctdsp_init.c
View File

@ -22,9 +22,9 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/idctdsp.h"
#include "libavcodec/simple_idct.h"
#include "idct_xvid.h"
#include "idctdsp.h"
#include "simple_idct.h"
/* Input permutation for the simple_idct_mmx */
static const uint8_t simple_mmx_permutation[64] = {

3
libavcodec/x86/simple_idct.c
View File

@ -19,10 +19,11 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavcodec/simple_idct.h"
#include "libavutil/mem.h"
#include "libavutil/x86/asm.h"
#include "idctdsp.h"
#include "simple_idct.h"
#if HAVE_INLINE_ASM

28
libavcodec/x86/simple_idct.h Normal file
View File

@ -0,0 +1,28 @@
/*
* 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
*/
#ifndef AVCODEC_X86_SIMPLE_IDCT_H
#define AVCODEC_X86_SIMPLE_IDCT_H
#include <stdint.h>
void ff_simple_idct_mmx(int16_t *block);
void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
#endif /* AVCODEC_X86_SIMPLE_IDCT_H */