Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check sample rate and lower if too high #2986

Merged
merged 3 commits into from
Jul 15, 2020
Merged

check sample rate and lower if too high #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c25f65
check sample rate and lower if too high
Death916 Jun 25, 2020
7b01dde
convert sample_rate to integer and dont force a volume_filter
Death916 Jul 6, 2020
c6c6686
changed video_bitrate_maximum from 8.4MB to 5MB
eukreign Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ _trial_temp/
/tests/integration/blockchain/files
/tests/.coverage.*

/lbry/wallet/bin
/lbry/wallet/bin

/.vscode
/.gitignore
4 changes: 2 additions & 2 deletions lbry/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,15 +479,15 @@ class TranscodeConfig(BaseConfig):
video_encoder = String('FFmpeg codec and parameters for the video encoding. '
'Example: libaom-av1 -crf 25 -b:v 0 -strict experimental',
'libx264 -crf 24 -preset faster -pix_fmt yuv420p')
video_bitrate_maximum = Integer('Maximum bits per second allowed for video streams (0 to disable).', 8400000)
video_bitrate_maximum = Integer('Maximum bits per second allowed for video streams (0 to disable).', 5_000_000)
video_scaler = String('FFmpeg scaling parameters for reducing bitrate. '
'Example: -vf "scale=-2:720,fps=24" -maxrate 5M -bufsize 3M',
r'-vf "scale=if(gte(iw\,ih)\,min(1920\,iw)\,-2):if(lt(iw\,ih)\,min(1920\,ih)\,-2)" '
r'-maxrate 5500K -bufsize 5000K')
audio_encoder = String('FFmpeg codec and parameters for the audio encoding. '
'Example: libopus -b:a 128k',
'aac -b:a 160k')
volume_filter = String('FFmpeg filter for audio normalization.', '-af loudnorm')
volume_filter = String('FFmpeg filter for audio normalization. Exmple: -af loudnorm', '')
volume_analysis_time = Integer('Maximum seconds into the file that we examine audio volume (0 to disable).', 240)


Expand Down
14 changes: 7 additions & 7 deletions lbry/file_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ def _verify_audio_encoding(scan_data: json):
if not {"aac", "mp3", "flac", "vorbis", "opus"}.intersection(codec.split(",")):
return "Audio codec is not in the approved list of AAC, FLAC, MP3, Vorbis, and Opus. " \
f"Actual: {codec} [{stream['codec_long_name']}]"
if int(stream['sample_rate']) > 48000:
return "Sample rate out of range"

return ""

Expand Down Expand Up @@ -304,9 +306,6 @@ async def _get_audio_encoder(self, extension):

raise Exception(f"The audio encoder is not available. Requested: {encoder or 'aac'}")

async def _get_volume_filter(self):
return self._conf.volume_filter if self._conf.volume_filter else "-af loudnorm"

@staticmethod
def _get_best_container_extension(scan_data, video_encoder):
# the container is chosen by the video format
Expand Down Expand Up @@ -410,7 +409,7 @@ async def verify_or_repair(self, validate, repair, file_path, ignore_non_video=F
# the plan for transcoding:
# we have to re-encode the video if it is in a nonstandard format
# we also re-encode if we are h264 but not yuv420p (both errors caught in video_msg)
# we also re-encode if our bitrate is too high
# we also re-encode if our bitrate or sample rate is too high

try:
transcode_command = [f'-i "{file_path}" -y -c:s copy -c:d copy -c:v']
Expand All @@ -430,9 +429,10 @@ async def verify_or_repair(self, validate, repair, file_path, ignore_non_video=F
if audio_msg or volume_msg:
audio_encoder = await self._get_audio_encoder(extension)
transcode_command.append(audio_encoder)
if volume_msg:
volume_filter = await self._get_volume_filter()
transcode_command.append(volume_filter)
if volume_msg and self._conf.volume_filter:
transcode_command.append(self._conf.volume_filter)
if audio_msg == "Sample rate out of range":
transcode_command.append(" -ar 48000 ")
else:
transcode_command.append("copy")

Expand Down