blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Fix T47724: VSE crops video if horizontal resolution isn't divisible by 8 

In fact, some areas in FFmpeg might require alignment up to 32, so now we
make temporary conversion in an aligned frame. We only do this if width is
not aligned to 32.
This commit is contained in:
Sergey Sharybin 2016-03-15 13:19:49 +05:00
parent 9ddd83cec2
commit 7ab2e73494
Notes: blender-bot 2023-02-14 08:07:46 +01:00 
Referenced by issue #47806, Blender animation player stop working correctly with XVID codec
Referenced by issue #47724, VSE crops video if horizontal resolution isn't divisible by 8
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/imbuf/intern/anim_movie.c
View File

@ -560,6 +560,23 @@ static int startffmpeg(struct anim *anim)
anim->pFrameDeinterlaced = av_frame_alloc();
anim->pFrameRGB = av_frame_alloc();
if ((anim->x & 31) != 0) {
anim->pFrameRGB->format = AV_PIX_FMT_RGBA;
anim->pFrameRGB->width = anim->x;
anim->pFrameRGB->height = anim->y;
if (av_frame_get_buffer(anim->pFrameRGB, 32) < 0) {
fprintf(stderr, "Could not allocate frame data.\n");
avcodec_close(anim->pCodecCtx);
avformat_close_input(&anim->pFormatCtx);
av_free(anim->pFrameRGB);
av_free(anim->pFrameDeinterlaced);
av_free(anim->pFrame);
anim->pCodecCtx = NULL;
return -1;
}
}
if (avpicture_get_size(AV_PIX_FMT_RGBA, anim->x, anim->y) !=
anim->x * anim->y * 4)
{
@ -685,10 +702,12 @@ static void ffmpeg_postprocess(struct anim *anim)
input = anim->pFrameDeinterlaced;
}
}
avpicture_fill((AVPicture *) anim->pFrameRGB,
(unsigned char *) ibuf->rect,
AV_PIX_FMT_RGBA, anim->x, anim->y);
if ((anim->x & 31) == 0) {
avpicture_fill((AVPicture *) anim->pFrameRGB,
(unsigned char *) ibuf->rect,
AV_PIX_FMT_RGBA, anim->x, anim->y);
}
if (ENDIAN_ORDER == B_ENDIAN) {
int *dstStride = anim->pFrameRGB->linesize;
@ -753,6 +772,16 @@ static void ffmpeg_postprocess(struct anim *anim)
dstStride2);
}
if ((anim->x & 31) != 0) {
uint8_t *src = anim->pFrameRGB->data[0];
uint8_t *dst = (uint8_t *) ibuf->rect;
for (int y = 0; y < anim->y; y++) {
memcpy(dst, src, anim->x * 4);
dst += anim->x * 4;
src += anim->pFrameRGB->linesize[0];
}
}
if (filter_y) {
IMB_filtery(ibuf);
}