Skip to content
Permalink
Browse files

Remove libfaac encoder related code.

libfaac is no longer supported by FFmpeg.

Additionally, drop use of mp3lame encoder when using HLS. AAC will now always be used
  • Loading branch information...
jyavenard committed Nov 14, 2016
1 parent 1402762 commit 6b3825dac9839f3b6bd2e743acfc37853534eb5b
Showing with 1 addition and 30 deletions.
  1. +0 −2 mythtv/configure
  2. +1 −28 mythtv/programs/mythtranscode/transcode.cpp
@@ -162,7 +162,6 @@ Advanced options (experts only):
External codec library options (used for mythffmpeg and streaming transcode):
--enable-libmp3lame enable MP3 encoding via libmp3lame [no]
--enable-libfaac enable AAC encoding via libfaac [no]
--enable-libx264 enable H.264 encoding via x264 [no]
--enable-libvpx enable VP8 encoding via libvpx [no]
--enable-libxvid enable Xvid encoding via xvidcore,
@@ -8378,7 +8377,6 @@ echo ""

echo "# External Codec Options"
echo "mp3lame ${libmp3lame-no}"
echo "faac ${libfaac-no}"
echo "xvid ${libxvid-no}"
echo "x264 ${libx264-no}"
echo "x265 (HEVC) ${libx265-no}"
@@ -489,22 +489,8 @@ int Transcode::TranscodeFile(const QString &inputname,
audioOnlyBitrate = hls->GetAudioOnlyBitrate();

avfw2 = new AVFormatWriter();

avfw2->SetContainer("mpegts");

if (!gCoreContext->GetSetting("HLSAUDIO").isEmpty())
avfw2->SetAudioCodec(gCoreContext->GetSetting("HLSAUDIO"));
else
#if CONFIG_LIBFAAC_ENCODER
avfw2->SetAudioCodec("libfaac");
#else
# if CONFIG_LIBMP3LAME_ENCODER
avfw2->SetAudioCodec("libmp3lame");
# else
avfw2->SetAudioCodec("aac");
# endif
#endif

avfw2->SetAudioBitrate(audioOnlyBitrate);
avfw2->SetAudioChannels(arb->m_channels);
avfw2->SetAudioFrameRate(arb->m_eff_audiorate);
@@ -513,20 +499,7 @@ int Transcode::TranscodeFile(const QString &inputname,

avfw->SetContainer("mpegts");
avfw->SetVideoCodec("libx264");

if (!gCoreContext->GetSetting("HLSAUDIO").isEmpty())
avfw->SetAudioCodec(gCoreContext->GetSetting("HLSAUDIO"));
else
#if CONFIG_LIBFAAC_ENCODER
avfw->SetAudioCodec("libfaac");
#else
# if CONFIG_LIBMP3LAME_ENCODER
avfw->SetAudioCodec("libmp3lame");
# else
avfw->SetAudioCodec("aac");
# endif
#endif

avfw->SetAudioCodec("aac");
hls->UpdateStatus(kHLSStatusStarting);
hls->UpdateStatusMessage("Transcoding Starting");
hls->UpdateSizeInfo(newWidth, newHeight, video_width, video_height);

0 comments on commit 6b3825d

Please sign in to comment.
You can’t perform that action at this time.