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

Timestamp:

Apr 13, 2011 6:06:21 PM (13 years ago)

Author:

bennylp

Message:

Re #1219: attempt to fix crash in H.264 decoding

File:

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

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

@@ -943 +943 @@
     char errbuf[512];
     if (av_strerror(err, errbuf, sizeof(errbuf)) >= 0)
-        PJ_LOG(1, (THIS_FILE, "ffmpeg err %d: %s", err, errbuf));
+        PJ_LOG(5, (THIS_FILE, "ffmpeg err %d: %s", err, errbuf));
 #else
-    PJ_LOG(1, (THIS_FILE, "ffmpeg err %d", err));
+    PJ_LOG(5, (THIS_FILE, "ffmpeg err %d", err));
 #endif
 
@@ -1374 +1374 @@
          */
         if (ff->dec_ctx->pix_fmt != ff->expected_dec_fmt ||
-            ff->dec_ctx->coded_width != (int)vafp->size.w ||
-            ff->dec_ctx->coded_height != (int)vafp->size.h)
+            ff->dec_ctx->width != (int)vafp->size.w ||
+            ff->dec_ctx->height != (int)vafp->size.h)
         {
             pjmedia_format_id new_fmt_id;
@@ -1388 +1388 @@
             /* Update decoder format in param */
             ff->param.dec_fmt.id = new_fmt_id;
-            ff->param.dec_fmt.det.vid.size.w = ff->dec_ctx->coded_width;
-            ff->param.dec_fmt.det.vid.size.h = ff->dec_ctx->coded_height;
+            ff->param.dec_fmt.det.vid.size.w = ff->dec_ctx->width;
+            ff->param.dec_fmt.det.vid.size.h = ff->dec_ctx->height;
 
             /* Re-init format info and apply-param of decoder */
@@ -1404 +1404 @@
             /* Notify application via the bit_info field of pjmedia_frame */
             output->bit_info = PJMEDIA_VID_CODEC_EVENT_FMT_CHANGED;
-
-            /* Check provided buffer size after format changed */
-            if (vafp->framebytes > output_buf_len)
-                return PJ_ETOOSMALL;
         }
+
+        /* Check provided buffer size after format changed */
+        if (vafp->framebytes > output_buf_len)
+            return PJ_ETOOSMALL;
 
         /* Get the decoded data */