iter2 step2: GLib/GStreamer compat shim, build succeeds
Vendored gsth265parser + nalutils + gstbitreader + gstbytereader (the
Step 1 commit) compile cleanly against libc + libv4l2 only after
adding 1 compat translation unit + 5 stub headers, no edits to the
vendored .c/.h files themselves.
src/h265_parser/gst_compat.{h,c} — new files (MIT, original work):
- GLib type aliases (gboolean, gchar, gint*, guint*, gsize, gpointer)
- Memory helpers (g_malloc/g_free as #define free, g_memdup2 inline)
- Asserts as no-op + parser-return-code-propagation
- All GST_DEBUG/INFO/WARNING/ERROR/LOG/FIXME as no-ops (the parser
is heavy on debug logging; we compile it all out)
- GArray implementation (~100 LOC, just enough for gsth265parser.c's
24 call sites)
- GList full struct with .data/.next/.prev so callers compile;
list-manipulation functions abort() — dead code paths only
- Byte-order read/write macros (GST_READ_UINT8/16/24/32/64_LE/BE,
GST_WRITE_UINT8/16/24/32_BE) — aarch64 LE inlines
- g_once_init_enter/leave as simple gate
- G_MAXUINT*, G_MAXINT*, G_MINxxx, G_GNUC_* attribute macros, etc.
- Opaque GstBuffer/GstMemory/GstMapInfo + abort-stub functions for
the encoder-side SEI-insertion paths the libva backend never invokes
- gst_util_ceil_log2 real impl (used by slice-header parser; dead
for our SPS-only call path but cheaper to implement than stub)
src/h265_parser/gst/{gst.h,base/base-prelude.h,base/gstbitwriter.h,
codecparsers/codecparsers-prelude.h,glib-compat-private.h} — 5 new
stub headers (MIT). All include gst_compat.h. gstbitwriter.h adds
abort-stub functions for the bit-writer API (used by nalutils.c's NAL
emulation-prevention encoder path — dead code for the parse-only
libva backend).
src/meson.build — added the 5 new .c source files and 10 new .h
headers; added include_directories('h265_parser') to the include path
so the vendored files' '#include <gst/base/...>' style references
resolve to the stub headers + actual vendored files in the local
tree.
Build verified: ninja -C build produces v4l2_request_drv_video.so
(682 KB, up from 485 KB pre-vendor — the +200 KB is the vendored
parser code). nm shows gst_h265_parse_sps, gst_h265_parse_sps_ext,
gst_h265_parser_identify_nalu, and the other functions we need for
Step 4 are present in the binary.
Two #warning messages from gsth265parser.h about API stability are
upstream-intentional and harmless ('The H.265 parsing library is
unstable API and may change in future').
This commit completes Step 2 of ampere-kernel-decoders iter2 Phase 6.
Backend remains functionally identical to pre-iter2 — the new code
compiles + links but is not yet called from h265_set_controls (that's
Step 4). Existing 5 codecs continue to work as before.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,328 @@
|
||||
/* GStreamer
|
||||
*
|
||||
* Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GST_BIT_READER_H__
|
||||
#define __GST_BIT_READER_H__
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/base/base-prelude.h>
|
||||
|
||||
/* FIXME: inline functions */
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GST_BIT_READER(reader) ((GstBitReader *) (reader))
|
||||
|
||||
/**
|
||||
* GstBitReader:
|
||||
* @data: (array length=size): Data from which the bit reader will
|
||||
* read
|
||||
* @size: Size of @data in bytes
|
||||
* @byte: Current byte position
|
||||
* @bit: Bit position in the current byte
|
||||
*
|
||||
* A bit reader instance.
|
||||
*/
|
||||
typedef struct {
|
||||
const guint8 *data;
|
||||
guint size;
|
||||
|
||||
guint byte; /* Byte position */
|
||||
guint bit; /* Bit position in the current byte */
|
||||
|
||||
/* < private > */
|
||||
gpointer _gst_reserved[GST_PADDING];
|
||||
} GstBitReader;
|
||||
|
||||
GST_BASE_API
|
||||
GstBitReader * gst_bit_reader_new (const guint8 *data, guint size) G_GNUC_MALLOC;
|
||||
|
||||
GST_BASE_API
|
||||
void gst_bit_reader_free (GstBitReader *reader);
|
||||
|
||||
GST_BASE_API
|
||||
void gst_bit_reader_init (GstBitReader *reader, const guint8 *data, guint size);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_set_pos (GstBitReader *reader, guint pos);
|
||||
|
||||
GST_BASE_API
|
||||
guint gst_bit_reader_get_pos (const GstBitReader *reader);
|
||||
|
||||
GST_BASE_API
|
||||
guint gst_bit_reader_get_remaining (const GstBitReader *reader);
|
||||
|
||||
GST_BASE_API
|
||||
guint gst_bit_reader_get_size (const GstBitReader *reader);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_skip (GstBitReader *reader, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_skip_to_byte (GstBitReader *reader);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_get_bits_uint8 (GstBitReader *reader, guint8 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_get_bits_uint16 (GstBitReader *reader, guint16 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_get_bits_uint32 (GstBitReader *reader, guint32 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_get_bits_uint64 (GstBitReader *reader, guint64 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_peek_bits_uint8 (const GstBitReader *reader, guint8 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_peek_bits_uint16 (const GstBitReader *reader, guint16 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_peek_bits_uint32 (const GstBitReader *reader, guint32 *val, guint nbits);
|
||||
|
||||
GST_BASE_API
|
||||
gboolean gst_bit_reader_peek_bits_uint64 (const GstBitReader *reader, guint64 *val, guint nbits);
|
||||
|
||||
/**
|
||||
* GST_BIT_READER_INIT:
|
||||
* @data: Data from which the #GstBitReader should read
|
||||
* @size: Size of @data in bytes
|
||||
*
|
||||
* A #GstBitReader must be initialized with this macro, before it can be
|
||||
* used. This macro can used be to initialize a variable, but it cannot
|
||||
* be assigned to a variable. In that case you have to use
|
||||
* gst_bit_reader_init().
|
||||
*/
|
||||
#define GST_BIT_READER_INIT(data, size) {data, size, 0, 0}
|
||||
|
||||
/* Unchecked variants */
|
||||
|
||||
static inline void
|
||||
gst_bit_reader_skip_unchecked (GstBitReader * reader, guint nbits)
|
||||
{
|
||||
reader->bit += nbits;
|
||||
reader->byte += reader->bit / 8;
|
||||
reader->bit = reader->bit % 8;
|
||||
}
|
||||
|
||||
static inline void
|
||||
gst_bit_reader_skip_to_byte_unchecked (GstBitReader * reader)
|
||||
{
|
||||
if (reader->bit) {
|
||||
reader->bit = 0;
|
||||
reader->byte++;
|
||||
}
|
||||
}
|
||||
|
||||
#define __GST_BIT_READER_READ_BITS_UNCHECKED(bits) \
|
||||
static inline guint##bits \
|
||||
gst_bit_reader_peek_bits_uint##bits##_unchecked (const GstBitReader *reader, guint nbits) \
|
||||
{ \
|
||||
guint##bits ret = 0; \
|
||||
const guint8 *data; \
|
||||
guint byte, bit; \
|
||||
\
|
||||
data = reader->data; \
|
||||
byte = reader->byte; \
|
||||
bit = reader->bit; \
|
||||
\
|
||||
while (nbits > 0) { \
|
||||
guint toread = MIN (nbits, 8 - bit); \
|
||||
\
|
||||
ret <<= toread; \
|
||||
ret |= (data[byte] & (0xff >> bit)) >> (8 - toread - bit); \
|
||||
\
|
||||
bit += toread; \
|
||||
if (bit >= 8) { \
|
||||
byte++; \
|
||||
bit = 0; \
|
||||
} \
|
||||
nbits -= toread; \
|
||||
} \
|
||||
\
|
||||
return ret; \
|
||||
} \
|
||||
\
|
||||
static inline guint##bits \
|
||||
gst_bit_reader_get_bits_uint##bits##_unchecked (GstBitReader *reader, guint nbits) \
|
||||
{ \
|
||||
guint##bits ret; \
|
||||
\
|
||||
ret = gst_bit_reader_peek_bits_uint##bits##_unchecked (reader, nbits); \
|
||||
\
|
||||
gst_bit_reader_skip_unchecked (reader, nbits); \
|
||||
\
|
||||
return ret; \
|
||||
}
|
||||
|
||||
__GST_BIT_READER_READ_BITS_UNCHECKED (8)
|
||||
__GST_BIT_READER_READ_BITS_UNCHECKED (16)
|
||||
__GST_BIT_READER_READ_BITS_UNCHECKED (32)
|
||||
__GST_BIT_READER_READ_BITS_UNCHECKED (64)
|
||||
|
||||
#undef __GST_BIT_READER_READ_BITS_UNCHECKED
|
||||
|
||||
/* unchecked variants -- do not use */
|
||||
|
||||
static inline guint
|
||||
_gst_bit_reader_get_size_unchecked (const GstBitReader * reader)
|
||||
{
|
||||
return reader->size * 8;
|
||||
}
|
||||
|
||||
static inline guint
|
||||
_gst_bit_reader_get_pos_unchecked (const GstBitReader * reader)
|
||||
{
|
||||
return reader->byte * 8 + reader->bit;
|
||||
}
|
||||
|
||||
static inline guint
|
||||
_gst_bit_reader_get_remaining_unchecked (const GstBitReader * reader)
|
||||
{
|
||||
return reader->size * 8 - (reader->byte * 8 + reader->bit);
|
||||
}
|
||||
|
||||
/* inlined variants -- do not use directly */
|
||||
static inline guint
|
||||
_gst_bit_reader_get_size_inline (const GstBitReader * reader)
|
||||
{
|
||||
g_return_val_if_fail (reader != NULL, 0);
|
||||
|
||||
return _gst_bit_reader_get_size_unchecked (reader);
|
||||
}
|
||||
|
||||
static inline guint
|
||||
_gst_bit_reader_get_pos_inline (const GstBitReader * reader)
|
||||
{
|
||||
g_return_val_if_fail (reader != NULL, 0);
|
||||
|
||||
return _gst_bit_reader_get_pos_unchecked (reader);
|
||||
}
|
||||
|
||||
static inline guint
|
||||
_gst_bit_reader_get_remaining_inline (const GstBitReader * reader)
|
||||
{
|
||||
g_return_val_if_fail (reader != NULL, 0);
|
||||
|
||||
return _gst_bit_reader_get_remaining_unchecked (reader);
|
||||
}
|
||||
|
||||
static inline gboolean
|
||||
_gst_bit_reader_skip_inline (GstBitReader * reader, guint nbits)
|
||||
{
|
||||
g_return_val_if_fail (reader != NULL, FALSE);
|
||||
|
||||
if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits)
|
||||
return FALSE;
|
||||
|
||||
gst_bit_reader_skip_unchecked (reader, nbits);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static inline gboolean
|
||||
_gst_bit_reader_skip_to_byte_inline (GstBitReader * reader)
|
||||
{
|
||||
g_return_val_if_fail (reader != NULL, FALSE);
|
||||
|
||||
if (reader->byte > reader->size)
|
||||
return FALSE;
|
||||
|
||||
gst_bit_reader_skip_to_byte_unchecked (reader);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define __GST_BIT_READER_READ_BITS_INLINE(bits) \
|
||||
static inline gboolean \
|
||||
_gst_bit_reader_get_bits_uint##bits##_inline (GstBitReader *reader, guint##bits *val, guint nbits) \
|
||||
{ \
|
||||
g_return_val_if_fail (reader != NULL, FALSE); \
|
||||
g_return_val_if_fail (val != NULL, FALSE); \
|
||||
g_return_val_if_fail (nbits <= bits, FALSE); \
|
||||
\
|
||||
if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits) \
|
||||
return FALSE; \
|
||||
\
|
||||
*val = gst_bit_reader_get_bits_uint##bits##_unchecked (reader, nbits); \
|
||||
return TRUE; \
|
||||
} \
|
||||
\
|
||||
static inline gboolean \
|
||||
_gst_bit_reader_peek_bits_uint##bits##_inline (const GstBitReader *reader, guint##bits *val, guint nbits) \
|
||||
{ \
|
||||
g_return_val_if_fail (reader != NULL, FALSE); \
|
||||
g_return_val_if_fail (val != NULL, FALSE); \
|
||||
g_return_val_if_fail (nbits <= bits, FALSE); \
|
||||
\
|
||||
if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits) \
|
||||
return FALSE; \
|
||||
\
|
||||
*val = gst_bit_reader_peek_bits_uint##bits##_unchecked (reader, nbits); \
|
||||
return TRUE; \
|
||||
}
|
||||
|
||||
__GST_BIT_READER_READ_BITS_INLINE (8)
|
||||
__GST_BIT_READER_READ_BITS_INLINE (16)
|
||||
__GST_BIT_READER_READ_BITS_INLINE (32)
|
||||
__GST_BIT_READER_READ_BITS_INLINE (64)
|
||||
|
||||
#undef __GST_BIT_READER_READ_BITS_INLINE
|
||||
|
||||
#ifndef GST_BIT_READER_DISABLE_INLINES
|
||||
|
||||
#define gst_bit_reader_get_size(reader) \
|
||||
_gst_bit_reader_get_size_inline (reader)
|
||||
#define gst_bit_reader_get_pos(reader) \
|
||||
_gst_bit_reader_get_pos_inline (reader)
|
||||
#define gst_bit_reader_get_remaining(reader) \
|
||||
_gst_bit_reader_get_remaining_inline (reader)
|
||||
|
||||
/* we use defines here so we can add the G_LIKELY() */
|
||||
|
||||
#define gst_bit_reader_skip(reader, nbits)\
|
||||
G_LIKELY (_gst_bit_reader_skip_inline(reader, nbits))
|
||||
#define gst_bit_reader_skip_to_byte(reader)\
|
||||
G_LIKELY (_gst_bit_reader_skip_to_byte_inline(reader))
|
||||
|
||||
#define gst_bit_reader_get_bits_uint8(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_get_bits_uint8_inline (reader, val, nbits))
|
||||
#define gst_bit_reader_get_bits_uint16(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_get_bits_uint16_inline (reader, val, nbits))
|
||||
#define gst_bit_reader_get_bits_uint32(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_get_bits_uint32_inline (reader, val, nbits))
|
||||
#define gst_bit_reader_get_bits_uint64(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_get_bits_uint64_inline (reader, val, nbits))
|
||||
|
||||
#define gst_bit_reader_peek_bits_uint8(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_peek_bits_uint8_inline (reader, val, nbits))
|
||||
#define gst_bit_reader_peek_bits_uint16(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_peek_bits_uint16_inline (reader, val, nbits))
|
||||
#define gst_bit_reader_peek_bits_uint32(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_peek_bits_uint32_inline (reader, val, nbits))
|
||||
#define gst_bit_reader_peek_bits_uint64(reader, val, nbits) \
|
||||
G_LIKELY (_gst_bit_reader_peek_bits_uint64_inline (reader, val, nbits))
|
||||
#endif
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_BIT_READER_H__ */
|
||||
Reference in New Issue
Block a user