summaryrefslogtreecommitdiffstats
path: root/chromecast/renderer
diff options
context:
space:
mode:
authorchcunningham <chcunningham@chromium.org>2015-10-19 18:42:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-20 01:42:56 +0000
commit9812dd8df19bc65839f48d914a1c4e296107a49a (patch)
tree71925688be60d95b7a73518e0c704c142ff0ccab /chromecast/renderer
parent2c81561ee4f6bf0f19810070ce594c2a109b4e03 (diff)
downloadchromium_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/renderer')
-rw-r--r--chromecast/renderer/media/demuxer_stream_for_test.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromecast/renderer/media/demuxer_stream_for_test.cc b/chromecast/renderer/media/demuxer_stream_for_test.cc
index 228f1de..89b45ea 100644
--- a/chromecast/renderer/media/demuxer_stream_for_test.cc
+++ b/chromecast/renderer/media/demuxer_stream_for_test.cc
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/threading/thread.h"
#include "chromecast/renderer/media/demuxer_stream_for_test.h"
+#include "base/threading/thread.h"
+#include "media/base/media_util.h"
+
namespace chromecast {
namespace media {
@@ -60,8 +62,7 @@ void DemuxerStreamForTest::Read(const ReadCB& read_cb) {
coded_size,
visible_rect,
natural_size,
- NULL,
- 0,
+ ::media::EmptyExtraData(),
false);
}