Changeset 790:db0b1a806f4a in mediastreamer2

Timestamp:

Dec 2, 2009 4:49:37 PM (3 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

update to work with new versions of x264

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@778 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2/plugins/msx264

Files:

• NEWS (modified) (1 diff)
• README (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• src/msx264.c (modified) (6 diffs)

linphone/mediastreamer2/plugins/msx264/NEWS

@@ +1 @@
+Wednesday December 2, 2009: msx264-1.3.0
+        - use new official x264 support of multislicing (forked version no more required)
+
 Friday July 4, 2009 : msx264-1.2.0
         - modified to compile against new multisliced version of x264 to allow packetization-mode=0

linphone/mediastreamer2/plugins/msx264/README

@@ -2 +2 @@
 It is based on ffmpeg for decoding and x264 for encoding.
 
-It works with any version of x264. However if you want better performance and interroperability, it is 
-highly recommended to use the modified multiscling-enabled x264 available from linphone.org.
-This patch enables multi-slicing, ie smaller video packets that fit into the network mtu.
-It enables RFC3984 packetization-mode=0 to work.
-You can download this special x264 here:
-http://download.savannah.gnu.org/releases/linphone/plugins/sources/x264-snapshot-20090704-linphone-org.tar.gz
+It works with x264 version later to september 2009. 
+So:
 
-So:
-* compile x264-snapshot-20090704-linphone-org.tar.gz with ./configure && make && make install
-* compile msx264 with ./configure --enable-hacked-x264 && make && make install
+* compile msx264 with ./configure && make && make install
 
 
@@ -20 +14 @@
 The linphone.org version of x264 was inspired by a patch submitted on x264-devel mailing list:
 http://mailman.videolan.org/pipermail/x264-devel/2008-April/004427.html
+http://download.savannah.gnu.org/releases/linphone/plugins/sources/x264-snapshot-20090704-linphone-org.tar.gz
+This version is no more required since in august 2009, x264 team introduces new parameters
+controlling slicing.

linphone/mediastreamer2/plugins/msx264/configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([msx264],[1.2.0])
+AC_INIT([msx264],[1.3.0])
 
 AM_INIT_AUTOMAKE([tar-ustar])
@@ -61 +61 @@
 PKG_CHECK_MODULES(MEDIASTREAMER, mediastreamer >= 2.1.0)
 
-PKG_CHECK_MODULES(X264, x264 >= 0.58.0)
+PKG_CHECK_MODULES(X264, x264 >= 0.67.0)
 
-AC_ARG_ENABLE(hacked-x264,
-[  --enable-hacked-x264       Turn on compilation over a patched x264 that allows multislicing [default=no]],
-[hacked_x264=$enableval],
-[hacked_x264=no]
-)
 
 dnl test for ffmpeg presence

linphone/mediastreamer2/plugins/msx264/src/msx264.c

@@ -71 +71 @@
         EncData *d=(EncData*)f->data;
         x264_param_t params;
+        
         rfc3984_init(&d->packer);
         rfc3984_set_mode(&d->packer,d->mode);
         rfc3984_enable_stap_a(&d->packer,FALSE);
+        
         x264_param_default(&params);
+        params.i_threads=1;
+        params.i_sync_lookahead=0;
         params.i_width=d->vsize.width;
         params.i_height=d->vsize.height;
         params.i_fps_num=(int)d->fps;
         params.i_fps_den=1;
-#ifdef HACKED_X264
-        ms_message("Lucky guy, you have a hacked x264 lib that allows multislicing !");
-        params.i_max_nalu_size=ms_get_payload_max_size()-100; /*-100 security margin*/
-#endif
+        params.i_slice_max_size=ms_get_payload_max_size()-100; /*-100 security margin*/
         /*params.i_level_idc=30;*/
+        
         params.rc.i_rc_method = X264_RC_ABR;
         params.rc.i_bitrate=(int)( ( ((float)d->bitrate)*0.8)/1000.0);
@@ -90 +92 @@
         params.rc.i_vbv_buffer_size=params.rc.i_vbv_max_bitrate;
         params.rc.f_vbv_buffer_init=0.5;
+        params.rc.i_lookahead=0;
         /*enable this by config ?*/
         /*
@@ -109 +112 @@
         for (i=0;i<num_nals;++i){
                 m=allocb(xnals[i].i_payload+10,0);
-                /*
-                x264_nal_encode(m->b_wptr, &bytes, 0, &xnals[i] );
-                m->b_wptr+=bytes;
-                */
-                *m->b_wptr=( 0x00 << 7 ) | ( xnals[i].i_ref_idc << 5 ) | xnals[i].i_type;
-                m->b_wptr++;
-                memcpy(m->b_wptr,xnals[i].p_payload,xnals[i].i_payload);
-                m->b_wptr+=xnals[i].i_payload;
+                
+                memcpy(m->b_wptr,xnals[i].p_payload+4,xnals[i].i_payload-4);
+                m->b_wptr+=xnals[i].i_payload-4;
                 if (xnals[i].i_type==7) {
                         ms_message("A SPS is being sent.");
@@ -150 +148 @@
                         xpic.i_qpplus1=0;
                         xpic.i_pts=d->framenum;
+                        xpic.param=NULL;
                         xpic.img.i_csp=X264_CSP_I420;
                         xpic.img.i_plane=3;
@@ -160 +159 @@
                         xpic.img.plane[2]=pic.planes[2];
                         xpic.img.plane[3]=0;
-                        if (x264_encoder_encode(d->enc,&xnals,&num_nals,&xpic,&oxpic)==0){
+                        if (x264_encoder_encode(d->enc,&xnals,&num_nals,&xpic,&oxpic)>=0){
                                 x264_nals_to_msgb(xnals,num_nals,&nalus);
                                 rfc3984_pack(&d->packer,&nalus,f->outputs[0],ts);
@@ -270 +269 @@
         .id=MS_FILTER_PLUGIN_ID,
         .name="MSX264Enc",
-#ifdef HACKED_X264
         .text="A H264 encoder based on x264 project (with multislicing enabled)",
-#else
-        .text="A H264 encoder based on x264 project.",
-#endif
         .category=MS_FILTER_ENCODER,
         .enc_fmt="H264",