gst_buffer_unref (stream->initdata);
if (stream->extradata)
gst_buffer_unref (stream->extradata);
+ if (stream->rgb8_palette)
+ gst_buffer_unref (stream->rgb8_palette);
if (stream->pad) {
if (stream->exposed) {
gst_pad_set_active (stream->pad, FALSE);
}
static GstCaps *
-gst_avi_demux_check_caps (GstAviDemux * avi, GstCaps * caps)
+gst_avi_demux_check_caps (GstAviDemux * avi, GstCaps * caps,
+ GstBuffer ** rgb8_palette)
{
GstStructure *s;
const GValue *val;
GstBuffer *buf;
+ caps = gst_caps_make_writable (caps);
+
s = gst_caps_get_structure (caps, 0);
- if (!gst_structure_has_name (s, "video/x-h264"))
+ if (gst_structure_has_name (s, "video/x-raw") &&
+ gst_structure_has_field_typed (s, "palette_data", GST_TYPE_BUFFER)) {
+ gst_structure_get (s, "palette_data", GST_TYPE_BUFFER, rgb8_palette, NULL);
+ gst_structure_remove_field (s, "palette_data");
+ return caps;
+ } else if (!gst_structure_has_name (s, "video/x-h264")) {
return caps;
+ }
GST_DEBUG_OBJECT (avi, "checking caps %" GST_PTR_FORMAT, caps);
g_free (vprp);
vprp = NULL;
}
- caps = gst_avi_demux_check_caps (avi, caps);
+ caps = gst_avi_demux_check_caps (avi, caps, &stream->rgb8_palette);
tag_name = GST_TAG_VIDEO_CODEC;
avi->num_v_streams++;
break;
goto fail;
}
- GST_DEBUG_OBJECT (element, "codec-name=%s",
- (codec_name ? codec_name : "NULL"));
+ GST_DEBUG_OBJECT (element, "codec-name=%s", codec_name ? codec_name : "NULL");
GST_DEBUG_OBJECT (element, "caps=%" GST_PTR_FORMAT, caps);
/* set proper settings and add it */
s = gst_caps_get_structure (caps, 0);
gst_caps_unref (caps);
- if (!gst_structure_get_int (s, "bpp", &bpp)) {
+ if (stream->rgb8_palette != NULL) {
+ bpp = 8;
+ } else if (!gst_structure_get_int (s, "bpp", &bpp)) { /* FIXME */
GST_WARNING ("Failed to retrieve depth from caps");
return buf;
}
gst_buffer_unmap (buf, &map);
+ /* append palette to paletted RGB8 buffer data */
+ if (stream->rgb8_palette != NULL)
+ buf = gst_buffer_append (buf, gst_buffer_ref (stream->rgb8_palette));
+
return buf;
}
if (gst_buffer_get_size (buf) < size)
goto short_buffer;
- /* invert the picture if needed */
+ /* invert the picture if needed, and append palette for RGB8P */
buf = gst_avi_demux_invert (stream, buf);
/* mark non-keyframes */
if (saw_desired_kf && buf) {
GstClockTime dur_ts = 0;
- /* invert the picture if needed */
+ /* invert the picture if needed, and append palette for RGB8P */
buf = gst_avi_demux_invert (stream, buf);
gst_pad_query_position (stream->pad, GST_FORMAT_TIME,