From c8e54391c161539013e99c804be94b7a1c0a86c7 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 4 Oct 2004 16:11:30 +0000 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ ext/ffmpeg/gstffmpegcodecmap.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index cf3a215a1d..05604b3850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-04 Ronald S. Bultje + + * 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 * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop): diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 3a787b16f8..658f80d1de 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -177,6 +177,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, caps = GST_FF_VID_CAPS_NEW ("video/x-pn-realvideo", "systemstream", G_TYPE_BOOLEAN, FALSE, "rmversion", G_TYPE_INT, version, NULL); + if (context) { + gst_caps_set_simple (caps, + "rmsubid", GST_TYPE_FOURCC, context->sub_id, NULL); + } } while (0); break; @@ -1183,6 +1187,16 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id, } while (0); 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: break; }