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

Fixes the layer sync bit for temporal layer 0

Browse Source 
TESTED=try bots
Review URL: https://webrtc-codereview.appspot.com/933005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2987 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pwestin@webrtc.org 2012-10-24 22:27:21 +00:00
parent 1997ddb713
commit 746721b12d
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
webrtc/modules/video_coding/codecs/vp8/temporal_layers.cc
View File

@ -28,7 +28,8 @@ TemporalLayers::TemporalLayers(int numberOfTemporalLayers)
temporal_pattern_length_(0), temporal_pattern_length_(0),
tl0_pic_idx_(rand()), tl0_pic_idx_(rand()),
pattern_idx_(255), pattern_idx_(255),
timestamp_(0) { timestamp_(0),
last_base_layer_sync_(false) {
assert(kMaxTemporalStreams >= numberOfTemporalLayers); assert(kMaxTemporalStreams >= numberOfTemporalLayers);
memset(temporal_ids_, 0, sizeof(temporal_ids_)); memset(temporal_ids_, 0, sizeof(temporal_ids_));
memset(temporal_pattern_, 0, sizeof(temporal_pattern_)); memset(temporal_pattern_, 0, sizeof(temporal_pattern_));
@ -214,35 +215,41 @@ int TemporalLayers::EncodeFlags() {
return flags; return flags;
} }
void TemporalLayers::PopulateCodecSpecific(bool key_frame, void TemporalLayers::PopulateCodecSpecific(bool base_layer_sync,
CodecSpecificInfoVP8 *vp8_info, CodecSpecificInfoVP8 *vp8_info,
uint32_t timestamp) { uint32_t timestamp) {
assert(number_of_temporal_layers_ > 1); assert(number_of_temporal_layers_ > 1);
assert(0 < temporal_ids_length_); assert(0 < temporal_ids_length_);
if (key_frame) { if (base_layer_sync) {
// Keyframe is always temporal layer 0
vp8_info->temporalIdx = 0; vp8_info->temporalIdx = 0;
} else {
vp8_info->temporalIdx = temporal_ids_[pattern_idx_ % temporal_ids_length_];
}
TemporalReferences temporal_reference =
temporal_pattern_[pattern_idx_ % temporal_pattern_length_];
if (temporal_reference == kTemporalUpdateAltrefWithoutDependency ||
temporal_reference == kTemporalUpdateGoldenWithoutDependency ||
temporal_reference == kTemporalUpdateGoldenWithoutDependencyRefAltRef ||
temporal_reference == kTemporalUpdateNoneNoRefGoldenRefAltRef ||
(temporal_reference == kTemporalUpdateNone &&
number_of_temporal_layers_ == 4)) {
vp8_info->layerSync = true; vp8_info->layerSync = true;
} else { } else {
vp8_info->layerSync = false; vp8_info->temporalIdx = temporal_ids_[pattern_idx_ % temporal_ids_length_];
TemporalReferences temporal_reference =
temporal_pattern_[pattern_idx_ % temporal_pattern_length_];
if (temporal_reference == kTemporalUpdateAltrefWithoutDependency ||
temporal_reference == kTemporalUpdateGoldenWithoutDependency ||
temporal_reference == kTemporalUpdateGoldenWithoutDependencyRefAltRef ||
temporal_reference == kTemporalUpdateNoneNoRefGoldenRefAltRef ||
(temporal_reference == kTemporalUpdateNone &&
number_of_temporal_layers_ == 4)) {
vp8_info->layerSync = true;
} else {
vp8_info->layerSync = false;
}
}
if (last_base_layer_sync_ && vp8_info->temporalIdx != 0) {
// Regardless of pattern the frame after a base layer sync will always
// be a layer sync.
vp8_info->layerSync = true;
} }
if (vp8_info->temporalIdx == 0 && timestamp != timestamp_) { if (vp8_info->temporalIdx == 0 && timestamp != timestamp_) {
timestamp_ = timestamp; timestamp_ = timestamp;
tl0_pic_idx_++; tl0_pic_idx_++;
} }
last_base_layer_sync_ = base_layer_sync;
vp8_info->tl0PicIdx = tl0_pic_idx_; vp8_info->tl0PicIdx = tl0_pic_idx_;
} }
} // namespace webrtc } // namespace webrtc

4
webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
View File

@ -31,7 +31,8 @@ class TemporalLayers {
bool ConfigureBitrates(int bitrate_kbit, vpx_codec_enc_cfg_t* cfg); bool ConfigureBitrates(int bitrate_kbit, vpx_codec_enc_cfg_t* cfg);
void PopulateCodecSpecific(bool key_frame, CodecSpecificInfoVP8 *vp8_info, void PopulateCodecSpecific(bool base_layer_sync,
CodecSpecificInfoVP8* vp8_info,
uint32_t timestamp); uint32_t timestamp);
private: private:
@ -75,6 +76,7 @@ class TemporalLayers {
uint8_t tl0_pic_idx_; uint8_t tl0_pic_idx_;
uint8_t pattern_idx_; uint8_t pattern_idx_;
uint32_t timestamp_; uint32_t timestamp_;
bool last_base_layer_sync_;
}; };
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_

7
webrtc/modules/video_coding/codecs/vp8/temporal_layers_unittest.cc
View File

@ -195,19 +195,16 @@ TEST(TemporalLayersTest, KeyFrame) {
int expected_temporal_idx[8] = int expected_temporal_idx[8] =
{ 0, 0, 0, 0, 0, 0, 0, 2}; { 0, 0, 0, 0, 0, 0, 0, 2};
bool expected_layer_sync[8] =
{ false, true, true, false, false, false, false, false };
for (int i = 0; i < 7; ++i) { for (int i = 0; i < 7; ++i) {
EXPECT_EQ(expected_flags[i], tl.EncodeFlags()); EXPECT_EQ(expected_flags[i], tl.EncodeFlags());
tl.PopulateCodecSpecific(true, &vp8_info, 0); tl.PopulateCodecSpecific(true, &vp8_info, 0);
EXPECT_EQ(expected_temporal_idx[i], vp8_info.temporalIdx); EXPECT_EQ(expected_temporal_idx[i], vp8_info.temporalIdx);
EXPECT_EQ(expected_layer_sync[i], vp8_info.layerSync); EXPECT_EQ(true, vp8_info.layerSync);
} }
EXPECT_EQ(expected_flags[7], tl.EncodeFlags()); EXPECT_EQ(expected_flags[7], tl.EncodeFlags());
tl.PopulateCodecSpecific(false, &vp8_info, 0); tl.PopulateCodecSpecific(false, &vp8_info, 0);
EXPECT_EQ(expected_temporal_idx[7], vp8_info.temporalIdx); EXPECT_EQ(expected_temporal_idx[7], vp8_info.temporalIdx);
EXPECT_EQ(expected_layer_sync[7], vp8_info.layerSync); EXPECT_EQ(true, vp8_info.layerSync);
} }
} // namespace webrtc } // namespace webrtc