diff options
| author | Gildas Cocherel <gildas.cocherel@laposte.net> | 2014-07-04 11:21:56 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-07-11 08:52:54 +0000 |
| commit | 458e7c94830d1522997e33a0b5e87bd709e8a349 (patch) | |
| tree | 67441f4f841a77c0a2ff95672e4f162fec622752 | |
| parent | f43789b76e661acd93c21664678f140e53cfa1fa (diff) | |
hevc: implement pic_output_flag handling
Sample-Id: OPFLAG_B_Qualcomm_1.bit, OPFLAG_C_Qualcomm_1.bit
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/hevc.c | 2 | ||||
| -rw-r--r-- | libavcodec/hevc_refs.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index d801a47270..d9c9c7104d 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -546,6 +546,8 @@ static int hls_slice_header(HEVCContext *s) return AVERROR_INVALIDDATA; } + // when flag is not present, picture is inferred to be output + sh->pic_output_flag = 1; if (s->pps->output_flag_present_flag) sh->pic_output_flag = get_bits1(gb); diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 2fbe9e787c..c924227e50 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -143,8 +143,12 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc) *frame = ref->frame; s->ref = ref; + if (s->sh.pic_output_flag) + ref->flags = HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_SHORT_REF; + else + ref->flags = HEVC_FRAME_FLAG_SHORT_REF; + ref->poc = poc; - ref->flags = HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_SHORT_REF; ref->sequence = s->seq_decode; ref->window = s->sps->output_window; |