eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/hevcdec: export cropping information instead of handling it internally

Browse Source 
This merges commit a02ae1c683 from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb3.

 libavcodec/hevc_parser.c |  6 ++++--
 libavcodec/hevc_ps.c     | 31 ++++++++++++-------------------
 libavcodec/hevc_ps.h     |  2 --
 libavcodec/hevc_refs.c   | 18 +++++-------------
 libavcodec/hevcdec.c     |  7 ++++---
 libavcodec/hevcdec.h     |  2 --
 6 files changed, 25 insertions(+), 41 deletions(-)

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-05-08 15:46:22 -03:00
parent 43c394dcae
commit 000fb61a71
6 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/hevc_parser.c
View File

@@ -57,6 +57,7 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal,
HEVCSEIContext *sei = &ctx->sei;
SliceHeader *sh = &ctx->sh;
GetBitContext *gb = &nal->gb;
const HEVCWindow *ow;
int i, num = 0, den = 0;
sh->first_slice_in_pic_flag = get_bits1(gb);
@@ -83,11 +84,12 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal,
ps->sps = (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data;
ps->vps = (HEVCVPS*)ps->vps_list[ps->sps->vps_id]->data;
}
ow = &ps->sps->output_window;
s->coded_width = ps->sps->width;
s->coded_height = ps->sps->height;
s->width = ps->sps->output_width;
s->height = ps->sps->output_height;
s->width = ps->sps->width - ow->left_offset - ow->right_offset;
s->height = ps->sps->height - ow->top_offset - ow->bottom_offset;
s->format = ps->sps->pix_fmt;
avctx->profile = ps->sps->ptl.general_ptl.profile_idc;
avctx->level = ps->sps->ptl.general_ptl.level_idc;