Remove references to avconv

Most distributions now use ffmpeg instead
This commit is contained in:
Pierre Rudloff 2020-06-22 23:26:47 +02:00
parent 7a2c7b42fb
commit 683a19b0fb
7 changed files with 27 additions and 27 deletions

View file

@ -27,7 +27,7 @@ This will download all the required dependencies.
(Note that it will download the ffmpeg binary for 64-bits Linux.
If you are on another platform,
you might want to specify the path to avconv/ffmpeg in your config file.)
you might want to specify the path to ffmpeg in your config file.)
You should also ensure that the *templates_c* folder has the right permissions:
@ -133,18 +133,18 @@ server {
## Other dependencies
You need [avconv](https://libav.org/avconv.html)
You need [ffmpeg](https://ffmpeg.org/)
in order to enable conversions.
If you don't want to enable conversions, you can disable it in `config.yml`.
On Debian-based systems:
```bash
sudo apt-get install libav-tools
sudo apt-get install ffmpeg
```
You also probably need to edit the `avconv` variable in `config.yml`
so that it points to your ffmpeg/avconv binary (`/usr/bin/avconv` on Debian/Ubuntu).
You also probably need to edit the `ffmpeg` variable in `config.yml`
so that it points to your ffmpeg binary (`/usr/bin/ffmpeg` on Debian/Ubuntu).
## Use as library

View file

@ -70,11 +70,11 @@ class Config
public $convertAdvancedFormats = ['mp3', 'avi', 'flv', 'wav'];
/**
* avconv or ffmpeg binary path.
* ffmpeg binary path.
*
* @var string
*/
public $avconv = '/usr/bin/ffmpeg';
public $ffmpeg = '/usr/bin/ffmpeg';
/**
* Path to the directory that contains the phantomjs binary.
@ -112,12 +112,12 @@ class Config
public $audioBitrate = 128;
/**
* avconv/ffmpeg logging level.
* ffmpeg logging level.
* Must be one of these: quiet, panic, fatal, error, warning, info, verbose, debug.
*
* @var string
*/
public $avconvVerbosity = 'error';
public $ffmpegVerbosity = 'error';
/**
* App name.
@ -329,9 +329,9 @@ class Config
$this->youtubedl,
$this->params,
$this->python,
$this->avconv,
$this->ffmpeg,
$this->phantomjsDir,
$this->avconvVerbosity
$this->ffmpegVerbosity
);
}

View file

@ -22,11 +22,11 @@ convertAdvanced: false
# List of formats available in advanced conversion mode
convertAdvancedFormats: [mp3, avi, flv, wav]
# Path to your avconv or ffmpeg binary
avconv: /usr/bin/ffmpeg
# Path to your ffmpeg binary
ffmpeg: /usr/bin/ffmpeg
# avconv/ffmpeg logging level.
avconvVerbosity: error
# ffmpeg logging level.
ffmpegVerbosity: error
# Path to the directory that contains the phantomjs binary.
phantomjsDir: /usr/bin/

View file

@ -1,3 +1,3 @@
---
convert: false
avconvVerbosity: fatal
ffmpegVerbosity: fatal

View file

@ -33,13 +33,13 @@ In order to enable audio conversion, you need to add this to your `config.yml` f
```yaml
convert: true
avconv: path/to/avconv
ffmpeg: path/to/ffmpeg
```
You will also need to install `avconv` on your server:
You will also need to install `ffmpeg` on your server:
```bash
sudo apt-get install libav-tools
sudo apt-get install ffmpeg
```
## Deploy AllTube on Heroku

View file

@ -70,7 +70,7 @@ class ConfigTest extends BaseTest
$this->assertIsArray($config->params);
$this->assertIsString($config->youtubedl);
$this->assertIsString($config->python);
$this->assertIsString($config->avconv);
$this->assertIsString($config->ffmpeg);
$this->assertIsBool($config->convert);
$this->assertIsBool($config->uglyUrls);
$this->assertIsBool($config->stream);

View file

@ -339,7 +339,7 @@ class VideoTest extends BaseTest
}
/**
* Test getAudioStream function without avconv.
* Test getAudioStream function without ffmpeg.
*
* @param string $url URL
* @param string $format Format
@ -348,10 +348,10 @@ class VideoTest extends BaseTest
* @throws AlltubeLibraryException|ConfigException
* @dataProvider urlProvider
*/
public function testGetAudioStreamAvconvError($url, $format)
public function testGetAudioStreamFfmpegError($url, $format)
{
$this->expectException(AvconvException::class);
Config::setOptions(['avconv' => 'foobar']);
Config::setOptions(['ffmpeg' => 'foobar']);
$config = Config::getInstance();
$downloader = $config->getDownloader();
@ -488,7 +488,7 @@ class VideoTest extends BaseTest
}
/**
* Test getM3uStream function without avconv.
* Test getM3uStream function without ffmpeg.
*
* @param string $url URL
* @param string $format Format
@ -497,10 +497,10 @@ class VideoTest extends BaseTest
* @throws AlltubeLibraryException|ConfigException
* @dataProvider m3uUrlProvider
*/
public function testGetM3uStreamAvconvError($url, $format)
public function testGetM3uStreamFfmpegError($url, $format)
{
$this->expectException(AvconvException::class);
Config::setOptions(['avconv' => 'foobar']);
Config::setOptions(['ffmpeg' => 'foobar']);
$config = Config::getInstance();
$downloader = $config->getDownloader();
@ -509,7 +509,7 @@ class VideoTest extends BaseTest
}
/**
* Test getConvertedStream function without avconv.
* Test getConvertedStream function without ffmpeg.
*
* @param string $url URL
* @param string $format Format