mirror of https://github.com/FFmpeg/FFmpeg.git
Currently, SVQ1EncContext is defined in a header that is also included by the arch-specific code that initializes the one and only dsp function that this encoder uses directly. But the arch-specific functions to set this dsp function do not need anything from SVQ1EncContext. This commit therefore adds a small SVQ1EncDSPContext whose only member is said function pointer and renames svq1enc.h to svq1encdsp.h to avoid exposing unnecessary internals to these init functions (and the whole mpegvideo with it). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>pull/388/head
Andreas Rheinhardt
2 years ago
parent
42bde73b20
commit
e84348a8ab
5 changed files with 93 additions and 95 deletions
@ -1,86 +0,0 @@ |
||||
/*
|
||||
* SVQ1 encoder |
||||
* |
||||
* 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_SVQ1ENC_H |
||||
#define AVCODEC_SVQ1ENC_H |
||||
|
||||
#include <stdint.h> |
||||
|
||||
#include "libavutil/frame.h" |
||||
#include "libavutil/mem_internal.h" |
||||
|
||||
#include "avcodec.h" |
||||
#include "hpeldsp.h" |
||||
#include "me_cmp.h" |
||||
#include "mpegvideo.h" |
||||
#include "put_bits.h" |
||||
|
||||
typedef struct SVQ1EncContext { |
||||
/* FIXME: Needed for motion estimation, should not be used for anything
|
||||
* else, the idea is to make the motion estimation eventually independent |
||||
* of MpegEncContext, so this will be removed then. */ |
||||
MpegEncContext m; |
||||
AVCodecContext *avctx; |
||||
MECmpContext mecc; |
||||
HpelDSPContext hdsp; |
||||
AVFrame *current_picture; |
||||
AVFrame *last_picture; |
||||
PutBitContext pb; |
||||
|
||||
/* Some compression statistics */ |
||||
enum AVPictureType pict_type; |
||||
int quality; |
||||
|
||||
/* why ooh why this sick breadth first order,
|
||||
* everything is slower and more complex */ |
||||
PutBitContext reorder_pb[6]; |
||||
|
||||
int frame_width; |
||||
int frame_height; |
||||
|
||||
/* Y plane block dimensions */ |
||||
int y_block_width; |
||||
int y_block_height; |
||||
|
||||
/* U & V plane (C planes) block dimensions */ |
||||
int c_block_width; |
||||
int c_block_height; |
||||
|
||||
DECLARE_ALIGNED(16, int16_t, encoded_block_levels)[6][7][256]; |
||||
|
||||
uint16_t *mb_type; |
||||
uint32_t *dummy; |
||||
int16_t (*motion_val8[3])[2]; |
||||
int16_t (*motion_val16[3])[2]; |
||||
|
||||
int64_t rd_total; |
||||
|
||||
uint8_t *scratchbuf; |
||||
|
||||
int motion_est; |
||||
|
||||
int (*ssd_int8_vs_int16)(const int8_t *pix1, const int16_t *pix2, |
||||
intptr_t size); |
||||
} SVQ1EncContext; |
||||
|
||||
void ff_svq1enc_init_ppc(SVQ1EncContext *c); |
||||
void ff_svq1enc_init_x86(SVQ1EncContext *c); |
||||
|
||||
#endif /* AVCODEC_SVQ1ENC_H */ |
||||
@ -0,0 +1,34 @@ |
||||
/*
|
||||
* SVQ1 encoder DSP |
||||
* |
||||
* 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_SVQ1ENCDSP_H |
||||
#define AVCODEC_SVQ1ENCDSP_H |
||||
|
||||
#include <stdint.h> |
||||
|
||||
typedef struct SVQ1EncDSPContext { |
||||
int (*ssd_int8_vs_int16)(const int8_t *pix1, const int16_t *pix2, |
||||
intptr_t size); |
||||
} SVQ1EncDSPContext; |
||||
|
||||
void ff_svq1enc_init_ppc(SVQ1EncDSPContext *c); |
||||
void ff_svq1enc_init_x86(SVQ1EncDSPContext *c); |
||||
|
||||
#endif /* AVCODEC_SVQ1ENCDSP_H */ |
||||
Loading…
Reference in new issue