mirror of https://git.ffmpeg.org/ffmpeg.git
rename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16
This makes the naming more consistent with the 8bit variant Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
40a4ab8ba4
commit
550ae6c02f
|
@ -768,7 +768,7 @@ static void add_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *s
|
||||||
if (s->bps <= 8) {
|
if (s->bps <= 8) {
|
||||||
s->hdsp.add_hfyu_median_pred(dst, src, diff, w, left, left_top);
|
s->hdsp.add_hfyu_median_pred(dst, src, diff, w, left, left_top);
|
||||||
} else {
|
} else {
|
||||||
s->llviddsp.add_hfyu_median_prediction_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top);
|
s->llviddsp.add_hfyu_median_pred_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
||||||
|
|
|
@ -60,7 +60,7 @@ static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *sr
|
||||||
dst[i] = (src1[i] - src2[i]) & mask;
|
dst[i] = (src1[i] - src2[i]) & mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void add_hfyu_median_prediction_int16_c(uint16_t *dst, const uint16_t *src, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top){
|
static void add_hfyu_median_pred_int16_c(uint16_t *dst, const uint16_t *src, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top){
|
||||||
int i;
|
int i;
|
||||||
uint16_t l, lt;
|
uint16_t l, lt;
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ void ff_llviddsp_init(LLVidDSPContext *c, AVCodecContext *avctx)
|
||||||
c->add_int16 = add_int16_c;
|
c->add_int16 = add_int16_c;
|
||||||
c->diff_int16= diff_int16_c;
|
c->diff_int16= diff_int16_c;
|
||||||
c->add_hfyu_left_prediction_int16 = add_hfyu_left_prediction_int16_c;
|
c->add_hfyu_left_prediction_int16 = add_hfyu_left_prediction_int16_c;
|
||||||
c->add_hfyu_median_prediction_int16 = add_hfyu_median_prediction_int16_c;
|
c->add_hfyu_median_pred_int16 = add_hfyu_median_pred_int16_c;
|
||||||
c->sub_hfyu_median_pred_int16 = sub_hfyu_median_pred_int16_c;
|
c->sub_hfyu_median_pred_int16 = sub_hfyu_median_pred_int16_c;
|
||||||
|
|
||||||
if (ARCH_X86)
|
if (ARCH_X86)
|
||||||
|
|
|
@ -30,7 +30,7 @@ typedef struct LLVidDSPContext {
|
||||||
void (*diff_int16)(uint16_t *dst/*align 16*/, const uint16_t *src1/*align 16*/, const uint16_t *src2/*align 1*/, unsigned mask, int w);
|
void (*diff_int16)(uint16_t *dst/*align 16*/, const uint16_t *src1/*align 16*/, const uint16_t *src2/*align 1*/, unsigned mask, int w);
|
||||||
|
|
||||||
void (*sub_hfyu_median_pred_int16)(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
|
void (*sub_hfyu_median_pred_int16)(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
|
||||||
void (*add_hfyu_median_prediction_int16)(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
|
void (*add_hfyu_median_pred_int16)(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
|
||||||
int (*add_hfyu_left_prediction_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned left);
|
int (*add_hfyu_left_prediction_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned left);
|
||||||
} LLVidDSPContext;
|
} LLVidDSPContext;
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,7 @@ cglobal add_hfyu_left_prediction_int16, 4,4,8, dst, src, mask, w, left
|
||||||
|
|
||||||
; void add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int mask, int w, int *left, int *left_top)
|
; void add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int mask, int w, int *left, int *left_top)
|
||||||
INIT_MMX mmxext
|
INIT_MMX mmxext
|
||||||
cglobal add_hfyu_median_prediction_int16, 7,7,0, dst, top, diff, mask, w, left, left_top
|
cglobal add_hfyu_median_pred_int16, 7,7,0, dst, top, diff, mask, w, left, left_top
|
||||||
add wd, wd
|
add wd, wd
|
||||||
movd mm6, maskd
|
movd mm6, maskd
|
||||||
SPLATW mm6, mm6
|
SPLATW mm6, mm6
|
||||||
|
|
|
@ -28,7 +28,7 @@ void ff_diff_int16_mmx (uint16_t *dst, const uint16_t *src1, const uint16_t *src
|
||||||
void ff_diff_int16_sse2(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w);
|
void ff_diff_int16_sse2(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w);
|
||||||
int ff_add_hfyu_left_prediction_int16_ssse3(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc);
|
int ff_add_hfyu_left_prediction_int16_ssse3(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc);
|
||||||
int ff_add_hfyu_left_prediction_int16_sse4(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc);
|
int ff_add_hfyu_left_prediction_int16_sse4(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc);
|
||||||
void ff_add_hfyu_median_prediction_int16_mmxext(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
|
void ff_add_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
|
||||||
void ff_sub_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
|
void ff_sub_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
|
||||||
|
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ void ff_llviddsp_init_x86(LLVidDSPContext *c, AVCodecContext *avctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc->comp[0].depth_minus1<15) {
|
if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc->comp[0].depth_minus1<15) {
|
||||||
c->add_hfyu_median_prediction_int16 = ff_add_hfyu_median_prediction_int16_mmxext;
|
c->add_hfyu_median_pred_int16 = ff_add_hfyu_median_pred_int16_mmxext;
|
||||||
c->sub_hfyu_median_pred_int16 = ff_sub_hfyu_median_pred_int16_mmxext;
|
c->sub_hfyu_median_pred_int16 = ff_sub_hfyu_median_pred_int16_mmxext;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue