Changeset 3494

Timestamp:

Apr 1, 2011 7:12:59 AM (14 years ago)

Author:

nanang

Message:

Re #1219:

• Fixed assertion in H263 & H264 packetizer caused by invalid unpack_last_sync_pos after packet loss.
• Updated ffmpeg_codecs.c to lower H264 video encoding latency.

Location:

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec

Files:

• ffmpeg_codecs.c (modified) (2 diffs)
• h263_packetizer.c (modified) (1 diff)
• h264_packetizer.c (modified) (1 diff)

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

@@ -296 +296 @@
         ctx->qmax = 51;
         ctx->qcompress = 0.6f;
-
-        ctx->flags |= CODEC_FLAG_LOW_DELAY;
     }
 
@@ -922 +920 @@
         ctx->opaque = ff;
 
+        /* Set no delay, note that this may cause some codec functionals
+         * not working (e.g: rate control).
+         */
+        ctx->rc_lookahead = 0;
+
         /* Open ffmpeg codec */
         pj_mutex_lock(ff_mutex);

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

@@ -186 +186 @@
         return PJ_EINVAL;
     }
+
+    /* Reset last sync point for every new picture bitstream */
+    if (*bits_pos == 0)
+        pktz->unpack_last_sync_pos = 0;
 
     /* Get payload header info */

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

@@ -368 +368 @@
     }
 
+    /* Reset last sync point for every new picture bitstream */
+    if (*bits_pos == 0)
+        pktz->unpack_last_sync_pos = 0;
+
     nal_type = *payload & 0x1F;
     if (nal_type >= NAL_TYPE_SINGLE_NAL_MIN &&