mediacodec/videotoolbox: add hxxx_helper

hxxx_helper is a H264/HEVC helper used by mediacodec and videtoolbox. For
mediacodec, it's used to convert (and validate) xvcC to AnnexB or used to
detect SPS/PPS change when decoding AnnexB. For videotoolbox, it's used to
validate avcC or to convert AnnexB to avcC (and detect SPS/PPS change) when
decoding AnnexB.

modules/codec/Makefile.am

@@ -315,9 +315,11 @@ liboggspots_plugin_la_LIBADD = $(OGGSPOTS_LIBS)
 EXTRA_LTLIBRARIES += liboggspots_plugin.la
 codec_LTLIBRARIES += $(LTLIBoggspots)
 
-libvideotoolbox_plugin_la_SOURCES = video_chroma/copy.c video_chroma/copy.h codec/videotoolbox.m \
-                                    packetizer/h264_nal.c packetizer/h264_nal.h \
-                                    packetizer/hxxx_nal.c packetizer/hxxx_nal.h
+libvideotoolbox_plugin_la_SOURCES = video_chroma/copy.c video_chroma/copy.h \
+	codec/videotoolbox.m codec/hxxx_helper.c codec/hxxx_helper.h \
+	packetizer/hxxx_nal.h packetizer/hxxx_nal.c \
+	packetizer/h264_nal.c packetizer/h264_nal.h \
+	packetizer/hevc_nal.c packetizer/hevc_nal.h
 if HAVE_OSX
 libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_CFLAGS) -mmacosx-version-min=10.8
 endif
@@ -457,7 +459,9 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacode
 	video_chroma/copy.c \
 	video_output/android/utils.c video_output/android/utils.h \
 	video_output/android/display.h \
-	packetizer/hxxx_nal.h packetizer/h264_nal.c packetizer/h264_nal.h \
+	codec/hxxx_helper.c codec/hxxx_helper.h \
+	packetizer/hxxx_nal.h packetizer/hxxx_nal.c \
+	packetizer/h264_nal.c packetizer/h264_nal.h \
 	packetizer/hevc_nal.c packetizer/hevc_nal.h
 
 codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)

modules/codec/hxxx_helper.c

+/*****************************************************************************
+ * hxxx_helper.c: AnnexB / avcC helper for dumb decoders
+ *****************************************************************************
+ * Copyright (C) 2017 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdint.h>
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_bits.h>
+
+#include "hxxx_helper.h"
+#include "../packetizer/hxxx_nal.h"
+#include "../packetizer/h264_slice.h"
+
+void
+hxxx_helper_init(struct hxxx_helper *hh, vlc_object_t *p_obj,
+                 vlc_fourcc_t i_codec, bool b_need_xvcC)
+{
+    assert(i_codec == VLC_CODEC_H264 || i_codec == VLC_CODEC_HEVC);
+
+    memset(hh, 0, sizeof(struct hxxx_helper));
+    hh->p_obj = p_obj;
+    hh->i_codec = i_codec;
+    switch (i_codec)
+    {
+        case VLC_CODEC_H264:
+            break;
+    }
+    hh->b_need_xvcC = b_need_xvcC;
+}
+
+void
+hxxx_helper_clean(struct hxxx_helper *hh)
+{
+    switch (hh->i_codec)
+    {
+        case VLC_CODEC_H264:
+            for (size_t i = 0; i <= H264_SPS_ID_MAX; ++i)
+            {
+                struct hxxx_helper_nal *hnal = &hh->h264.sps_list[i];
+                if (hnal->b)
+                {
+                    block_Release(hnal->b);
+                    h264_release_sps(hnal->h264_sps);
+                }
+            }
+            for (size_t i = 0; i <= H264_PPS_ID_MAX; ++i)
+            {
+                struct hxxx_helper_nal *hnal = &hh->h264.pps_list[i];
+                if (hnal->b)
+                {
+                    block_Release(hnal->b);
+                    h264_release_pps(hnal->h264_pps);
+                }
+            }
+            break;
+        case VLC_CODEC_HEVC:
+            if (hh->hevc.p_annexb_config_nal)
+                block_Release(hh->hevc.p_annexb_config_nal);
+            break;
+        default:
+            vlc_assert_unreachable();
+    }
+}
+
+#define HELPER_FOREACH_NAL(it, p_nal_list, i_nal_count, i_nal_max) \
+    for (size_t ii = 0, i_nal_nb = 0; i < i_nal_max && i_nal_count > i_nal_nb; ++ii) \
+        if (p_nal_list[ii].b != NULL && (it = &p_nal_list[ii]) && ++i_nal_nb)
+
+static int
+helper_dup_buf(struct hxxx_helper_nal *p_nal,
+               const uint8_t *p_nal_buf, size_t i_nal_buf)
+{
+    if (!p_nal->b)
+    {
+        p_nal->b = block_Alloc(i_nal_buf);
+        if (!p_nal->b)
+            return VLC_ENOMEM;
+    }
+    else if (p_nal->b != NULL && i_nal_buf > p_nal->b->i_buffer)
+    {
+        block_t *b = block_TryRealloc(p_nal->b, 0, i_nal_buf);
+        if (b == NULL)
+            return VLC_ENOMEM;
+        p_nal->b = b;
+    }
+    memcpy(p_nal->b->p_buffer, p_nal_buf, i_nal_buf);
+    p_nal->b->i_buffer = i_nal_buf;
+    return VLC_SUCCESS;
+}
+
+static inline const struct hxxx_helper_nal *
+helper_search_nal(const struct hxxx_helper_nal *p_nal_list, size_t i_nal_count,
+                  size_t i_nal_max, const void *p_nal_buf, size_t i_nal_buf)
+{
+    size_t i_nal_nb = 0;
+    for (size_t i = 0; i < i_nal_max && i_nal_count > i_nal_nb; ++i)
+    {
+        const struct hxxx_helper_nal *p_nal = &p_nal_list[i];
+        if (p_nal->b == NULL)
+            continue;
+        i_nal_nb++;
+        const int i_diff = i_nal_buf - p_nal->b->i_buffer;
+        if (i_diff == 0 && memcmp(p_nal_buf, p_nal->b->p_buffer, i_nal_buf) == 0)
+            return p_nal;
+    }
+    return NULL;
+}
+#define helper_search_sps(hh, p_nal, i_nal) \
+    helper_search_nal(hh->h264.sps_list, hh->h264.i_sps_count, \
+                      H264_SPS_ID_MAX+1, p_nal, i_nal)
+#define helper_search_pps(hh, p_nal, i_nal) \
+    helper_search_nal(hh->h264.pps_list, hh->h264.i_pps_count, \
+                      H264_PPS_ID_MAX+1, p_nal, i_nal)
+
+static inline bool
+helper_nal_length_valid(struct hxxx_helper *hh)
+{
+    return hh->i_nal_length_size == 1 || hh->i_nal_length_size == 2
+        || hh->i_nal_length_size == 4;
+}
+
+static int
+h264_helper_parse_nal(struct hxxx_helper *hh, const uint8_t *p_buf, size_t i_buf,
+                      bool b_is_xvcC, bool *p_config_changed)
+{
+    const uint8_t *p_nal;
+    size_t i_nal;
+    hxxx_iterator_ctx_t it;
+    hxxx_iterator_init(&it, p_buf, i_buf, hh->i_nal_length_size);
+    bool (*pf_iterator)(hxxx_iterator_ctx_t *, const uint8_t **, size_t *) =
+        b_is_xvcC ? hxxx_iterate_next : hxxx_annexb_iterate_next;
+    *p_config_changed = false;
+
+    while (pf_iterator(&it, &p_nal, &i_nal))
+    {
+        if (i_nal < 2)
+            continue;
+
+        const enum h264_nal_unit_type_e i_nal_type = p_nal[0] & 0x1F;
+
+        if (i_nal_type == H264_NAL_SPS)
+        {
+            if (helper_search_sps(hh, p_nal, i_nal) != NULL)
+                continue;
+            h264_sequence_parameter_set_t *p_sps =
+                h264_decode_sps(p_nal, i_nal, true);
+            if (!p_sps)
+                return VLC_EGENERIC;
+
+            struct hxxx_helper_nal *hnal = &hh->h264.sps_list[p_sps->i_id];
+            if (helper_dup_buf(hnal, p_nal, i_nal))
+            {
+                h264_release_sps(p_sps);
+                return VLC_EGENERIC;
+            }
+            if (hnal->h264_sps)
+                h264_release_sps(hnal->h264_sps);
+            else
+                hh->h264.i_sps_count++;
+
+            hnal->h264_sps = p_sps;
+            *p_config_changed = true;
+            hh->h264.i_current_sps = p_sps->i_id;
+fprintf(stderr, "new SPS parsed: %u\n", p_sps->i_id);
+        }
+        else if (i_nal_type == H264_NAL_PPS)
+        {
+            if (helper_search_pps(hh, p_nal, i_nal) != NULL)
+                continue;
+            h264_picture_parameter_set_t *p_pps =
+                h264_decode_pps(p_nal, i_nal, true);
+            if (!p_pps)
+                return VLC_EGENERIC;
+
+            struct hxxx_helper_nal *hnal = &hh->h264.pps_list[p_pps->i_id];
+
+            if (helper_dup_buf(hnal, p_nal, i_nal))
+            {
+                h264_release_pps(p_pps);
+                return VLC_EGENERIC;
+            }
+            if (hnal->h264_pps)
+                h264_release_pps(hnal->h264_pps);
+            else
+                hh->h264.i_pps_count++;
+
+            hnal->h264_pps = p_pps;
+            *p_config_changed = true;
+fprintf(stderr, "new PPS parsed: %u\n", p_pps->i_id);
+        }
+        else if (i_nal_type <= H264_NAL_SLICE_IDR
+              && i_nal_type != H264_NAL_UNKNOWN)
+        {
+            if (hh->h264.i_sps_count > 1)
+            {
+                /* There is more than one SPS. Get the PPS id of the current
+                 * SLICE in order to get the current SPS id */
+
+                /* Get the PPS id from the slice: inspirated from
+                 * h264_decode_slice() */
+                bs_t s;
+                bs_init(&s, p_nal, i_nal);
+                bs_skip(&s, 8);
+                bs_read_ue(&s);
+                bs_read_ue(&s);
+                unsigned i_pps_id = bs_read_ue(&s);
+                if (i_pps_id > H264_PPS_ID_MAX)
+                    return VLC_EGENERIC;
+
+                struct hxxx_helper_nal *hpps = &hh->h264.pps_list[i_pps_id];
+                if (hpps->b == NULL)
+                    return VLC_EGENERIC;
+
+                struct hxxx_helper_nal *hsps =
+                    &hh->h264.sps_list[hpps->h264_pps->i_sps_id];
+                if (hsps->b == NULL)
+                    return VLC_EGENERIC;
+
+                assert(hpps->h264_pps->i_sps_id == hsps->h264_sps->i_id);
+                if (hsps->h264_sps->i_id != hh->h264.i_current_sps)
+                {
+                    hh->h264.i_current_sps = hsps->h264_sps->i_id;
+                    *p_config_changed = true;
+                }
+            }
+            break; /* No need to parse further NAL */
+        }
+    }
+    return VLC_SUCCESS;
+}
+
+static int
+h264_helper_set_extra(struct hxxx_helper *hh, const void *p_extra,
+                      size_t i_extra)
+{
+    if (i_extra == 0)
+    {
+        /* AnnexB case */
+        hh->i_nal_length_size = 4;
+        return VLC_SUCCESS;
+    }
+    else if (h264_isavcC(p_extra, i_extra))
+    {
+        bool b_unused;
+
+        hh->i_nal_length_size = (((uint8_t*)p_extra)[4] & 0x03) + 1;
+        if (!helper_nal_length_valid(hh))
+            return VLC_EGENERIC;
+        hh->b_is_xvcC = true;
+
+        if (hh->b_need_xvcC)
+            return h264_helper_parse_nal(hh, p_extra, i_extra, true, &b_unused);
+
+        size_t i_buf;
+        uint8_t *p_buf = h264_avcC_to_AnnexB_NAL(p_extra, i_extra, &i_buf,
+                                                 NULL);
+        if (!p_buf)
+        {
+            msg_Dbg(hh->p_obj, "h264_avcC_to_AnnexB_NAL failed");
+            return VLC_EGENERIC;
+        }
+        fprintf(stderr, "got annex b extra: %d (nal: %d)\n", i_buf, hh->i_nal_length_size);
+
+        /* XXX h264_AVC_to_AnnexB() works only with a i_nal_length_size of 4.
+         * If nal_length_size is smaller than 4, fallback to SW decoding. I
+         * don't know if it's worth the effort to fix h264_AVC_to_AnnexB() for
+         * a smaller nal_length_size. Indeed, this case will happen only with
+         * very small resolutions, where hardware decoders are not that useful.
+         * -Thomas */
+        if (hh->i_nal_length_size != 4)
+        {
+            msg_Dbg(hh->p_obj, "nal_length_size is too small");
+            free(p_buf);
+            return VLC_EGENERIC;
+        }
+
+        int i_ret = h264_helper_parse_nal(hh, p_buf, i_buf, false, &b_unused);
+        free(p_buf);
+        return i_ret;
+    }
+    else /* Can't handle extra that is not avcC */
+        return VLC_EGENERIC;
+}
+
+static int
+hevc_helper_set_extra(struct hxxx_helper *hh, const void *p_extra,
+                      size_t i_extra)
+{
+    if (i_extra == 0)
+    {
+        /* AnnexB case */
+        hh->i_nal_length_size = 4;
+        return VLC_SUCCESS;
+    }
+    else if (hevc_ishvcC(p_extra, i_extra))
+    {
+        hh->i_nal_length_size = hevc_getNALLengthSize(p_extra);
+        if (!helper_nal_length_valid(hh))
+            return VLC_EGENERIC;
+        hh->b_is_xvcC = true;
+
+        if (hh->b_need_xvcC)
+            return VLC_SUCCESS;
+
+        size_t i_buf;
+        uint8_t *p_buf = hevc_hvcC_to_AnnexB_NAL(p_extra, i_extra, &i_buf,
+                                                 NULL);
+        if (!p_buf)
+        {
+            msg_Dbg(hh->p_obj, "hevc_hvcC_to_AnnexB_NAL failed");
+            return VLC_EGENERIC;
+        }
+
+        hh->hevc.p_annexb_config_nal = p_buf;
+        hh->hevc.i_annexb_config_nal = i_buf;
+        return VLC_SUCCESS;
+    }
+    else /* Can't handle extra that is not avcC */
+        return VLC_EGENERIC;
+}
+
+static block_t *
+helper_process_block_xvcc2annexb(struct hxxx_helper *hh, block_t *p_block,
+                                 bool *p_config_changed)
+{
+    assert(helper_nal_length_valid(hh));
+    *p_config_changed = false;
+    h264_AVC_to_AnnexB(p_block->p_buffer, p_block->i_buffer,
+                       hh->i_nal_length_size);
+    return p_block;
+}
+
+static block_t *
+helper_process_block_h264_annexb(struct hxxx_helper *hh, block_t *p_block,
+                                 bool *p_config_changed)
+{
+    int i_ret = h264_helper_parse_nal(hh, p_block->p_buffer, p_block->i_buffer,
+                                      false, p_config_changed);
+    if (i_ret != VLC_SUCCESS)
+    {
+        block_Release(p_block);
+        return NULL;
+    }
+    return p_block;
+}
+
+static block_t *
+helper_process_block_h264_annexb2avcc(struct hxxx_helper *hh, block_t *p_block,
+                                      bool *p_config_changed)
+{
+    p_block = helper_process_block_h264_annexb(hh, p_block, p_config_changed);
+    return p_block ? hxxx_AnnexB_to_xVC(p_block, hh->i_nal_length_size) : NULL;
+}
+
+int
+hxxx_helper_set_extra(struct hxxx_helper *hh, const void *p_extra,
+                      size_t i_extra)
+{
+    int i_ret;
+    switch (hh->i_codec)
+    {
+        case VLC_CODEC_H264:
+            i_ret = h264_helper_set_extra(hh, p_extra, i_extra);
+            break;
+        case VLC_CODEC_HEVC:
+            i_ret = hevc_helper_set_extra(hh, p_extra, i_extra);
+            break;
+        default:
+            vlc_assert_unreachable();
+    }
+    if (i_ret != VLC_SUCCESS)
+        return i_ret;
+
+    if (hh->b_is_xvcC)
+    {
+        if (hh->b_need_xvcC)
+            hh->pf_process_block = NULL;
+        else
+            hh->pf_process_block = helper_process_block_xvcc2annexb;
+    }
+    else
+    {
+        switch (hh->i_codec)
+        {
+            case VLC_CODEC_H264:
+                if (hh->b_need_xvcC)
+                    hh->pf_process_block = helper_process_block_h264_annexb2avcc;
+                else
+                    hh->pf_process_block = helper_process_block_h264_annexb;
+                break;
+            case VLC_CODEC_HEVC:
+                if (hh->b_need_xvcC)
+                    return VLC_EGENERIC; /* TODO */
+                else
+                    hh->pf_process_block = NULL;
+            default:
+                vlc_assert_unreachable();
+        }
+    }
+    return VLC_SUCCESS;;
+}
+
+
+block_t *
+h264_helper_get_annexb_config(struct hxxx_helper *hh)
+{
+    static const uint8_t annexb_startcode[] = { 0x00, 0x00, 0x00, 0x01 };
+
+    if (hh->h264.i_sps_count == 0 || hh->h264.i_pps_count == 0)
+        return NULL;
+
+    const struct hxxx_helper_nal *pp_nal_lists[] = {
+        hh->h264.sps_list, hh->h264.pps_list };
+    const size_t p_nal_counts[] = { hh->h264.i_sps_count, hh->h264.i_pps_count };
+    const size_t p_nal_maxs[] = { H264_SPS_ID_MAX+1, H264_PPS_ID_MAX+1 };
+
+    block_t *p_block_list = NULL;
+    for (size_t i = 0; i < 2; ++i)
+    {
+        size_t i_nals_size = 0;
+        const struct hxxx_helper_nal *p_nal;
+        HELPER_FOREACH_NAL(p_nal, pp_nal_lists[i], p_nal_counts[i], p_nal_maxs[i])
+        {
+            i_nals_size += p_nal->b->i_buffer + sizeof annexb_startcode;
+        }
+
+        block_t *p_block = block_Alloc(i_nals_size);
+        if (p_block == NULL)
+        {
+            if (p_block_list != NULL)
+                block_Release(p_block_list);
+            return NULL;
+        }
+
+        p_block->i_buffer = 0;
+        HELPER_FOREACH_NAL(p_nal, pp_nal_lists[i], p_nal_counts[i], p_nal_maxs[i])
+        {
+            memcpy(&p_block->p_buffer[p_block->i_buffer], annexb_startcode,
+                   sizeof annexb_startcode);
+            p_block->i_buffer += sizeof annexb_startcode;
+            memcpy(&p_block->p_buffer[p_block->i_buffer], p_nal->b->p_buffer,
+                   p_nal->b->i_buffer);
+            p_block->i_buffer += p_nal->b->i_buffer;
+        }
+        if (p_block_list == NULL)
+            p_block_list = p_block;
+        else
+            p_block_list->p_next = p_block;
+    }
+
+    return p_block_list;
+}
+
+block_t *
+h264_helper_get_avcc_config(struct hxxx_helper *hh)
+{
+    const struct hxxx_helper_nal *p_nal;
+    size_t i = 0;
+    const uint8_t *pp_sps_bufs[hh->h264.i_sps_count];
+    size_t p_sps_sizes[hh->h264.i_sps_count];
+    HELPER_FOREACH_NAL(p_nal, hh->h264.sps_list, hh->h264.i_sps_count,
+                       H264_SPS_ID_MAX+1)
+    {
+        pp_sps_bufs[i] = p_nal->b->p_buffer;
+        p_sps_sizes[i] = p_nal->b->i_buffer;
+        ++i;
+    }
+
+    i = 0;
+    const uint8_t *pp_pps_bufs[hh->h264.i_pps_count];
+    size_t p_pps_sizes[hh->h264.i_pps_count];
+    HELPER_FOREACH_NAL(p_nal, hh->h264.pps_list, hh->h264.i_pps_count,
+                       H264_PPS_ID_MAX+1)
+    {
+        pp_pps_bufs[i] = p_nal->b->p_buffer;
+        p_pps_sizes[i] = p_nal->b->i_buffer;
+        ++i;
+    }
+    return h264_NAL_to_avcC(4, pp_sps_bufs, p_sps_sizes, hh->h264.i_sps_count,
+                            pp_pps_bufs, p_pps_sizes, hh->h264.i_pps_count);
+}
+
+static const struct hxxx_helper_nal *
+h264_helper_get_current_sps(struct hxxx_helper *hh)
+{
+    if (hh->h264.i_sps_count == 0)
+        return NULL;
+
+    const struct hxxx_helper_nal *hsps =
+        &hh->h264.sps_list[hh->h264.i_current_sps];
+    assert(hsps->b != NULL);
+    return hsps;
+}
+
+int
+h264_helper_get_current_picture_size(struct hxxx_helper *hh,
+                                     unsigned *p_w, unsigned *p_h,
+                                     unsigned *p_vw, unsigned *p_vh)
+{
+    const struct hxxx_helper_nal *hsps = h264_helper_get_current_sps(hh);
+    if (hsps == NULL)
+        return VLC_EGENERIC;
+    return h264_get_picture_size(hsps->h264_sps, p_w, p_h, p_vw, p_vh) ?
+           VLC_SUCCESS : VLC_EGENERIC;
+}
+
+int
+h264_helper_get_current_sar(struct hxxx_helper *hh, int *p_num, int *p_den)
+{
+    const struct hxxx_helper_nal *hsps = h264_helper_get_current_sps(hh);
+    if (hsps == NULL)
+        return VLC_EGENERIC;
+    *p_num = hsps->h264_sps->vui.i_sar_num;
+    *p_den = hsps->h264_sps->vui.i_sar_den;
+    return VLC_SUCCESS;
+}
+
+int
+h264_helper_get_current_dpb_values(struct hxxx_helper *hh,
+                                       uint8_t *p_depth, unsigned *p_delay)
+{
+    const struct hxxx_helper_nal *hsps = h264_helper_get_current_sps(hh);
+    if (hsps == NULL)
+        return VLC_EGENERIC;
+    return h264_get_dpb_values(hsps->h264_sps, p_depth, p_delay) ?
+           VLC_SUCCESS : VLC_EGENERIC;
+}

modules/codec/hxxx_helper.h

+/*****************************************************************************
+ * hxxx_helper.h: AnnexB / avcC helper for dumb decoders
+ *****************************************************************************
+ * Copyright (C) 2017 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_block.h>
+#include <vlc_fourcc.h>
+
+#include "../packetizer/h264_nal.h"
+#include "../packetizer/hevc_nal.h"
+
+struct hxxx_helper_nal
+{
+    block_t *b;
+    union {
+        h264_sequence_parameter_set_t   *h264_sps;
+        h264_picture_parameter_set_t    *h264_pps;
+    };
+};
+