A computer system generates a first decompressed media stream based on a first compressed media stream. While providing the first decompressed media stream to the presentation device, the computer system receives a content-transition indication to switch to a second decompressed media stream. In response to receiving the content-transition indication, the computer system selects a first transition point in first content corresponding to the first compressed media stream and selects a second transition point in second content corresponding to the second compressed media stream. The second transition point is selected in accordance with a bandwidth available for receiving the second compressed media stream and the first transition point is selected based on the second transition point. The computer system requests the second compressed media stream starting at the second transition point and ceases to provide the first decompressed media stream at the first transition point in the first content.