web: Fix the maxbitrates config setting. #1702
Conversation
| if (!config.hasOwnProperty('videoQuality')) config.videoQuality = {}; | ||
| if (!config.videoQuality.hasOwnProperty('av1')) config.videoQuality.av1 = null; |
There was a problem hiding this comment.
All these ifs are unnecessary because there is no way for those to be defined.
| config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} | ||
| config.videoQuality.maxBitratesVideo.H264 = { low: {{ .Env.VIDEOQUALITY_BITRATE_H264_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_H264_HIGH }} }; | ||
| {{ if and .Env.VIDEOQUALITY_BITRATE_AV1_LOW .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD .Env.VIDEOQUALITY_BITRATE_AV1_HIGH .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH -}} | ||
| if (!config.videoQuality.av1.hasOwnProperty('maxBitratesVideo')) config.videoQuality.av1.maxBitratesVideo = null; |
| config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} | ||
| config.videoQuality.maxBitratesVideo.VP8 = { low: {{ .Env.VIDEOQUALITY_BITRATE_VP8_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_VP8_HIGH }} }; | ||
| {{ if and .Env.VIDEOQUALITY_BITRATE_H264_LOW .Env.VIDEOQUALITY_BITRATE_H264_STANDARD .Env.VIDEOQUALITY_BITRATE_H264_HIGH .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH -}} | ||
| if (!config.videoQuality.h264.hasOwnProperty('maxBitratesVideo')) config.videoQuality.h264.maxBitratesVideo = null; |
There was a problem hiding this comment.
Ditto, plus the indentation here makes this very weird to read.
|
Look at what I did here: #1704 -- I left the sections you touch alone to avoid conflicts, please adjust your new code to match. |
Obviously this is much cleaner. I misunderstood how Docker works, didn't know we are building the config from scratch every time. Will fix it. |
That wasn't the case in its inception, so the confusion is understandable! |
Also, remove the 'enforcePreferredCodec' setting which is no longer supported.
jallamsetty1
force-pushed
the
fix-maxbitrates
branch
from
0be67c5
to
f533164
Compare
| config.flags = { | ||
| sourceNameSignaling: true | ||
| sourceNameSignaling: true, |
| {{ if and .Env.VIDEOQUALITY_BITRATE_H264_LOW .Env.VIDEOQUALITY_BITRATE_H264_STANDARD .Env.VIDEOQUALITY_BITRATE_H264_HIGH -}} | ||
| config.videoQuality.maxBitratesVideo = config.videoQuality.maxBitratesVideo || {} | ||
| config.videoQuality.maxBitratesVideo.H264 = { low: {{ .Env.VIDEOQUALITY_BITRATE_H264_LOW }}, standard: {{ .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }}, high: {{ .Env.VIDEOQUALITY_BITRATE_H264_HIGH }} }; | ||
| {{ if and .Env.VIDEOQUALITY_BITRATE_AV1_LOW .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD .Env.VIDEOQUALITY_BITRATE_AV1_HIGH .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH -}} |
There was a problem hiding this comment.
So, it's necessary to set them all even if one wants to bump just the high?
There was a problem hiding this comment.
The code doesn't dictate it but do you see value in giving the option to bump only one of the values? Typically, when someone changes the high, I'd expect them to change standard and low accordingly.
There was a problem hiding this comment.
I don't know, just asking :-) I guess we'll find out if someone needs it eventually.
Also, remove the 'enforcePreferredCodec' setting which is no longer supported.