Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

decode: fix the code reducing cropping to preserve alignment

Browse source 
Currently it does not work at all.

Libav Bug-Id: 1058
(cherry picked from commit 8652a2c248)
This commit is contained in:
Anton Khirnov 2017-05-19 11:47:21 +02:00 • committed by James Almer
parent 23868ad5cb
commit 02327d1237
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libavcodec/decode.c
View file

@ -763,6 +763,7 @@ static int apply_cropping(AVCodecContext *avctx, AVFrame *frame)
/* adjust the offsets to avoid breaking alignment */ /* adjust the offsets to avoid breaking alignment */
if (!(avctx->flags & AV_CODEC_FLAG_UNALIGNED)) { if (!(avctx->flags & AV_CODEC_FLAG_UNALIGNED)) {
int log2_crop_align = frame->crop_left ? av_ctz(frame->crop_left) : INT_MAX;
int min_log2_align = INT_MAX; int min_log2_align = INT_MAX;
for (i = 0; frame->data[i]; i++) { for (i = 0; frame->data[i]; i++) {
@ -770,8 +771,13 @@ static int apply_cropping(AVCodecContext *avctx, AVFrame *frame)
min_log2_align = FFMIN(log2_align, min_log2_align); min_log2_align = FFMIN(log2_align, min_log2_align);
} }
/* we assume, and it should always be true, that the data alignment is
* related to the cropping alignment by a constant power-of-2 factor */
if (log2_crop_align < min_log2_align)
return AVERROR_BUG;
if (min_log2_align < 5) { if (min_log2_align < 5) {
frame->crop_left &= ~((1 << min_log2_align) - 1); frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1);
calc_cropping_offsets(offsets, frame, desc); calc_cropping_offsets(offsets, frame, desc);
} }
} }