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

Timestamp:

Apr 12, 2011 6:24:19 PM (13 years ago)

Author:

nanang

Message:

Re #1219:

• Implemented validation of H.264 level in codec param.
• Update H.264 packetization setting to always send single NAL unit, for better compatibility.
• Update H.264 SDP custom negotiation to be permissive.

File:

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

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

@@ -261 +261 @@
               {{"QCIF",4},  {"1",1}}, } },
     },
-/*
     {
         {PJMEDIA_FORMAT_H263, PJMEDIA_RTP_PT_H263, {"H263",4}},
@@ -269 +268 @@
               {{"QCIF",4},  {"1",1}}, } },
     },
-*/
     {
         {PJMEDIA_FORMAT_H263,   PJMEDIA_RTP_PT_H263,    {"H263",4}},
@@ -313 +311 @@
     /* Create packetizer */
     pktz_cfg.mtu = ff->param.enc_mtu;
+#if 0
     if (data->fmtp.packetization_mode == 0)
         pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL;
@@ -319 +318 @@
     else
         return PJ_ENOTSUP;
+#else
+    if (data->fmtp.packetization_mode!=
+                                PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL &&
+        data->fmtp.packetization_mode!=
+                                PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED)
+    {
+        return PJ_ENOTSUP;
+    }
+    /* Better always send in single NAL mode for better compatibility */
+    pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL;
+#endif
 
     status = pjmedia_h264_packetizer_create(ff->pool, &pktz_cfg, &data->pktz);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Apply SDP fmtp to format in codec param */
+    status = pjmedia_vid_codec_h264_apply_fmtp(&ff->param);
     if (status != PJ_SUCCESS)
         return status;
@@ -354 +369 @@
 
         /* Apply profile level. */
-        PJ_TODO(apply_h264_profile_level_in_pjmedia_vid_codec_param);
         ctx->level    = data->fmtp.level;
 
@@ -1246 +1260 @@
     int out_buf_len = output_buf_len;
     int err;
-    AVRational src_timebase;
+    //AVRational src_timebase;
     /* For some reasons (e.g: SSE/MMX usage), the avcodec_encode_video() must
      * have stack aligned to 16 bytes. Let's try to be safe by preparing the