media/video: fix default bitrate video

Change-Id: Ieaf01c576efd98bf9083f01dd5777df97b7d3799

src/media/media_codec.h

@@ -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,

src/media/media_encoder.cpp

@@ -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) {