generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add min and target bitrate to VideoCodec.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/1214004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3710 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2013-03-22 17:13:08 +00:00
parent e30823911c
commit 94bc4cf905
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_types.h
View File

@ -545,6 +545,8 @@ struct SimulcastStream
unsigned short height;
unsigned char numberOfTemporalLayers;
unsigned int maxBitrate;
unsigned int targetBitrate;
unsigned int minBitrate;
unsigned int qpMax; // minimum quality
};

12
webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
View File

@ -48,18 +48,24 @@ void SetSimulcastSettings(webrtc::VideoCodec* video_codec) {
video_codec->simulcastStream[0].height = 180;
video_codec->simulcastStream[0].numberOfTemporalLayers = 0;
video_codec->simulcastStream[0].maxBitrate = 100;
video_codec->simulcastStream[0].targetBitrate = 100;
video_codec->simulcastStream[0].minBitrate = 0;
video_codec->simulcastStream[0].qpMax = video_codec->qpMax;
video_codec->simulcastStream[1].width = 640;
video_codec->simulcastStream[1].height = 360;
video_codec->simulcastStream[1].numberOfTemporalLayers = 0;
video_codec->simulcastStream[1].maxBitrate = 500;
video_codec->simulcastStream[1].targetBitrate = 500;
video_codec->simulcastStream[1].minBitrate = 200;
video_codec->simulcastStream[1].qpMax = video_codec->qpMax;
video_codec->simulcastStream[2].width = 1280;
video_codec->simulcastStream[2].height = 720;
video_codec->simulcastStream[2].numberOfTemporalLayers = 0;
video_codec->simulcastStream[2].maxBitrate = 1200;
video_codec->simulcastStream[2].targetBitrate = 1200;
video_codec->simulcastStream[2].minBitrate = 900;
video_codec->simulcastStream[2].qpMax = video_codec->qpMax;
}
@ -69,8 +75,14 @@ void RuntimeSingleStreamSettings(webrtc::VideoCodec* video_codec) {
video_codec->height = 800;
video_codec->numberOfSimulcastStreams = kNumStreams;
video_codec->simulcastStream[0].maxBitrate = 0;
video_codec->simulcastStream[0].targetBitrate = 0;
video_codec->simulcastStream[0].minBitrate = 0;
video_codec->simulcastStream[1].maxBitrate = 0;
video_codec->simulcastStream[1].targetBitrate = 0;
video_codec->simulcastStream[1].minBitrate = 0;
video_codec->simulcastStream[2].maxBitrate = 0;
video_codec->simulcastStream[2].targetBitrate = 0;
video_codec->simulcastStream[2].minBitrate = 0;
}
int VideoEngineSimulcastTest(void* window1, void* window2) {