jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

media/video: fix default bitrate video

Browse Source 
Change-Id: Ieaf01c576efd98bf9083f01dd5777df97b7d3799
This commit is contained in:
Pierre Lespagnol
2019-11-07 17:35:15 -05:00
parent e3cf52c569
commit f65a652948
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/media/media_codec.h
View File

@ -64,7 +64,6 @@ struct SystemCodecInfo
static constexpr unsigned DEFAULT_H264_MAX_QUALITY {20};
static constexpr unsigned DEFAULT_VP8_MIN_QUALITY {50};
static constexpr unsigned DEFAULT_VP8_MAX_QUALITY {20};
static constexpr unsigned DEFAULT_VIDEO_BITRATE {1200}; // in Kbits/second
#endif
// indicates that the codec does not use quality factor
@ -72,6 +71,7 @@ struct SystemCodecInfo
static constexpr unsigned DEFAULT_MIN_BITRATE {600};
static constexpr unsigned DEFAULT_MAX_BITRATE {6000};
static constexpr unsigned DEFAULT_VIDEO_BITRATE {1200}; // in Kbits/second
SystemCodecInfo(unsigned avcodecId, const std::string& name,
const std::string& libName, MediaType mediaType,

5
src/media/media_encoder.cpp
View File

@ -199,7 +199,7 @@ MediaEncoder::initStream(const SystemCodecInfo& systemCodecInfo, AVBufferRef* fr
else if(systemCodecInfo.mediaType == MEDIA_AUDIO)
mediaType = AVMEDIA_TYPE_AUDIO;
encoderCtx = initCodec(mediaType, static_cast<AVCodecID>(systemCodecInfo.avcodecId), framesCtx, 0);
encoderCtx = initCodec(mediaType, static_cast<AVCodecID>(systemCodecInfo.avcodecId), framesCtx, SystemCodecInfo::DEFAULT_VIDEO_BITRATE);
// add video stream to outputformat context
AVStream* stream = avformat_new_stream(outputCtx_, outputCodec_);
@ -690,9 +690,6 @@ MediaEncoder::initCodec(AVMediaType mediaType, AVCodecID avcodecId, AVBufferRef*
}
#endif
if(!br)
br = std::atoi(libav_utils::getDictValue(options_, "max_rate"));
// Only clamp video bitrate
if (mediaType == AVMEDIA_TYPE_VIDEO && br > 0) {
if (br < SystemCodecInfo::DEFAULT_MIN_BITRATE) {