Changeset 4537 for pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

Timestamp:

Jun 19, 2013 6:47:43 AM (11 years ago)

Author:

riza

Message:

Re #1680: Add initial support for Win64

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

@@ -455 +455 @@
          */
         if (data->fmtp.sprop_param_sets_len) {
-            ctx->extradata_size = data->fmtp.sprop_param_sets_len;
+            ctx->extradata_size = (int)data->fmtp.sprop_param_sets_len;
             ctx->extradata = data->fmtp.sprop_param_sets;
         }
@@ -1289 +1289 @@
     ff->whole = (ff->param.packing == PJMEDIA_VID_PACKING_WHOLE);
     if (!ff->whole) {
-        ff->enc_buf_size = ff->enc_vafp.framebytes;
+        ff->enc_buf_size = (unsigned)ff->enc_vafp.framebytes;
         ff->enc_buf = pj_pool_alloc(ff->pool, ff->enc_buf_size);
 
-        ff->dec_buf_size = ff->dec_vafp.framebytes;
+        ff->dec_buf_size = (unsigned)ff->dec_vafp.framebytes;
         ff->dec_buf = pj_pool_alloc(ff->pool, ff->dec_buf_size);
     }
@@ -1421 +1421 @@
     PJ_ALIGN_DATA(pj_uint32_t i[4], 16);
 
-    if ((long)i & 0xF) {
+    if ((long)(pj_ssize_t)i & 0xF) {
         PJ_LOG(2,(THIS_FILE, "Stack alignment fails"));
     }
@@ -1503 +1503 @@
         whole_frm.size = ff->enc_buf_size;
         status = ffmpeg_codec_encode_whole(codec, opt, input,
-                                           whole_frm.size, &whole_frm);
+                                           (unsigned)whole_frm.size, 
+                                           &whole_frm);
         if (status != PJ_SUCCESS)
             return status;
@@ -1619 +1620 @@
                        (unsigned)ff->dec_buf_size,
                        (unsigned)ff->dec_vafp.framebytes));
-            ff->dec_buf_size = ff->dec_vafp.framebytes;
+            ff->dec_buf_size = (unsigned)ff->dec_vafp.framebytes;
             ff->dec_buf = pj_pool_alloc(ff->pool, ff->dec_buf_size);
         }
@@ -1682 +1683 @@
     av_init_packet(&avpacket);
     avpacket.data = (pj_uint8_t*)input->buf;
-    avpacket.size = input->size;
+    avpacket.size = (int)input->size;
 
     /* ffmpeg warns: