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

avcodec/h264dec: be more explicit in handling container cropping 

This merges commit 4fded0480f from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb3.

 libavcodec/h264_slice.c | 20 +++++++++++++-------
 libavcodec/h264dec.c    |  3 +++
 libavcodec/h264dec.h    |  5 +++++
 3 files changed, 21 insertions(+), 7 deletions(-)
This commit is contained in:
James Almer 2017-05-08 15:46:23 -03:00
parent 000fb61a71
commit 6505e8cfd0
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/h264_slice.c
View File

@ -378,6 +378,8 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
h->avctx->coded_width = h1->avctx->coded_width;
h->avctx->width = h1->avctx->width;
h->avctx->height = h1->avctx->height;
h->width_from_caller = h1->width_from_caller;
h->height_from_caller = h1->height_from_caller;
h->coded_picture_number = h1->coded_picture_number;
h->first_field = h1->first_field;
h->picture_structure = h1->picture_structure;
@ -874,13 +876,17 @@ static int init_dimensions(H264Context *h)
av_assert0(sps->crop_top + sps->crop_bottom < (unsigned)h->height);
/* handle container cropping */
if (FFALIGN(h->avctx->width, 16) == FFALIGN(width, 16) &&
FFALIGN(h->avctx->height, 16) == FFALIGN(height, 16) &&
h->avctx->width <= width &&
h->avctx->height <= height
) {
width = h->avctx->width;
height = h->avctx->height;
if (h->width_from_caller > 0 && h->height_from_caller > 0 &&
!sps->crop_top && !sps->crop_left &&
FFALIGN(h->width_from_caller, 16) == FFALIGN(width, 16) &&
FFALIGN(h->height_from_caller, 16) == FFALIGN(height, 16) &&
h->width_from_caller <= width &&
h->height_from_caller <= height) {
width = h->width_from_caller;
height = h->height_from_caller;
} else {
h->width_from_caller = 0;
h->height_from_caller = 0;
}
h->avctx->coded_width = h->width;

3
libavcodec/h264dec.c
View File

@ -309,6 +309,9 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h)
h->avctx = avctx;
h->cur_chroma_format_idc = -1;
h->width_from_caller = avctx->width;
h->height_from_caller = avctx->height;
h->picture_structure = PICT_FRAME;
h->workaround_bugs = avctx->workaround_bugs;
h->flags = avctx->flags;

5
libavcodec/h264dec.h
View File

@ -534,6 +534,11 @@ typedef struct H264Context {
int cur_bit_depth_luma;
int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low
/* original AVCodecContext dimensions, used to handle container
* cropping */
int width_from_caller;
int height_from_caller;
int enable_er;
H264SEIContext sei;