胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
b360fe27 1 parent 496f689d

remove libaacplus.

内嵌 并排对比
正在显示 7 个修改的文件 包含 18 行增加 和 27 行删除
@@ -16,8 +16,6 @@ CherryPy-3.2.4.zip @@ -16,8 +16,6 @@ CherryPy-3.2.4.zip
16 ffmpeg-2.1.1.tar.gz 16 ffmpeg-2.1.1.tar.gz
17 yasm-1.2.0.tar.gz 17 yasm-1.2.0.tar.gz
18 lame-3.99.5.tar.gz 18 lame-3.99.5.tar.gz
19 -libaacplus-2.0.2.tar.gz  
20 -libaacplus-patch-26410-800.zip (26410-800.zip)  
21 speex-1.2rc1.zip 19 speex-1.2rc1.zip
22 x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) 20 x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
23 for srs to support live stream transcoding. 21 for srs to support live stream transcoding.
@@ -55,12 +53,6 @@ links: @@ -55,12 +53,6 @@ links:
55 lame: 53 lame:
56 http://sourceforge.net/projects/lame/ 54 http://sourceforge.net/projects/lame/
57 http://nchc.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz 55 http://nchc.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz
58 - aacplus:  
59 - http://217.20.164.161/~tipok/aacplus/  
60 - http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz  
61 - aacplus-patch:  
62 - http://www.3gpp.org/DynaReport/26410.htm  
63 - http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip  
64 yasm: 56 yasm:
65 http://yasm.tortall.net/ 57 http://yasm.tortall.net/
66 http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz 58 http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
@@ -82,7 +82,7 @@ vhost demo.srs.com { @@ -82,7 +82,7 @@ vhost demo.srs.com {
82 vpreset superfast; 82 vpreset superfast;
83 vparams { 83 vparams {
84 } 84 }
85 - acodec libaacplus; 85 + acodec libfdk_aac;
86 abitrate 45; 86 abitrate 45;
87 asample_rate 44100; 87 asample_rate 44100;
88 achannels 2; 88 achannels 2;
@@ -105,7 +105,7 @@ vhost demo.srs.com { @@ -105,7 +105,7 @@ vhost demo.srs.com {
105 vpreset fast; 105 vpreset fast;
106 vparams { 106 vparams {
107 } 107 }
108 - acodec libaacplus; 108 + acodec libfdk_aac;
109 abitrate 40; 109 abitrate 40;
110 asample_rate 44100; 110 asample_rate 44100;
111 achannels 2; 111 achannels 2;
@@ -151,7 +151,7 @@ vhost players { @@ -151,7 +151,7 @@ vhost players {
151 vparams { 151 vparams {
152 g 100; 152 g 100;
153 } 153 }
154 - acodec libaacplus; 154 + acodec libfdk_aac;
155 abitrate 30; 155 abitrate 30;
156 asample_rate 44100; 156 asample_rate 44100;
157 achannels 2; 157 achannels 2;
@@ -22,7 +22,7 @@ vhost __defaultVhost__ { @@ -22,7 +22,7 @@ vhost __defaultVhost__ {
22 vpreset medium; 22 vpreset medium;
23 vparams { 23 vparams {
24 } 24 }
25 - acodec libaacplus; 25 + acodec libfdk_aac;
26 abitrate 70; 26 abitrate 70;
27 asample_rate 44100; 27 asample_rate 44100;
28 achannels 2; 28 achannels 2;
@@ -788,12 +788,11 @@ vhost example.transcode.srs.com { @@ -788,12 +788,11 @@ vhost example.transcode.srs.com {
788 refs 10; 788 refs 10;
789 } 789 }
790 # audio encoder name. can be: 790 # audio encoder name. can be:
791 - # libaacplus: use aac(libaacplus) audio encoder.  
792 # libfdk_aac: use aac(libfdk_aac) audio encoder. 791 # libfdk_aac: use aac(libfdk_aac) audio encoder.
793 # copy: donot encoder the audio stream, copy it. 792 # copy: donot encoder the audio stream, copy it.
794 # an: disable audio output. 793 # an: disable audio output.
795 - acodec libaacplus;  
796 - # audio bitrate, in kbps. [16, 72] for libaacplus. 794 + acodec libfdk_aac;
  795 + # audio bitrate, in kbps. [16, 72] for libfdk_aac.
797 abitrate 70; 796 abitrate 70;
798 # audio sample rate. for flv/rtmp, it must be: 797 # audio sample rate. for flv/rtmp, it must be:
799 # 44100,22050,11025,5512 798 # 44100,22050,11025,5512
@@ -841,7 +840,7 @@ vhost mirror.transcode.srs.com { @@ -841,7 +840,7 @@ vhost mirror.transcode.srs.com {
841 vpreset superfast; 840 vpreset superfast;
842 vparams { 841 vparams {
843 } 842 }
844 - acodec libaacplus; 843 + acodec libfdk_aac;
845 abitrate 45; 844 abitrate 45;
846 asample_rate 44100; 845 asample_rate 44100;
847 achannels 2; 846 achannels 2;
@@ -874,7 +873,7 @@ vhost crop.transcode.srs.com { @@ -874,7 +873,7 @@ vhost crop.transcode.srs.com {
874 vpreset superfast; 873 vpreset superfast;
875 vparams { 874 vparams {
876 } 875 }
877 - acodec libaacplus; 876 + acodec libfdk_aac;
878 abitrate 45; 877 abitrate 45;
879 asample_rate 44100; 878 asample_rate 44100;
880 achannels 2; 879 achannels 2;
@@ -905,7 +904,7 @@ vhost logo.transcode.srs.com { @@ -905,7 +904,7 @@ vhost logo.transcode.srs.com {
905 vpreset superfast; 904 vpreset superfast;
906 vparams { 905 vparams {
907 } 906 }
908 - acodec libaacplus; 907 + acodec libfdk_aac;
909 abitrate 45; 908 abitrate 45;
910 asample_rate 44100; 909 asample_rate 44100;
911 achannels 2; 910 achannels 2;
@@ -925,7 +924,7 @@ vhost audio.transcode.srs.com { @@ -925,7 +924,7 @@ vhost audio.transcode.srs.com {
925 engine acodec { 924 engine acodec {
926 enabled on; 925 enabled on;
927 vcodec copy; 926 vcodec copy;
928 - acodec libaacplus; 927 + acodec libfdk_aac;
929 abitrate 45; 928 abitrate 45;
930 asample_rate 44100; 929 asample_rate 44100;
931 achannels 2; 930 achannels 2;
@@ -944,7 +943,7 @@ vhost vn.transcode.srs.com { @@ -944,7 +943,7 @@ vhost vn.transcode.srs.com {
944 engine vn { 943 engine vn {
945 enabled on; 944 enabled on;
946 vcodec vn; 945 vcodec vn;
947 - acodec libaacplus; 946 + acodec libfdk_aac;
948 abitrate 45; 947 abitrate 45;
949 asample_rate 44100; 948 asample_rate 44100;
950 achannels 2; 949 achannels 2;
@@ -996,7 +995,7 @@ vhost all.transcode.srs.com { @@ -996,7 +995,7 @@ vhost all.transcode.srs.com {
996 bf 3; 995 bf 3;
997 refs 10; 996 refs 10;
998 } 997 }
999 - acodec libaacplus; 998 + acodec libfdk_aac;
1000 abitrate 70; 999 abitrate 70;
1001 asample_rate 44100; 1000 asample_rate 44100;
1002 achannels 2; 1001 achannels 2;
@@ -1018,7 +1017,7 @@ vhost all.transcode.srs.com { @@ -1018,7 +1017,7 @@ vhost all.transcode.srs.com {
1018 vpreset medium; 1017 vpreset medium;
1019 vparams { 1018 vparams {
1020 } 1019 }
1021 - acodec libaacplus; 1020 + acodec libfdk_aac;
1022 abitrate 70; 1021 abitrate 70;
1023 asample_rate 44100; 1022 asample_rate 44100;
1024 achannels 2; 1023 achannels 2;
@@ -1038,7 +1037,7 @@ vhost all.transcode.srs.com { @@ -1038,7 +1037,7 @@ vhost all.transcode.srs.com {
1038 vpreset fast; 1037 vpreset fast;
1039 vparams { 1038 vparams {
1040 } 1039 }
1041 - acodec libaacplus; 1040 + acodec libfdk_aac;
1042 abitrate 60; 1041 abitrate 60;
1043 asample_rate 44100; 1042 asample_rate 44100;
1044 achannels 2; 1043 achannels 2;
@@ -1058,7 +1057,7 @@ vhost all.transcode.srs.com { @@ -1058,7 +1057,7 @@ vhost all.transcode.srs.com {
1058 vpreset superfast; 1057 vpreset superfast;
1059 vparams { 1058 vparams {
1060 } 1059 }
1061 - acodec libaacplus; 1060 + acodec libfdk_aac;
1062 abitrate 45; 1061 abitrate 45;
1063 asample_rate 44100; 1062 asample_rate 44100;
1064 achannels 2; 1063 achannels 2;
@@ -1069,7 +1068,7 @@ vhost all.transcode.srs.com { @@ -1069,7 +1068,7 @@ vhost all.transcode.srs.com {
1069 engine vcopy { 1068 engine vcopy {
1070 enabled on; 1069 enabled on;
1071 vcodec copy; 1070 vcodec copy;
1072 - acodec libaacplus; 1071 + acodec libfdk_aac;
1073 abitrate 45; 1072 abitrate 45;
1074 asample_rate 44100; 1073 asample_rate 44100;
1075 achannels 2; 1074 achannels 2;
@@ -1117,7 +1116,7 @@ vhost ffempty.transcode.srs.com { @@ -1117,7 +1116,7 @@ vhost ffempty.transcode.srs.com {
1117 vpreset superfast; 1116 vpreset superfast;
1118 vparams { 1117 vparams {
1119 } 1118 }
1120 - acodec libaacplus; 1119 + acodec libfdk_aac;
1121 abitrate 45; 1120 abitrate 45;
1122 asample_rate 44100; 1121 asample_rate 44100;
1123 achannels 2; 1122 achannels 2;
@@ -17,7 +17,7 @@ vhost __defaultVhost__ { @@ -17,7 +17,7 @@ vhost __defaultVhost__ {
17 engine ff { 17 engine ff {
18 enabled on; 18 enabled on;
19 vcodec copy; 19 vcodec copy;
20 - acodec libaacplus; 20 + acodec libfdk_aac;
21 abitrate 45; 21 abitrate 45;
22 asample_rate 44100; 22 asample_rate 44100;
23 achannels 2; 23 achannels 2;