Changeset 3420 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c

Timestamp:

Feb 24, 2011 7:47:55 AM (14 years ago)

Author:

nanang

Message:

Re #1182:

• Added video stream interface in vid_stream.h, the video stream will be able to handle different video formats in encoding and decoding direction.
• Renamed video device stream class identifiers from 'pjmedia_vid_stream*' to 'pjmedia_vid_dev_stream*' as 'pjmedia_vid_stream' is used by video stream interface.
• Added ffmpeg video capability to be able to parse SDP format param for H263 and also decide video format for encoding direction based on remote preference and local format-capability setting.
• Added some new APIs in jitter buffer for handling video stream: pjmedia_jbuf_put_frame3(), pjmedia_jbuf_get_frame3(), pjmedia_jbuf_peek_frame(), and pjmedia_jbuf_remove_frame().
• Moved pjmedia_stream_info_from_sdp() from session to stream

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c

@@ -29 +29 @@
 static pjmedia_vid_codec_mgr *def_vid_codec_mgr;
 
-/* Definition of default codecs parameters */
-struct pjmedia_vid_codec_default_param
-{
-    pjmedia_vid_codec_param     *param;
+
+/*
+ * Codec manager maintains array of these structs for each supported
+ * codec.
+ */
+typedef struct pjmedia_vid_codec_desc
+{
+    pjmedia_vid_codec_info           info;      /**< Codec info.            */
+    pjmedia_codec_id                 id;        /**< Fully qualified name   */
+    pjmedia_codec_priority           prio;      /**< Priority.              */
+    pjmedia_vid_codec_factory       *factory;   /**< The factory.           */
+    pjmedia_vid_codec_param         *def_param; /**< Default codecs 
+                                                     parameters.            */
+} pjmedia_vid_codec_desc;
+
+
+/* The declaration of video codec manager */
+struct pjmedia_vid_codec_mgr
+{
+    /** Codec manager mutex. */
+    pj_mutex_t                  *mutex;
+
+    /** List of codec factories registered to codec manager. */
+    pjmedia_vid_codec_factory    factory_list;
+
+    /** Number of supported codecs. */
+    unsigned                     codec_cnt;
+
+    /** Array of codec descriptor. */
+    pjmedia_vid_codec_desc       codec_desc[PJMEDIA_CODEC_MGR_MAX_CODECS];
+
 };
+
 
 
@@ -94 +122 @@
 PJ_DEF(pjmedia_vid_codec_mgr*) pjmedia_vid_codec_mgr_instance(void)
 {
-    pj_assert(def_vid_codec_mgr);
+    //pj_assert(def_vid_codec_mgr);
     return def_vid_codec_mgr;
 }
@@ -616 +644 @@
                   &param->dec_fmtp.param[i].val);
     }
-    for (i = 0; i < param->dec_fmtp.cnt; ++i) {
-        pj_strdup(pool, &p->dec_fmtp.param[i].name, 
-                  &param->dec_fmtp.param[i].name);
-        pj_strdup(pool, &p->dec_fmtp.param[i].val, 
-                  &param->dec_fmtp.param[i].val);
+    for (i = 0; i < param->enc_fmtp.cnt; ++i) {
+        pj_strdup(pool, &p->enc_fmtp.param[i].name, 
+                  &param->enc_fmtp.param[i].name);
+        pj_strdup(pool, &p->enc_fmtp.param[i].val, 
+                  &param->enc_fmtp.param[i].val);
     }