A computer system generates a first decompressed media stream based on a first compressed media stream and provides the first decompressed media stream to a presentation device. While providing the first decompressed media to the presentation device: the computer system receives a content-transition indication indicating that a second decompressed media stream is to be provided to the presentation device instead of the first decompressed media stream. The computer system stores first buffered data corresponding to the first decompressed media stream and receives a second compressed media stream corresponding to the second decompressed media stream. After receiving the second compressed media stream, the computer system provides the first buffered data corresponding to the first decompressed media stream to the presentation device while preparing to generate the second decompressed media stream, and after preparing to generate the second decompressed media stream, provides the second decompressed media stream to the presentation device.