mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 13:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

ogg: Some more minor adjustments for the VP8 Ogg mapping

Browse source
This commit is contained in:
Sebastian Dröge 2010-05-20 08:52:49 +02:00
parent 838c96fe8f
commit 563a96ef1a
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/ogg/gstoggdemux.c
View file

@ -466,7 +466,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
} }
} }
} else if (pad->map.is_vp8) { } else if (pad->map.is_vp8) {
if (packet->bytes >= 7 && memcmp (packet->packet, "OggVP8 ", 7) == 0) { if (packet->bytes >= 7 && memcmp (packet->packet, "OVP80\2 ", 7) == 0) {
GstTagList *tags; GstTagList *tags;
buf = gst_buffer_new (); buf = gst_buffer_new ();
@ -475,7 +475,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
GST_BUFFER_SIZE (buf) = packet->bytes; GST_BUFFER_SIZE (buf) = packet->bytes;
tags = gst_tag_list_from_vorbiscomment_buffer (buf, tags = gst_tag_list_from_vorbiscomment_buffer (buf,
(const guint8 *) "OggVP8 ", 7, NULL); (const guint8 *) "OVP80\2 ", 7, NULL);
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = NULL; buf = NULL;
@ -490,8 +490,8 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
/* We don't push header packets for VP8 */ /* We don't push header packets for VP8 */
cret = gst_ogg_demux_combine_flows (ogg, pad, GST_FLOW_OK); cret = gst_ogg_demux_combine_flows (ogg, pad, GST_FLOW_OK);
goto done; goto done;
} else if (packet->b_o_s || (packet->bytes >= 4 } else if (packet->b_o_s || (packet->bytes >= 6
&& memcmp (packet->packet, "/VP8 ", 4) == 0)) { && memcmp (packet->packet, "OVP80\1", 4) == 0)) {
/* We don't push header packets for VP8 */ /* We don't push header packets for VP8 */
cret = gst_ogg_demux_combine_flows (ogg, pad, GST_FLOW_OK); cret = gst_ogg_demux_combine_flows (ogg, pad, GST_FLOW_OK);
goto done; goto done;

27
ext/ogg/gstoggstream.c
View file

@ -495,17 +495,17 @@ setup_vp8_mapper (GstOggStream * pad, ogg_packet * packet)
{ {
gint width, height, par_n, par_d, fps_n, fps_d; gint width, height, par_n, par_d, fps_n, fps_d;
if (packet->bytes < 24) { if (packet->bytes < 26) {
GST_DEBUG ("Failed to parse VP8 BOS page"); GST_DEBUG ("Failed to parse VP8 BOS page");
return FALSE; return FALSE;
} }
width = GST_READ_UINT16_BE (packet->packet + 6); width = GST_READ_UINT16_BE (packet->packet + 8);
height = GST_READ_UINT16_BE (packet->packet + 8); height = GST_READ_UINT16_BE (packet->packet + 10);
par_n = GST_READ_UINT24_BE (packet->packet + 10); par_n = GST_READ_UINT24_BE (packet->packet + 12);
par_d = GST_READ_UINT24_BE (packet->packet + 13); par_d = GST_READ_UINT24_BE (packet->packet + 15);
fps_n = GST_READ_UINT32_BE (packet->packet + 16); fps_n = GST_READ_UINT32_BE (packet->packet + 18);
fps_d = GST_READ_UINT32_BE (packet->packet + 20); fps_d = GST_READ_UINT32_BE (packet->packet + 22);
pad->is_vp8 = TRUE; pad->is_vp8 = TRUE;
pad->granulerate_n = fps_n; pad->granulerate_n = fps_n;
@ -595,16 +595,9 @@ granulepos_to_key_granule_vp8 (GstOggStream * pad, gint64 granulepos)
static gboolean static gboolean
is_header_vp8 (GstOggStream * pad, ogg_packet * packet) is_header_vp8 (GstOggStream * pad, ogg_packet * packet)
{ {
/* stream info */ if (packet->bytes > 6 && packet->packet[0] == 0x4F &&
if (packet->bytes > 4 && packet->packet[0] == 0x2f &&
packet->packet[1] == 0x56 && packet->packet[2] == 0x50 && packet->packet[1] == 0x56 && packet->packet[2] == 0x50 &&
packet->packet[3] == 0x38) packet->packet[3] == 0x38 && packet->packet[4] == 0x30)
return TRUE;
/* comment */
if (packet->bytes > 7 && packet->packet[0] == 0x4f &&
packet->packet[1] == 0x67 && packet->packet[2] == 0x67 &&
packet->packet[3] == 0x56 && packet->packet[4] == 0x50 &&
packet->packet[5] == 0x38 && packet->packet[6] == 0x20)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
@ -1643,7 +1636,7 @@ static const GstOggMap mappers[] = {
granulepos_to_key_granule_dirac granulepos_to_key_granule_dirac
}, },
{ {
"/VP8\1", 5, 4, "OVP80\1", 6, 4,
"video/x-vp8", "video/x-vp8",
setup_vp8_mapper, setup_vp8_mapper,
granulepos_to_granule_vp8, granulepos_to_granule_vp8,