diff options
| author | chcunningham <chcunningham@chromium.org> | 2015-10-19 18:42:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 01:42:56 +0000 |
| commit | 9812dd8df19bc65839f48d914a1c4e296107a49a (patch) | |
| tree | 71925688be60d95b7a73518e0c704c142ff0ccab /chromecast/media/audio/cast_audio_output_stream.cc | |
| parent | 2c81561ee4f6bf0f19810070ce594c2a109b4e03 (diff) | |
| download | chromium_src-9812dd8df19bc65839f48d914a1c4e296107a49a.zip chromium_src-9812dd8df19bc65839f48d914a1c4e296107a49a.tar.gz chromium_src-9812dd8df19bc65839f48d914a1c4e296107a49a.tar.bz2 | |
Fail playback when VideoDecoderConfig has invalid extra data.
Invalid extra data occurs when:
(extra_data_ptr == NULL) != (extra_data_size == 0)
We were previously crashing (CHECK) on this condition.
{Audio|Video}DecoderConfig now use a vector and pointer/size issues
are detected/handled in the path of creating the FFmpegDemuxerStream.
Skipping presubmit due to formatting issues. I'd like to have some hope of merging this back to dev.
NOPRESUBMIT=true
BUG=517163
TEST=New unit test. Manually verified graceful failure for MSE & SRC=
R=bbudge@chromium.org, gunsch@chromium.org, sandersd@chromium.org, xhwang@chromium.org
Review URL: https://codereview.chromium.org/1396583002
Cr-Commit-Position: refs/heads/master@{#354952}
Diffstat (limited to 'chromecast/media/audio/cast_audio_output_stream.cc')
| -rw-r--r-- | chromecast/media/audio/cast_audio_output_stream.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chromecast/media/audio/cast_audio_output_stream.cc b/chromecast/media/audio/cast_audio_output_stream.cc index e55f127..69eda32 100644 --- a/chromecast/media/audio/cast_audio_output_stream.cc +++ b/chromecast/media/audio/cast_audio_output_stream.cc @@ -42,8 +42,6 @@ MediaPipelineBackend::AudioDecoder* InitializeBackend( audio_config.bytes_per_channel = audio_params.bits_per_sample() / 8; audio_config.channel_number = audio_params.channels(); audio_config.samples_per_second = audio_params.sample_rate(); - audio_config.extra_data = nullptr; - audio_config.extra_data_size = 0; audio_config.is_encrypted = false; if (!decoder->SetConfig(audio_config)) |