Changeset 5925 for pjproject

Timestamp:

Dec 17, 2018 3:46:35 AM (5 years ago)

Author:

nanang

Message:

Close #2171:

• Apply returned frame quality filter in OpenH264 decoder (drop the frame if decoder returns dsRefLost dsNoParamSets, dsDepLayerLost).
• Only publish keyframe missing event when decoder returns non-dsErrorFree (was always publishing the event when no frame is returned, while decoder may return dsErrorFree and no frame returned, e.g: when decoding parameter sets).
• Added a bit more logs for debugging.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

@@ -964 +964 @@
     unsigned i, frm_cnt;
     pj_status_t status = PJ_SUCCESS;
+    DECODING_STATE ret;
 
     PJ_ASSERT_RETURN(codec && count && packets && out_size && output,
@@ -1046 +1047 @@
         oh264_data->dec->DecodeFrame2( start, frm_size, pData, &sDstBufInfo);
 
-        if (sDstBufInfo.iBufferStatus == 1) {
+        if (0 && sDstBufInfo.iBufferStatus == 1) {
+            // Better to just get the frame later after all NALs are consumed
+            // by the decoder, it should have the best quality and save some
+            // CPU load.
             /* May overwrite existing frame but that's ok. */
             status = oh264_got_decoded_frame(codec, oh264_data, pData,
@@ -1069 +1073 @@
     pj_bzero(pData, sizeof(pData));
     pj_bzero(&sDstBufInfo, sizeof (SBufferInfo));
-    oh264_data->dec->DecodeFrame2 (NULL, 0, pData, &sDstBufInfo);
-
-    if (sDstBufInfo.iBufferStatus == 1) {
+    ret = oh264_data->dec->DecodeFrame2 (NULL, 0, pData, &sDstBufInfo);
+
+    if (sDstBufInfo.iBufferStatus == 1 &&
+        !(ret & dsRefLost) && !(ret & dsNoParamSets) &&
+        !(ret & dsDepLayerLost))
+    {
         /* Overwrite existing output frame and that's ok, because we assume
          * newer frame have better quality because it has more NALs
@@ -1081 +1088 @@
     }
 
-    if (!has_frame) {
+    if (ret != dsErrorFree) {
         pjmedia_event event;
 
@@ -1090 +1097 @@
                               PJMEDIA_EVENT_PUBLISH_DEFAULT);
 
-        PJ_LOG(5,(THIS_FILE, "Decode couldn't produce picture, "
-                  "input nframes=%d, concatenated size=%d bytes",
-                  count, whole_len));
-
+        if (has_frame) {
+            PJ_LOG(5,(oh264_data->pool->obj_name,
+                      "Decoder returned non error free frame, ret=%d", ret));
+        }
+    }
+        
+    if (!has_frame) {
         output->type = PJMEDIA_FRAME_TYPE_NONE;
         output->size = 0;
         output->timestamp = packets[0].timestamp;
+
+        PJ_LOG(5,(THIS_FILE, "Decode couldn't produce picture, "
+                  "input nframes=%d, concatenated size=%d bytes, ret=%d",
+                  count, whole_len, ret));
     }