diff options
| author | Andriy Gelman <andriy.gelman@gmail.com> | 2019-12-05 22:15:41 -0500 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-01-17 17:43:52 -0300 |
| commit | ad326379c6634505c9ebc46964057441761008bc (patch) | |
| tree | 75af00b336830dbbfc9a1038511f00306d8df23b /libavcodec/cbs_h2645.c | |
| parent | 5b7e90b252f765d677de6882bc65a362205638fa (diff) | |
lavc/h2645_parse: Don't automatically remove nuh_layer_id > 0 packets
HEVC standard supports multi-layer streams (ITU-T H.265 02/2018 Annex
F). Each NAL unit belongs to a particular layer defined by nuh_layer_id
in the header.
Currently, all NAL units that do not belong to a base layer are
automatically removed in ff_h2645_packet_split(). Some data may
therefore be lost when future filters/decoders are designed to support
multi-layer streams.
A better approach is to forward nuh_layer_id > 0 packets and let blocks
down the chain decide how to process them. The condition to remove
packets has been moved to hevcdec and cbs.
Found-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/cbs_h2645.c')
| -rw-r--r-- | libavcodec/cbs_h2645.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index ad8afa6d4a..5f1a20d427 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -565,6 +565,9 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx, AVBufferRef *ref; size_t size = nal->size; + if (nal->nuh_layer_id > 0) + continue; + // Remove trailing zeroes. while (size > 0 && nal->data[size - 1] == 0) --size; |