forked from marfrit/libva-v4l2-request-fourier
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,307 @@
|
||||
/* 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.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#define GST_BIT_READER_DISABLE_INLINES
|
||||
#include "gstbitreader.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/**
|
||||
* SECTION:gstbitreader
|
||||
* @title: GstBitReader
|
||||
* @short_description: Reads any number of bits from a memory buffer
|
||||
* @symbols:
|
||||
* - gst_bit_reader_skip_unchecked
|
||||
* - gst_bit_reader_skip_to_byte_unchecked
|
||||
* - gst_bit_reader_get_bits_uint8_unchecked
|
||||
* - gst_bit_reader_peek_bits_uint8_unchecked
|
||||
* - gst_bit_reader_get_bits_uint16_unchecked
|
||||
* - gst_bit_reader_peek_bits_uint16_unchecked
|
||||
* - gst_bit_reader_get_bits_uint32_unchecked
|
||||
* - gst_bit_reader_peek_bits_uint32_unchecked
|
||||
* - gst_bit_reader_get_bits_uint64_unchecked
|
||||
* - gst_bit_reader_peek_bits_uint64_unchecked
|
||||
*
|
||||
* #GstBitReader provides a bit reader that can read any number of bits
|
||||
* from a memory buffer. It provides functions for reading any number of bits
|
||||
* into 8, 16, 32 and 64 bit variables.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_new: (skip)
|
||||
* @data: (array length=size): Data from which the #GstBitReader
|
||||
* should read
|
||||
* @size: Size of @data in bytes
|
||||
*
|
||||
* Create a new #GstBitReader instance, which will read from @data.
|
||||
*
|
||||
* Free-function: gst_bit_reader_free
|
||||
*
|
||||
* Returns: (transfer full): a new #GstBitReader instance
|
||||
*/
|
||||
GstBitReader *
|
||||
gst_bit_reader_new (const guint8 * data, guint size)
|
||||
{
|
||||
GstBitReader *ret = g_new0 (GstBitReader, 1);
|
||||
|
||||
ret->data = data;
|
||||
ret->size = size;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_free:
|
||||
* @reader: (in) (transfer full): a #GstBitReader instance
|
||||
*
|
||||
* Frees a #GstBitReader instance, which was previously allocated by
|
||||
* gst_bit_reader_new().
|
||||
*/
|
||||
void
|
||||
gst_bit_reader_free (GstBitReader * reader)
|
||||
{
|
||||
g_return_if_fail (reader != NULL);
|
||||
|
||||
g_free (reader);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_init:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @data: (in) (array length=size): data from which the bit reader should read
|
||||
* @size: Size of @data in bytes
|
||||
*
|
||||
* Initializes a #GstBitReader instance to read from @data. This function
|
||||
* can be called on already initialized instances.
|
||||
*/
|
||||
void
|
||||
gst_bit_reader_init (GstBitReader * reader, const guint8 * data, guint size)
|
||||
{
|
||||
g_return_if_fail (reader != NULL);
|
||||
|
||||
reader->data = data;
|
||||
reader->size = size;
|
||||
reader->byte = reader->bit = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_set_pos:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @pos: The new position in bits
|
||||
*
|
||||
* Sets the new position of a #GstBitReader instance to @pos in bits.
|
||||
*
|
||||
* Returns: %TRUE if the position could be set successfully, %FALSE
|
||||
* otherwise.
|
||||
*/
|
||||
gboolean
|
||||
gst_bit_reader_set_pos (GstBitReader * reader, guint pos)
|
||||
{
|
||||
g_return_val_if_fail (reader != NULL, FALSE);
|
||||
|
||||
if (pos > reader->size * 8)
|
||||
return FALSE;
|
||||
|
||||
reader->byte = pos / 8;
|
||||
reader->bit = pos % 8;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_pos:
|
||||
* @reader: a #GstBitReader instance
|
||||
*
|
||||
* Returns the current position of a #GstBitReader instance in bits.
|
||||
*
|
||||
* Returns: The current position of @reader in bits.
|
||||
*/
|
||||
guint
|
||||
gst_bit_reader_get_pos (const GstBitReader * reader)
|
||||
{
|
||||
return _gst_bit_reader_get_pos_inline (reader);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_remaining:
|
||||
* @reader: a #GstBitReader instance
|
||||
*
|
||||
* Returns the remaining number of bits of a #GstBitReader instance.
|
||||
*
|
||||
* Returns: The remaining number of bits of @reader instance.
|
||||
*/
|
||||
guint
|
||||
gst_bit_reader_get_remaining (const GstBitReader * reader)
|
||||
{
|
||||
return _gst_bit_reader_get_remaining_inline (reader);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_size:
|
||||
* @reader: a #GstBitReader instance
|
||||
*
|
||||
* Returns the total number of bits of a #GstBitReader instance.
|
||||
*
|
||||
* Returns: The total number of bits of @reader instance.
|
||||
*/
|
||||
guint
|
||||
gst_bit_reader_get_size (const GstBitReader * reader)
|
||||
{
|
||||
return _gst_bit_reader_get_size_inline (reader);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_skip:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @nbits: the number of bits to skip
|
||||
*
|
||||
* Skips @nbits bits of the #GstBitReader instance.
|
||||
*
|
||||
* Returns: %TRUE if @nbits bits could be skipped, %FALSE otherwise.
|
||||
*/
|
||||
gboolean
|
||||
gst_bit_reader_skip (GstBitReader * reader, guint nbits)
|
||||
{
|
||||
return _gst_bit_reader_skip_inline (reader, nbits);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_skip_to_byte:
|
||||
* @reader: a #GstBitReader instance
|
||||
*
|
||||
* Skips until the next byte.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
gboolean
|
||||
gst_bit_reader_skip_to_byte (GstBitReader * reader)
|
||||
{
|
||||
return _gst_bit_reader_skip_to_byte_inline (reader);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_bits_uint8:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint8 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val and update the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_bits_uint16:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint16 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val and update the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_bits_uint32:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint32 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val and update the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_get_bits_uint64:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint64 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val and update the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_peek_bits_uint8:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint8 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val but keep the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_peek_bits_uint16:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint16 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val but keep the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_peek_bits_uint32:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint32 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val but keep the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
/**
|
||||
* gst_bit_reader_peek_bits_uint64:
|
||||
* @reader: a #GstBitReader instance
|
||||
* @val: (out): Pointer to a #guint64 to store the result
|
||||
* @nbits: number of bits to read
|
||||
*
|
||||
* Read @nbits bits into @val but keep the current position.
|
||||
*
|
||||
* Returns: %TRUE if successful, %FALSE otherwise.
|
||||
*/
|
||||
|
||||
#define GST_BIT_READER_READ_BITS(bits) \
|
||||
gboolean \
|
||||
gst_bit_reader_peek_bits_uint##bits (const GstBitReader *reader, guint##bits *val, guint nbits) \
|
||||
{ \
|
||||
return _gst_bit_reader_peek_bits_uint##bits##_inline (reader, val, nbits); \
|
||||
} \
|
||||
\
|
||||
gboolean \
|
||||
gst_bit_reader_get_bits_uint##bits (GstBitReader *reader, guint##bits *val, guint nbits) \
|
||||
{ \
|
||||
return _gst_bit_reader_get_bits_uint##bits##_inline (reader, val, nbits); \
|
||||
}
|
||||
|
||||
GST_BIT_READER_READ_BITS (8);
|
||||
GST_BIT_READER_READ_BITS (16);
|
||||
GST_BIT_READER_READ_BITS (32);
|
||||
GST_BIT_READER_READ_BITS (64);
|
||||
Reference in New Issue
Block a user