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

lavc/libxavs2.c: use more descriptive variable names in xavs2_copy_frame* functions 

Signed-off-by: hwren <hwrenx@126.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
hwren 2019-12-03 10:41:22 +08:00 committed by Michael Niedermayer
parent 0485033ae1
commit 3003917a8f
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/libxavs2.c
View File

@ -132,16 +132,15 @@ static av_cold int xavs2_init(AVCodecContext *avctx)
static void xavs2_copy_frame_with_shift(xavs2_picture_t *pic, const AVFrame *frame, const int shift_in) static void xavs2_copy_frame_with_shift(xavs2_picture_t *pic, const AVFrame *frame, const int shift_in)
{ {
int j, k; int plane, hIdx, wIdx;
for (k = 0; k < 3; k++) { for (plane = 0; plane < 3; plane++) {
int i_stride = pic->img.i_stride[k]; int i_stride = pic->img.i_stride[plane];
for (j = 0; j < pic->img.i_lines[k]; j++) { for (hIdx = 0; hIdx < pic->img.i_lines[plane]; hIdx++) {
uint16_t *p_plane = (uint16_t *)&pic->img.img_planes[k][j * i_stride]; uint16_t *p_plane = (uint16_t *)&pic->img.img_planes[plane][hIdx * i_stride];
int i; uint8_t *p_buffer = frame->data[plane] + frame->linesize[plane] * hIdx;
uint8_t *p_buffer = frame->data[k] + frame->linesize[k] * j;
memset(p_plane, 0, i_stride); memset(p_plane, 0, i_stride);
for (i = 0; i < pic->img.i_width[k]; i++) { for (wIdx = 0; wIdx < pic->img.i_width[plane]; wIdx++) {
p_plane[i] = p_buffer[i] << shift_in; p_plane[wIdx] = p_buffer[wIdx] << shift_in;
} }
} }
} }
@ -149,12 +148,12 @@ static void xavs2_copy_frame_with_shift(xavs2_picture_t *pic, const AVFrame *fra
static void xavs2_copy_frame(xavs2_picture_t *pic, const AVFrame *frame) static void xavs2_copy_frame(xavs2_picture_t *pic, const AVFrame *frame)
{ {
int j, k; int plane, hIdx;
for (k = 0; k < 3; k++) { for (plane = 0; plane < 3; plane++) {
for (j = 0; j < pic->img.i_lines[k]; j++) { for (hIdx = 0; hIdx < pic->img.i_lines[plane]; hIdx++) {
memcpy( pic->img.img_planes[k] + pic->img.i_stride[k] * j, memcpy( pic->img.img_planes[plane] + pic->img.i_stride[plane] * hIdx,
frame->data[k]+frame->linesize[k] * j, frame->data[plane]+frame->linesize[plane] * hIdx,
pic->img.i_width[k] * pic->img.in_sample_size); pic->img.i_width[plane] * pic->img.in_sample_size);
} }
} }
} }