zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert H.264 HW encoder setting to CBR mode.

Browse Source 
VBR mode does not work well on KK devices - bitrate
deviations from target are too large,

R=wzh@webrtc.org

Review URL: https://codereview.webrtc.org/1270403007 .

Cr-Commit-Position: refs/heads/master@{#9701}
This commit is contained in:
Alex Glaznev
2015-08-11 11:32:53 -07:00
parent d6b243f5f6
commit 8a2cd3d57d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
View File

@ -218,16 +218,13 @@ public class MediaCodecVideoEncoder {
EncoderProperties properties = null;
String mime = null;
int keyFrameIntervalSec = 0;
int bitrateMode = 0;
if (type == VideoCodecType.VIDEO_CODEC_VP8) {
mime = VP8_MIME_TYPE;
properties = findHwEncoder(VP8_MIME_TYPE, supportedVp8HwCodecPrefixes);
keyFrameIntervalSec = 100;
bitrateMode = VIDEO_ControlRateConstant;
} else if (type == VideoCodecType.VIDEO_CODEC_H264) {
mime = H264_MIME_TYPE;
properties = findHwEncoder(H264_MIME_TYPE, supportedH264HwCodecPrefixes);
bitrateMode = VIDEO_ControlRateVariable;
keyFrameIntervalSec = 20;
}
if (properties == null) {
@ -237,7 +234,7 @@ public class MediaCodecVideoEncoder {
try {
MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
format.setInteger(MediaFormat.KEY_BIT_RATE, 1000 * kbps);
format.setInteger("bitrate-mode", bitrateMode);
format.setInteger("bitrate-mode", VIDEO_ControlRateConstant);
format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
format.setInteger(MediaFormat.KEY_FRAME_RATE, fps);
format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, keyFrameIntervalSec);