mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

vdpaumpegdec: use gst_byte_reader_masked_scan_uint32 instead of our own version

Browse source
This commit is contained in:
Carl-Anton Ingmarsson 2009-07-01 23:12:20 +02:00 committed by Jan Schmidt
parent f1799ce0d6
commit 49835d98a7
1 changed files with 25 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
sys/vdpau/gstvdpmpegdec.c
View file

@ -83,74 +83,53 @@ GST_BOILERPLATE_FULL (GstVdpMpegDec, gst_vdp_mpeg_dec,
static void gst_vdp_mpeg_dec_init_info (VdpPictureInfoMPEG1Or2 * vdp_info); static void gst_vdp_mpeg_dec_init_info (VdpPictureInfoMPEG1Or2 * vdp_info);
static void gst_vdp_mpeg_dec_finalize (GObject * object); static void gst_vdp_mpeg_dec_finalize (GObject * object);
guint8 *
mpeg_util_find_start_code (guint32 * sync_word, guint8 * cur, guint8 * end)
{
guint32 code;
if (G_UNLIKELY (cur == NULL))
return NULL;
code = *sync_word;
while (cur < end) {
code <<= 8;
if (code == 0x00000100) {
/* Reset the sync word accumulator */
*sync_word = 0xffffffff;
return cur;
}
/* Add the next available byte to the collected sync word */
code |= *cur++;
}
*sync_word = code;
return NULL;
}
typedef struct typedef struct
{ {
GstByteReader reader;
GstBuffer *buffer; GstBuffer *buffer;
guint8 *cur; guint start;
guint8 *end;
} GstVdpMpegPacketizer; } GstVdpMpegPacketizer;
static GstBuffer * static GstBuffer *
gst_vdp_mpeg_packetizer_get_next_packet (GstVdpMpegPacketizer * packetizer) gst_vdp_mpeg_packetizer_get_next_packet (GstVdpMpegPacketizer * packetizer)
{ {
guint32 sync_word = 0xffffff; guint offset, size;
guint8 *packet_start; GstBuffer *buf;
guint8 *packet_end;
if (!packetizer->cur) if (packetizer->start == -1)
return NULL; return NULL;
packet_start = packetizer->cur - 3; if (!gst_byte_reader_set_pos (&packetizer->reader, packetizer->start + 3))
packetizer->cur = packet_end = mpeg_util_find_start_code (&sync_word, return NULL;
packetizer->cur, packetizer->end);
if (packet_end) offset = gst_byte_reader_masked_scan_uint32 (&packetizer->reader, 0xffffff00,
packet_end -= 3; 0x00000100, 0, gst_byte_reader_get_remaining (&packetizer->reader));
if (offset != -1)
size = offset - packetizer->start;
else else
packet_end = packetizer->end; size = gst_byte_reader_get_remaining (&packetizer->reader) + 3;
return gst_buffer_create_sub (packetizer->buffer, buf = gst_buffer_create_sub (packetizer->buffer, packetizer->start, size);
packet_start - GST_BUFFER_DATA (packetizer->buffer),
packet_end - packet_start); packetizer->start = offset;
return buf;
} }
static void static void
gst_vdp_mpeg_packetizer_init (GstVdpMpegPacketizer * packetizer, gst_vdp_mpeg_packetizer_init (GstVdpMpegPacketizer * packetizer,
GstBuffer * buffer) GstBuffer * buffer)
{ {
guint32 sync_word = 0xffffffff; guint offset;
gst_byte_reader_init_from_buffer (&packetizer->reader, buffer);
packetizer->buffer = buffer; packetizer->buffer = buffer;
packetizer->end = GST_BUFFER_DATA (buffer) + GST_BUFFER_SIZE (buffer);
packetizer->cur = mpeg_util_find_start_code (&sync_word, offset = gst_byte_reader_masked_scan_uint32 (&packetizer->reader, 0xffffff00,
GST_BUFFER_DATA (buffer), packetizer->end); 0x00000100, 0, gst_byte_reader_get_remaining (&packetizer->reader));
packetizer->start = offset;
} }
static gboolean static gboolean
@ -328,7 +307,6 @@ gst_vdp_mpeg_dec_alloc_buffer (GstVdpMpegDec * mpeg_dec, GstBuffer ** outbuf)
GstVdpDevice *device; GstVdpDevice *device;
VdpStatus status; VdpStatus status;
GST_WARNING ("ASDASD");
device = mpeg_dec->device = device = mpeg_dec->device =
g_object_ref (GST_VDP_VIDEO_BUFFER (*outbuf)->device); g_object_ref (GST_VDP_VIDEO_BUFFER (*outbuf)->device);