Changeset 3469

Timestamp:

Mar 22, 2011 9:43:24 AM (14 years ago)

Author:

nanang

Message:

Re #1219: updated stack aligning mechanism using PJ_ALIGN_DATA (see ticket #1220).

File:

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

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

@@ -253 +253 @@
     {
         {PJMEDIA_FORMAT_H263,   {"H263",4},         PJMEDIA_RTP_PT_H263},
-        0,                      1000000,    2000000,
-        &h263_packetize, &h263_unpacketize, &h263_parse_fmtp,
-        {2, { {{"CIF",3}, {"2",1}}, {{"QCIF",4}, {"1",1}}, } },
     },
     {
@@ -1230 +1227 @@
     int out_buf_len = output_buf_len;
     int err;
-    unsigned i;
+
+    /* 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
+     * 16-bytes aligned stack here, in case it's not managed by the ffmpeg.
+     */
+    PJ_ALIGN_DATA(pj_uint32_t i[4], 16);
 
     /* Check if encoder has been opened */
@@ -1238 +1240 @@
     avframe.pts = input->timestamp.u64;
     
-    for (i = 0; i < ff->enc_vfi->plane_cnt; ++i) {
-        avframe.data[i] = p;
-        avframe.linesize[i] = ff->enc_vafp.strides[i];
-        p += ff->enc_vafp.plane_bytes[i];
-    }
-
-#if 0 && defined(_MSC_VER)
-    /* Align stack for MSVC environment to avoid 'random' crash, as advised in
-     * http://ffmpeg.arrozcru.org/forum/viewtopic.php?f=1&t=549
-     */
-#   define VHALIGNCALL16(x) \
-    {\
-        _asm { mov ebx, esp }\
-        _asm { and esp, 0xfffffff0 }\
-        _asm { sub esp, 12 }\
-        _asm { push ebx }\
-        x;\
-        _asm { pop ebx }\
-        _asm { mov esp, ebx }\
-     }
-#else
-#   define VHALIGNCALL16(x)     x
-#endif
-
-    VHALIGNCALL16(err = avcodec_encode_video(ff->enc_ctx, out_buf, 
-                                             out_buf_len, &avframe));
-
+    for (i[0] = 0; i[0] < ff->enc_vfi->plane_cnt; ++i[0]) {
+        avframe.data[i[0]] = p;
+        avframe.linesize[i[0]] = ff->enc_vafp.strides[i[0]];
+        p += ff->enc_vafp.plane_bytes[i[0]];
+    }
+
+    err = avcodec_encode_video(ff->enc_ctx, out_buf, out_buf_len, &avframe);
     if (err < 0) {
         print_ffmpeg_err(err);