ext/ffmpeg/gstffmpegcodecmap.c: Negotiation fixes for real video codecs.

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_with_codecid):
Negotiation fixes for real video codecs.
This commit is contained in:
Ronald S. Bultje 2004-10-04 16:11:30 +00:00
parent c1daa360bb
commit c8e54391c1
2 changed files with 20 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2004-10-04 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_with_codecid):
Negotiation fixes for real video codecs.
2004-10-02 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-10-02 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop): * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop):

View file

@ -177,6 +177,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = GST_FF_VID_CAPS_NEW ("video/x-pn-realvideo", caps = GST_FF_VID_CAPS_NEW ("video/x-pn-realvideo",
"systemstream", G_TYPE_BOOLEAN, FALSE, "systemstream", G_TYPE_BOOLEAN, FALSE,
"rmversion", G_TYPE_INT, version, NULL); "rmversion", G_TYPE_INT, version, NULL);
if (context) {
gst_caps_set_simple (caps,
"rmsubid", GST_TYPE_FOURCC, context->sub_id, NULL);
}
} while (0); } while (0);
break; break;
@ -1183,6 +1187,16 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
} while (0); } while (0);
break; break;
case CODEC_ID_RV10:
case CODEC_ID_RV20:
do {
guint32 fourcc;
if (gst_structure_get_fourcc (str, "rmsubid", &fourcc))
context->sub_id = fourcc;
} while (0);
break;
default: default:
break; break;
} }