RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/proresenc_aw : merge funcs subimage_with_fill and subimage_alpha_with_fill

This commit is contained in:
Martin Vignali 2019-02-09 18:25:31 +01:00
parent 8a4a952e45
commit e7cbbb7374
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libavcodec/proresenc_anatoliy.c
View File

@ -468,11 +468,10 @@ static av_always_inline int encode_alpha_slice_data(AVCodecContext *avctx, int8_
}
}
static void subimage_with_fill(uint16_t *src, unsigned x, unsigned y,
unsigned stride, unsigned width, unsigned height, uint16_t *dst,
unsigned dst_width, unsigned dst_height)
static inline void subimage_with_fill_template(uint16_t *src, unsigned x, unsigned y,
unsigned stride, unsigned width, unsigned height, uint16_t *dst,
unsigned dst_width, unsigned dst_height, int is_alpha_plane)
{
int box_width = FFMIN(width - x, dst_width);
int box_height = FFMIN(height - y, dst_height);
int i, j, src_stride = stride >> 1;
@ -481,9 +480,17 @@ static void subimage_with_fill(uint16_t *src, unsigned x, unsigned y,
src += y * src_stride + x;
for (i = 0; i < box_height; ++i) {
for (j = 0; j < box_width; ++j) {
dst[j] = src[j];
if (!is_alpha_plane) {
dst[j] = src[j];
} else {
dst[j] = src[j] << 6; /* alpha 10b to 16b */
}
}
if (!is_alpha_plane) {
last_pix = dst[j - 1];
} else {
last_pix = dst[j - 1] << 6; /* alpha 10b to 16b */
}
last_pix = dst[j - 1];
for (; j < dst_width; j++)
dst[j] = last_pix;
src += src_stride;
@ -498,34 +505,19 @@ static void subimage_with_fill(uint16_t *src, unsigned x, unsigned y,
}
}
static void subimage_with_fill(uint16_t *src, unsigned x, unsigned y,
unsigned stride, unsigned width, unsigned height, uint16_t *dst,
unsigned dst_width, unsigned dst_height)
{
subimage_with_fill_template(src, x, y, stride, width, height, dst, dst_width, dst_height, 0);
}
/* reorganize alpha data and convert 10b -> 16b */
static void subimage_alpha_with_fill(uint16_t *src, unsigned x, unsigned y,
unsigned stride, unsigned width, unsigned height, uint16_t *dst,
unsigned dst_width, unsigned dst_height)
{
int box_width = FFMIN(width - x, dst_width);
int box_height = FFMIN(height - y, dst_height);
int i, j, src_stride = stride >> 1;
uint16_t last_pix, *last_line;
src += y * src_stride + x;
for (i = 0; i < box_height; ++i) {
for (j = 0; j < box_width; ++j) {
dst[j] = src[j] << 6; /* 10b to 16b */
}
last_pix = dst[j - 1] << 6; /* 10b to 16b */
for (; j < dst_width; j++)
dst[j] = last_pix;
src += src_stride;
dst += dst_width;
}
last_line = dst - dst_width;
for (; i < dst_height; i++) {
for (j = 0; j < dst_width; ++j) {
dst[j] = last_line[j];
}
dst += dst_width;
}
subimage_with_fill_template(src, x, y, stride, width, height, dst, dst_width, dst_height, 1);
}
static int encode_slice(AVCodecContext *avctx, const AVFrame *pic, int mb_x,