summaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc_parser.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-12-18 21:11:47 +0100
committerAnton Khirnov <anton@khirnov.net>2017-01-12 16:27:56 +0100
commita02ae1c6837a54ed9e7735da2b1f789b2f4b6e13 (patch)
tree204060552648d600f0a9f68090fde798692cfe80 /libavcodec/hevc_parser.c
parent019ab88a95cb31b698506d90e8ce56695a7f1cc5 (diff)
downloadffmpeg-streaming-a02ae1c6837a54ed9e7735da2b1f789b2f4b6e13.zip
ffmpeg-streaming-a02ae1c6837a54ed9e7735da2b1f789b2f4b6e13.tar.gz
hevcdec: export cropping information instead of handling it internally
Diffstat (limited to 'libavcodec/hevc_parser.c')
-rw-r--r--libavcodec/hevc_parser.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index 49e7122..74a0257 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -49,6 +49,7 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal,
HEVCPPS *pps;
HEVCSPS *sps;
+ HEVCWindow *ow;
unsigned int pps_id;
get_bits1(gb); // first slice in pic
@@ -62,12 +63,13 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal,
}
pps = (HEVCPPS*)ctx->ps.pps_list[pps_id]->data;
sps = (HEVCSPS*)ctx->ps.sps_list[pps->sps_id]->data;
+ ow = &sps->output_window;
/* export the stream parameters */
s->coded_width = sps->width;
s->coded_height = sps->height;
- s->width = sps->output_width;
- s->height = sps->output_height;
+ s->width = sps->width - ow->left_offset - ow->right_offset;
+ s->height = sps->height - ow->top_offset - ow->bottom_offset;
s->format = sps->pix_fmt;
avctx->profile = sps->ptl.general_ptl.profile_idc;
avctx->level = sps->ptl.general_ptl.level_idc;
OpenPOWER on IntegriCloud