胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
574cf6a0 1 parent 00a25ee5

use libfdk_aac for srs2.

内嵌 并排对比
正在显示 5 个修改的文件 包含 37 行增加 和 35 行删除
@@ -19,9 +19,6 @@ echo "SRS_JOBS: ${SRS_JOBS}" @@ -19,9 +19,6 @@ echo "SRS_JOBS: ${SRS_JOBS}"
19 mkdir -p ${ff_build_dir} 19 mkdir -p ${ff_build_dir}
20 mkdir -p ${ff_release_dir} 20 mkdir -p ${ff_release_dir}
21 21
22 -# for ubuntu14, donot compile libaacplus.  
23 -UBUNTU14=NO;grep -in "Ubuntu 14." /etc/issue >/dev/null 2>&1; if [[ $? -eq 0 ]]; then UBUNTU14=YES; fi  
24 -  
25 # yasm for libx264 22 # yasm for libx264
26 ff_yasm_bin=${ff_release_dir}/bin/yasm 23 ff_yasm_bin=${ff_release_dir}/bin/yasm
27 if [[ -f ${ff_yasm_bin} ]]; then 24 if [[ -f ${ff_yasm_bin} ]]; then
@@ -2860,13 +2860,15 @@ vector<string> SrsConfig::get_engine_vfilter(SrsConfDirective* engine) @@ -2860,13 +2860,15 @@ vector<string> SrsConfig::get_engine_vfilter(SrsConfDirective* engine)
2860 2860
2861 string SrsConfig::get_engine_vcodec(SrsConfDirective* engine) 2861 string SrsConfig::get_engine_vcodec(SrsConfDirective* engine)
2862 { 2862 {
  2863 + static string DEFAULT = "";
  2864 +
2863 if (!engine) { 2865 if (!engine) {
2864 - return ""; 2866 + return DEFAULT;
2865 } 2867 }
2866 2868
2867 SrsConfDirective* conf = engine->get("vcodec"); 2869 SrsConfDirective* conf = engine->get("vcodec");
2868 if (!conf) { 2870 if (!conf) {
2869 - return ""; 2871 + return DEFAULT;
2870 } 2872 }
2871 2873
2872 return conf->arg0(); 2874 return conf->arg0();
@@ -2998,13 +3000,15 @@ vector<string> SrsConfig::get_engine_vparams(SrsConfDirective* engine) @@ -2998,13 +3000,15 @@ vector<string> SrsConfig::get_engine_vparams(SrsConfDirective* engine)
2998 3000
2999 string SrsConfig::get_engine_acodec(SrsConfDirective* engine) 3001 string SrsConfig::get_engine_acodec(SrsConfDirective* engine)
3000 { 3002 {
  3003 + static string DEFAULT = "";
  3004 +
3001 if (!engine) { 3005 if (!engine) {
3002 - return ""; 3006 + return DEFAULT;
3003 } 3007 }
3004 3008
3005 SrsConfDirective* conf = engine->get("acodec"); 3009 SrsConfDirective* conf = engine->get("acodec");
3006 if (!conf) { 3010 if (!conf) {
3007 - return ""; 3011 + return DEFAULT;
3008 } 3012 }
3009 3013
3010 return conf->arg0(); 3014 return conf->arg0();
@@ -783,7 +783,7 @@ public: @@ -783,7 +783,7 @@ public:
783 virtual std::vector<std::string> get_engine_vfilter(SrsConfDirective* engine); 783 virtual std::vector<std::string> get_engine_vfilter(SrsConfDirective* engine);
784 /** 784 /**
785 * get the vcodec of engine, 785 * get the vcodec of engine,
786 - * the codec of video, copy or libx264 786 + * the codec of video, can be vn, copy or libx264
787 */ 787 */
788 virtual std::string get_engine_vcodec(SrsConfDirective* engine); 788 virtual std::string get_engine_vcodec(SrsConfDirective* engine);
789 /** 789 /**
@@ -827,7 +827,7 @@ public: @@ -827,7 +827,7 @@ public:
827 virtual std::vector<std::string> get_engine_vparams(SrsConfDirective* engine); 827 virtual std::vector<std::string> get_engine_vparams(SrsConfDirective* engine);
828 /** 828 /**
829 * get the acodec of engine, 829 * get the acodec of engine,
830 - * the audio codec can be copy or libaacplus 830 + * the audio codec can be an, copy or libfdk_aac
831 */ 831 */
832 virtual std::string get_engine_acodec(SrsConfDirective* engine); 832 virtual std::string get_engine_acodec(SrsConfDirective* engine);
833 /** 833 /**
@@ -48,6 +48,7 @@ using namespace std; @@ -48,6 +48,7 @@ using namespace std;
48 // for example, libaacplus, aac, fdkaac 48 // for example, libaacplus, aac, fdkaac
49 #define SRS_RTMP_ENCODER_ACODEC "aac" 49 #define SRS_RTMP_ENCODER_ACODEC "aac"
50 #define SRS_RTMP_ENCODER_LIBAACPLUS "libaacplus" 50 #define SRS_RTMP_ENCODER_LIBAACPLUS "libaacplus"
  51 +#define SRS_RTMP_ENCODER_LIBFDKAAC "libfdk_aac"
51 52
52 SrsFFMPEG::SrsFFMPEG(std::string ffmpeg_bin) 53 SrsFFMPEG::SrsFFMPEG(std::string ffmpeg_bin)
53 { 54 {
@@ -174,7 +175,7 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine) @@ -174,7 +175,7 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
174 } 175 }
175 176
176 // @see, https://github.com/simple-rtmp-server/srs/issues/145 177 // @see, https://github.com/simple-rtmp-server/srs/issues/145
177 - if (acodec == SRS_RTMP_ENCODER_LIBAACPLUS) { 178 + if (acodec == SRS_RTMP_ENCODER_LIBAACPLUS && acodec != SRS_RTMP_ENCODER_LIBFDKAAC) {
178 if (abitrate < 16 || abitrate > 72) { 179 if (abitrate < 16 || abitrate > 72) {
179 ret = ERROR_ENCODER_ABITRATE; 180 ret = ERROR_ENCODER_ABITRATE;
180 srs_error("invalid abitrate for aac: %d, must in [16, 72], ret=%d", abitrate, ret); 181 srs_error("invalid abitrate for aac: %d, must in [16, 72], ret=%d", abitrate, ret);
@@ -289,7 +289,7 @@ std::string _full_conf = "" @@ -289,7 +289,7 @@ std::string _full_conf = ""
289 " bf 3; \n " 289 " bf 3; \n "
290 " refs 10; \n " 290 " refs 10; \n "
291 " } \n " 291 " } \n "
292 -" acodec libaacplus; \n " 292 +" acodec libfdk_aac; \n "
293 " abitrate 70; \n " 293 " abitrate 70; \n "
294 " asample_rate 44100; \n " 294 " asample_rate 44100; \n "
295 " achannels 2; \n " 295 " achannels 2; \n "
@@ -320,7 +320,7 @@ std::string _full_conf = "" @@ -320,7 +320,7 @@ std::string _full_conf = ""
320 " vpreset superfast; \n " 320 " vpreset superfast; \n "
321 " vparams { \n " 321 " vparams { \n "
322 " } \n " 322 " } \n "
323 -" acodec libaacplus; \n " 323 +" acodec libfdk_aac; \n "
324 " abitrate 45; \n " 324 " abitrate 45; \n "
325 " asample_rate 44100; \n " 325 " asample_rate 44100; \n "
326 " achannels 2; \n " 326 " achannels 2; \n "
@@ -349,7 +349,7 @@ std::string _full_conf = "" @@ -349,7 +349,7 @@ std::string _full_conf = ""
349 " vpreset superfast; \n " 349 " vpreset superfast; \n "
350 " vparams { \n " 350 " vparams { \n "
351 " } \n " 351 " } \n "
352 -" acodec libaacplus; \n " 352 +" acodec libfdk_aac; \n "
353 " abitrate 45; \n " 353 " abitrate 45; \n "
354 " asample_rate 44100; \n " 354 " asample_rate 44100; \n "
355 " achannels 2; \n " 355 " achannels 2; \n "
@@ -379,7 +379,7 @@ std::string _full_conf = "" @@ -379,7 +379,7 @@ std::string _full_conf = ""
379 " vpreset superfast; \n " 379 " vpreset superfast; \n "
380 " vparams { \n " 380 " vparams { \n "
381 " } \n " 381 " } \n "
382 -" acodec libaacplus; \n " 382 +" acodec libfdk_aac; \n "
383 " abitrate 45; \n " 383 " abitrate 45; \n "
384 " asample_rate 44100; \n " 384 " asample_rate 44100; \n "
385 " achannels 2; \n " 385 " achannels 2; \n "
@@ -396,7 +396,7 @@ std::string _full_conf = "" @@ -396,7 +396,7 @@ std::string _full_conf = ""
396 " engine acodec { \n " 396 " engine acodec { \n "
397 " enabled on; \n " 397 " enabled on; \n "
398 " vcodec copy; \n " 398 " vcodec copy; \n "
399 -" acodec libaacplus; \n " 399 +" acodec libfdk_aac; \n "
400 " abitrate 45; \n " 400 " abitrate 45; \n "
401 " asample_rate 44100; \n " 401 " asample_rate 44100; \n "
402 " achannels 2; \n " 402 " achannels 2; \n "
@@ -413,7 +413,7 @@ std::string _full_conf = "" @@ -413,7 +413,7 @@ std::string _full_conf = ""
413 " engine vn { \n " 413 " engine vn { \n "
414 " enabled on; \n " 414 " enabled on; \n "
415 " vcodec vn; \n " 415 " vcodec vn; \n "
416 -" acodec libaacplus; \n " 416 +" acodec libfdk_aac; \n "
417 " abitrate 45; \n " 417 " abitrate 45; \n "
418 " asample_rate 44100; \n " 418 " asample_rate 44100; \n "
419 " achannels 2; \n " 419 " achannels 2; \n "
@@ -461,7 +461,7 @@ std::string _full_conf = "" @@ -461,7 +461,7 @@ std::string _full_conf = ""
461 " bf 3; \n " 461 " bf 3; \n "
462 " refs 10; \n " 462 " refs 10; \n "
463 " } \n " 463 " } \n "
464 -" acodec libaacplus; \n " 464 +" acodec libfdk_aac; \n "
465 " abitrate 70; \n " 465 " abitrate 70; \n "
466 " asample_rate 44100; \n " 466 " asample_rate 44100; \n "
467 " achannels 2; \n " 467 " achannels 2; \n "
@@ -483,7 +483,7 @@ std::string _full_conf = "" @@ -483,7 +483,7 @@ std::string _full_conf = ""
483 " vpreset medium; \n " 483 " vpreset medium; \n "
484 " vparams { \n " 484 " vparams { \n "
485 " } \n " 485 " } \n "
486 -" acodec libaacplus; \n " 486 +" acodec libfdk_aac; \n "
487 " abitrate 70; \n " 487 " abitrate 70; \n "
488 " asample_rate 44100; \n " 488 " asample_rate 44100; \n "
489 " achannels 2; \n " 489 " achannels 2; \n "
@@ -503,7 +503,7 @@ std::string _full_conf = "" @@ -503,7 +503,7 @@ std::string _full_conf = ""
503 " vpreset fast; \n " 503 " vpreset fast; \n "
504 " vparams { \n " 504 " vparams { \n "
505 " } \n " 505 " } \n "
506 -" acodec libaacplus; \n " 506 +" acodec libfdk_aac; \n "
507 " abitrate 60; \n " 507 " abitrate 60; \n "
508 " asample_rate 44100; \n " 508 " asample_rate 44100; \n "
509 " achannels 2; \n " 509 " achannels 2; \n "
@@ -523,7 +523,7 @@ std::string _full_conf = "" @@ -523,7 +523,7 @@ std::string _full_conf = ""
523 " vpreset superfast; \n " 523 " vpreset superfast; \n "
524 " vparams { \n " 524 " vparams { \n "
525 " } \n " 525 " } \n "
526 -" acodec libaacplus; \n " 526 +" acodec libfdk_aac; \n "
527 " abitrate 45; \n " 527 " abitrate 45; \n "
528 " asample_rate 44100; \n " 528 " asample_rate 44100; \n "
529 " achannels 2; \n " 529 " achannels 2; \n "
@@ -534,7 +534,7 @@ std::string _full_conf = "" @@ -534,7 +534,7 @@ std::string _full_conf = ""
534 " engine vcopy { \n " 534 " engine vcopy { \n "
535 " enabled on; \n " 535 " enabled on; \n "
536 " vcodec copy; \n " 536 " vcodec copy; \n "
537 -" acodec libaacplus; \n " 537 +" acodec libfdk_aac; \n "
538 " abitrate 45; \n " 538 " abitrate 45; \n "
539 " asample_rate 44100; \n " 539 " asample_rate 44100; \n "
540 " achannels 2; \n " 540 " achannels 2; \n "
@@ -581,7 +581,7 @@ std::string _full_conf = "" @@ -581,7 +581,7 @@ std::string _full_conf = ""
581 " vpreset superfast; \n " 581 " vpreset superfast; \n "
582 " vparams { \n " 582 " vparams { \n "
583 " } \n " 583 " } \n "
584 -" acodec libaacplus; \n " 584 +" acodec libfdk_aac; \n "
585 " abitrate 45; \n " 585 " abitrate 45; \n "
586 " asample_rate 44100; \n " 586 " asample_rate 44100; \n "
587 " achannels 2; \n " 587 " achannels 2; \n "
@@ -2586,7 +2586,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_mirror) @@ -2586,7 +2586,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_mirror)
2586 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str()); 2586 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str());
2587 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str()); 2587 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str());
2588 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 2588 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
2589 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 2589 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
2590 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 2590 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
2591 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 2591 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
2592 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 2592 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -2676,7 +2676,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_crop) @@ -2676,7 +2676,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_crop)
2676 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str()); 2676 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str());
2677 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str()); 2677 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str());
2678 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 2678 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
2679 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 2679 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
2680 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 2680 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
2681 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 2681 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
2682 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 2682 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -2766,7 +2766,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_logo) @@ -2766,7 +2766,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_logo)
2766 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str()); 2766 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str());
2767 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str()); 2767 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str());
2768 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 2768 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
2769 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 2769 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
2770 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 2770 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
2771 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 2771 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
2772 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 2772 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -2849,7 +2849,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_audio) @@ -2849,7 +2849,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_audio)
2849 EXPECT_STREQ("flv", conf.get_engine_iformat(engine).c_str()); 2849 EXPECT_STREQ("flv", conf.get_engine_iformat(engine).c_str());
2850 EXPECT_TRUE((int)conf.get_engine_vfilter(engine).size() == 0); 2850 EXPECT_TRUE((int)conf.get_engine_vfilter(engine).size() == 0);
2851 EXPECT_STREQ("copy", conf.get_engine_vcodec(engine).c_str()); 2851 EXPECT_STREQ("copy", conf.get_engine_vcodec(engine).c_str());
2852 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 2852 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
2853 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 2853 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
2854 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 2854 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
2855 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 2855 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -2933,7 +2933,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_vn) @@ -2933,7 +2933,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_vn)
2933 EXPECT_STREQ("flv", conf.get_engine_iformat(engine).c_str()); 2933 EXPECT_STREQ("flv", conf.get_engine_iformat(engine).c_str());
2934 EXPECT_TRUE((int)conf.get_engine_vfilter(engine).size() == 0); 2934 EXPECT_TRUE((int)conf.get_engine_vfilter(engine).size() == 0);
2935 EXPECT_STREQ("vn", conf.get_engine_vcodec(engine).c_str()); 2935 EXPECT_STREQ("vn", conf.get_engine_vcodec(engine).c_str());
2936 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 2936 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
2937 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 2937 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
2938 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 2938 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
2939 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 2939 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -3105,7 +3105,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all) @@ -3105,7 +3105,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all)
3105 EXPECT_STREQ("main", conf.get_engine_vprofile(engine).c_str()); 3105 EXPECT_STREQ("main", conf.get_engine_vprofile(engine).c_str());
3106 EXPECT_STREQ("medium", conf.get_engine_vpreset(engine).c_str()); 3106 EXPECT_STREQ("medium", conf.get_engine_vpreset(engine).c_str());
3107 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() > 0); 3107 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() > 0);
3108 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 3108 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
3109 EXPECT_EQ(70, conf.get_engine_abitrate(engine)); 3109 EXPECT_EQ(70, conf.get_engine_abitrate(engine));
3110 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 3110 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
3111 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 3111 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -3130,7 +3130,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all) @@ -3130,7 +3130,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all)
3130 EXPECT_STREQ("main", conf.get_engine_vprofile(engine).c_str()); 3130 EXPECT_STREQ("main", conf.get_engine_vprofile(engine).c_str());
3131 EXPECT_STREQ("medium", conf.get_engine_vpreset(engine).c_str()); 3131 EXPECT_STREQ("medium", conf.get_engine_vpreset(engine).c_str());
3132 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 3132 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
3133 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 3133 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
3134 EXPECT_EQ(70, conf.get_engine_abitrate(engine)); 3134 EXPECT_EQ(70, conf.get_engine_abitrate(engine));
3135 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 3135 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
3136 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 3136 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -3155,7 +3155,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all) @@ -3155,7 +3155,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all)
3155 EXPECT_STREQ("main", conf.get_engine_vprofile(engine).c_str()); 3155 EXPECT_STREQ("main", conf.get_engine_vprofile(engine).c_str());
3156 EXPECT_STREQ("fast", conf.get_engine_vpreset(engine).c_str()); 3156 EXPECT_STREQ("fast", conf.get_engine_vpreset(engine).c_str());
3157 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 3157 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
3158 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 3158 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
3159 EXPECT_EQ(60, conf.get_engine_abitrate(engine)); 3159 EXPECT_EQ(60, conf.get_engine_abitrate(engine));
3160 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 3160 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
3161 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 3161 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -3180,7 +3180,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all) @@ -3180,7 +3180,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all)
3180 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str()); 3180 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str());
3181 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str()); 3181 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str());
3182 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 3182 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
3183 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 3183 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
3184 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 3184 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
3185 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 3185 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
3186 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 3186 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -3197,7 +3197,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all) @@ -3197,7 +3197,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_all)
3197 EXPECT_STREQ("flv", conf.get_engine_iformat(engine).c_str()); 3197 EXPECT_STREQ("flv", conf.get_engine_iformat(engine).c_str());
3198 EXPECT_TRUE((int)conf.get_engine_vfilter(engine).size() == 0); 3198 EXPECT_TRUE((int)conf.get_engine_vfilter(engine).size() == 0);
3199 EXPECT_STREQ("copy", conf.get_engine_vcodec(engine).c_str()); 3199 EXPECT_STREQ("copy", conf.get_engine_vcodec(engine).c_str());
3200 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 3200 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
3201 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 3201 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
3202 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 3202 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
3203 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 3203 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -3322,7 +3322,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_ffempty) @@ -3322,7 +3322,7 @@ VOID TEST(ConfigMainTest, ParseFullConf_transcode_ffempty)
3322 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str()); 3322 EXPECT_STREQ("baseline", conf.get_engine_vprofile(engine).c_str());
3323 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str()); 3323 EXPECT_STREQ("superfast", conf.get_engine_vpreset(engine).c_str());
3324 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0); 3324 EXPECT_TRUE((int)conf.get_engine_vparams(engine).size() == 0);
3325 - EXPECT_STREQ("libaacplus", conf.get_engine_acodec(engine).c_str()); 3325 + EXPECT_STREQ("libfdk_aac", conf.get_engine_acodec(engine).c_str());
3326 EXPECT_EQ(45, conf.get_engine_abitrate(engine)); 3326 EXPECT_EQ(45, conf.get_engine_abitrate(engine));
3327 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine)); 3327 EXPECT_EQ(44100, conf.get_engine_asample_rate(engine));
3328 EXPECT_EQ(2, conf.get_engine_achannels(engine)); 3328 EXPECT_EQ(2, conf.get_engine_achannels(engine));
@@ -4837,12 +4837,12 @@ VOID TEST(ConfigMainTest, CheckConf_transcode) @@ -4837,12 +4837,12 @@ VOID TEST(ConfigMainTest, CheckConf_transcode)
4837 4837
4838 if (true) { 4838 if (true) {
4839 MockSrsConfig conf; 4839 MockSrsConfig conf;
4840 - EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"vhost v{transcode{engine {acodec libaacplus;}}}")); 4840 + EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"vhost v{transcode{engine {acodec libfdk_aac;}}}"));
4841 } 4841 }
4842 4842
4843 if (true) { 4843 if (true) {
4844 MockSrsConfig conf; 4844 MockSrsConfig conf;
4845 - EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"vhost v{transcode{engine {acodecs libaacplus;}}}")); 4845 + EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"vhost v{transcode{engine {acodecs libfdk_aac;}}}"));
4846 } 4846 }
4847 4847
4848 if (true) { 4848 if (true) {