Changeset 3500 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

Timestamp:

Apr 6, 2011 1:55:01 PM (14 years ago)

Author:

nanang

Message:

Re #1186:

• Added custom negotiation callback mechanism in SDP negotiator, mainly for specific formats that require SDP fmtp negotiation.
• Modified video codec ID string to use encoding name+payload type (was encoding name+clock rate), also added encoding description in video codec info, so duplicated codecs (e.g: multiple H264 configurations) can be differentiated.
• Few enhancements for H264 in ffmpeg wrapper (e.g: added proper profile-id & packetization-mode setup).

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c (modified) (11 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -176 +176 @@
                       pj_size_t bits_len, unsigned *bits_pos)
 
+#define FUNC_FMT_MATCH(name) \
+    pj_status_t(name)(pj_pool_t *pool, \
+                      pjmedia_sdp_media *offer, unsigned o_fmt_idx, \
+                      pjmedia_sdp_media *answer, unsigned a_fmt_idx, \
+                      unsigned option)
+
+
+/* Type definition of codec specific functions */
 typedef FUNC_PACKETIZE(*func_packetize);
 typedef FUNC_UNPACKETIZE(*func_unpacketize);
 typedef pj_status_t (*func_preopen)     (ffmpeg_private *ff);
 typedef pj_status_t (*func_postopen)    (ffmpeg_private *ff);
+typedef FUNC_FMT_MATCH(*func_sdp_fmt_match);
 
 
@@ -187 +196 @@
     /* Predefined info */
     pjmedia_vid_codec_info       info;
-    pjmedia_format_id            base_fmt_id;
+    pjmedia_format_id            base_fmt_id;   /**< Some codecs may be exactly
+                                                     same or compatible with
+                                                     another codec, base format
+                                                     will tell the initializer
+                                                     to copy this codec desc
+                                                     from its base format   */
     pj_uint32_t                  avg_bps;
     pj_uint32_t                  max_bps;
@@ -194 +208 @@
     func_preopen                 preopen;
     func_preopen                 postopen;
+    func_sdp_fmt_match           sdp_fmt_match;
     pjmedia_codec_fmtp           dec_fmtp;
 
@@ -217 +232 @@
 {
     {
-        {PJMEDIA_FORMAT_H264,   {"H264",4},         PJMEDIA_RTP_PT_H264},
-        0,      500000,    1000000,
+        {PJMEDIA_FORMAT_H264, PJMEDIA_RTP_PT_H264, {"H264",4},
+         {"Constrained Baseline (level=30, pack=1)", 39}},
+        0,      128000,    1000000,
         &h264_packetize, &h264_unpacketize, &h264_preopen, &h264_postopen,
+        &pjmedia_vid_codec_h264_match_sdp,
         /* Leading space for better compatibility (strange indeed!) */
-        {2, { {{" profile-level-id",17},    {"42e01e",6}}, 
+        {2, { {{"profile-level-id",16},    {"42e01e",6}}, 
               {{" packetization-mode",19},  {"1",1}}, } },
     },
     {
-        {PJMEDIA_FORMAT_H263P,  {"H263-1998",9},    PJMEDIA_RTP_PT_H263P},
+        {PJMEDIA_FORMAT_H264, PJMEDIA_RTP_PT_H264_RSV1, {"H264",4},
+         {"Baseline (level=30, pack=1)", 27}},
+        PJMEDIA_FORMAT_H264,    128000,    1000000,
+        &h264_packetize, &h264_unpacketize, &h264_preopen, &h264_postopen,
+        &pjmedia_vid_codec_h264_match_sdp,
+        {2, { {{"profile-level-id",16},    {"42001e",6}}, 
+              {{" packetization-mode",19},  {"1",1}}, } },
+    },
+    {
+        {PJMEDIA_FORMAT_H263P, PJMEDIA_RTP_PT_H263P, {"H263-1998",9}},
         PJMEDIA_FORMAT_H263,    1000000,    2000000,
-        &h263_packetize, &h263_unpacketize, &h263_preopen, NULL,
+        &h263_packetize, &h263_unpacketize, &h263_preopen, NULL, NULL,
         {2, { {{"CIF",3},   {"1",1}}, 
               {{"QCIF",4},  {"1",1}}, } },
     },
     {
-        {PJMEDIA_FORMAT_H263,   {"H263",4},         PJMEDIA_RTP_PT_H263},
+        {PJMEDIA_FORMAT_H263,   PJMEDIA_RTP_PT_H263,    {"H263",4}},
     },
     {
-        {PJMEDIA_FORMAT_H261,   {"H261",4},         PJMEDIA_RTP_PT_H261},
+        {PJMEDIA_FORMAT_H261,   PJMEDIA_RTP_PT_H261,    {"H261",4}},
     },
     {
-        {PJMEDIA_FORMAT_MJPEG,  {"JPEG",4},         PJMEDIA_RTP_PT_JPEG},
+        {PJMEDIA_FORMAT_MJPEG,  PJMEDIA_RTP_PT_JPEG,    {"JPEG",4}},
     },
     {
-        {PJMEDIA_FORMAT_MPEG4,  {"MP4V",4}},
+        {PJMEDIA_FORMAT_MPEG4,  0,                      {"MP4V",4}},
     },
     {
-        {PJMEDIA_FORMAT_XVID,   {"XVID",4}},
+        {PJMEDIA_FORMAT_XVID,   0,                      {"XVID",4}},
         PJMEDIA_FORMAT_MPEG4,
     },
@@ -266 +292 @@
     ff->data = data;
 
+    /* Parse remote fmtp */
+    status = pjmedia_vid_codec_h264_parse_fmtp(&ff->param.enc_fmtp,
+                                               &data->fmtp);
+    if (status != PJ_SUCCESS)
+        return status;
+
     /* Create packetizer */
     pktz_cfg.mtu = ff->param.enc_mtu;
-    pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
+    if (data->fmtp.packetization_mode == 0)
+        pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL;
+    else if (data->fmtp.packetization_mode == 1)
+        pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
+    else
+        return PJ_ENOTSUP;
+
     status = pjmedia_h264_packetizer_create(ff->pool, &pktz_cfg, &data->pktz);
     if (status != PJ_SUCCESS)
@@ -276 +314 @@
         AVCodecContext *ctx = ff->enc_ctx;
 
-        status = pjmedia_vid_codec_parse_h264_fmtp(&ff->param.enc_fmtp,
-                                                   &data->fmtp);
-        if (status != PJ_SUCCESS)
-            return status;
-
+        /* Apply profile. Note that, for x264 backend, ffmpeg doesn't seem to
+         * use this profile param field, so let's try to apply it "manually".
+         */
         ctx->profile  = data->fmtp.profile_idc;
+        if (ctx->profile == FF_PROFILE_H264_BASELINE) {
+            /* Baseline profile settings (the most used profile in
+             * conversational/real-time communications).
+             */
+            ctx->coder_type = FF_CODER_TYPE_VLC;
+            ctx->max_b_frames = 0;
+            ctx->flags2 &= ~(CODEC_FLAG2_WPRED | CODEC_FLAG2_8X8DCT);
+            ctx->weighted_p_pred = 0;
+        } else if (ctx->profile == FF_PROFILE_H264_MAIN) {
+            ctx->flags2 &= ~CODEC_FLAG2_8X8DCT;
+        }
+
+        /* Apply profile constraint bits. */
+        // The x264 doesn't seem to support non-constrained (baseline) profile
+        // so this shouldn't be a problem (for now).
+        //PJ_TODO(set_h264_constraint_bits_properly_in_ffmpeg);
         if (data->fmtp.profile_iop) {
 #if defined(FF_PROFILE_H264_CONSTRAINED)
@@ -287 +339 @@
 #endif
         }
+
+        /* Apply profile level. */
+        PJ_TODO(apply_h264_profile_level_in_pjmedia_vid_codec_param);
         ctx->level    = data->fmtp.level;
-        PJ_TODO(set_h264_constrain_bits_properly_in_ffmpeg);
 
         /* Libx264 rejects the "broken" ffmpeg defaults, so just change some */
@@ -383 +437 @@
             (desc->info.fmt_id == info->fmt_id) &&
             ((desc->info.dir & info->dir) == info->dir) &&
-            pj_stricmp(&desc->info.encoding_name, &info->encoding_name)==0)
+            (desc->info.pt == info->pt))
         {
             return desc;
@@ -566 +620 @@
     }
 
-    /* Init unassigned encoder/decoder description from base codec */
+    /* Review all codecs for applying base format, registering format match for
+     * SDP negotiation, etc.
+     */
     for (i = 0; i < PJ_ARRAY_SIZE(codec_desc); ++i) {
         ffmpeg_codec_desc *desc = &codec_desc[i];
 
+        /* Init encoder/decoder description from base format */
         if (desc->base_fmt_id && (!desc->dec || !desc->enc)) {
             ffmpeg_codec_desc *base_desc = NULL;
@@ -606 +663 @@
             desc->info.dir |= copied_dir;
             desc->enabled = (desc->info.dir != PJMEDIA_DIR_NONE);
+            desc->info.has_rtp_pack = (desc->packetize != NULL) &&
+                                      (desc->unpacketize != NULL);
 
             if (copied_dir != PJMEDIA_DIR_NONE) {
@@ -617 +676 @@
             }
         }
+
+        /* Registering format match for SDP negotiation */
+        if (desc->sdp_fmt_match) {
+            status = pjmedia_sdp_neg_register_fmt_match_cb(
+                                                &desc->info.encoding_name,
+                                                desc->sdp_fmt_match);
+            pj_assert(status == PJ_SUCCESS);
+        }
     }