virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

hevcdsp: remove compilation-time-fixed parameter from sao_edge_filter

Browse Source 
The stride_src parameter is always 2 * MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2015-02-04 20:19:36 -03:00
parent e09ad5bd0d
commit 1f1c7c8a57
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/hevc_filter.c
View File

@@ -427,9 +427,8 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y)
copy_CTB_to_hv(s, src, stride_src, x0, y0, width, height, c_idx, copy_CTB_to_hv(s, src, stride_src, x0, y0, width, height, c_idx,
x_ctb, y_ctb); x_ctb, y_ctb);
s->hevcdsp.sao_edge_filter(src, dst, stride_src, stride_dst, s->hevcdsp.sao_edge_filter(src, dst, stride_src, sao->offset_val[c_idx],
sao->offset_val[c_idx], sao->eo_class[c_idx], sao->eo_class[c_idx], width, height);
width, height);
s->hevcdsp.sao_edge_restore[restore](src, dst, s->hevcdsp.sao_edge_restore[restore](src, dst,
stride_src, stride_dst, stride_src, stride_dst,
sao, sao,

6
libavcodec/hevcdsp.h
View File

@@ -61,9 +61,9 @@ typedef struct HEVCDSPContext {
void (*sao_band_filter[5])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride_dst, ptrdiff_t _stride_src, void (*sao_band_filter[5])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride_dst, ptrdiff_t _stride_src,
int16_t *sao_offset_val, int sao_left_class, int width, int height); int16_t *sao_offset_val, int sao_left_class, int width, int height);
void (*sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, /* implicit stride_src parameter has value of 2 * MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE */
ptrdiff_t stride_src, int16_t *sao_offset_val, int sao_eo_class, void (*sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, int16_t *sao_offset_val,
int width, int height); int sao_eo_class, int width, int height);
void (*sao_edge_restore[2])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride_dst, ptrdiff_t _stride_src, void (*sao_edge_restore[2])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride_dst, ptrdiff_t _stride_src,
struct SAOParams *sao, int *borders, int _width, int _height, int c_idx, struct SAOParams *sao, int *borders, int _width, int _height, int c_idx,

5
libavcodec/hevcdsp_template.c
View File

@@ -327,8 +327,7 @@ static void FUNC(sao_band_filter_0)(uint8_t *_dst, uint8_t *_src,
#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1)) #define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src, static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, int16_t *sao_offset_val,
ptrdiff_t stride_dst, ptrdiff_t stride_src, int16_t *sao_offset_val,
int eo, int width, int height) { int eo, int width, int height) {
static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 }; static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
@@ -342,7 +341,7 @@ static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src,
pixel *src = (pixel *)_src; pixel *src = (pixel *)_src;
int a_stride, b_stride; int a_stride, b_stride;
int x, y; int x, y;
stride_src /= sizeof(pixel); ptrdiff_t stride_src = (2*MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) / sizeof(pixel);
stride_dst /= sizeof(pixel); stride_dst /= sizeof(pixel);
a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src; a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src;