Skip to content

Commit

Permalink
Merge to M81: [VP9 encoder] Set temporal id also on disabled spatial …
Browse files Browse the repository at this point in the history
…layers

No-try, because IOS bots are broken on release branch.

(cherry picked from commit 1dea1ea)

No-Try: True
Bug: chromium:1051476
Change-Id: Iaf2b6ab6640cd314a620dbdf1547d8f1b2f40693
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168921
Reviewed-by: Evan Shrubsole <eshr@google.com>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Original-Commit-Position: refs/heads/master@{#30581}
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168923
Cr-Commit-Position: refs/branch-heads/4044@{#7}
Cr-Branched-From: be99ee8-refs/heads/master@{#30432}
  • Loading branch information
Ilya Nikolaevskiy authored and Commit Bot committed Feb 25, 2020
1 parent 5d6a2a3 commit fd07f6c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion modules/video_coding/codecs/vp9/vp9_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,10 @@ int VP9EncoderImpl::Encode(const VideoFrame& input_image,
}
}

for (int sl_idx = 0; sl_idx < num_active_spatial_layers_; ++sl_idx) {
// Need to set temporal layer id on ALL layers, even disabled ones.
// Otherwise libvpx might produce frames on a disabled layer:
// http://crbug.com/1051476
for (int sl_idx = 0; sl_idx < num_spatial_layers_; ++sl_idx) {
layer_id.temporal_layer_id_per_spatial[sl_idx] = layer_id.temporal_layer_id;
}

Expand Down

0 comments on commit fd07f6c

Please sign in to comment.