summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 18:56:22 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 18:56:22 +0000
commitecc4d3b3f6f131387b8c0e01598a702a09e259d9 (patch)
tree287269f55104b6cadde1bf5bbafde24e13d8e30b /media/media.gyp
parent99fc999f10307ccdbcc78ae56b282052fd0e07ae (diff)
downloadchromium_src-ecc4d3b3f6f131387b8c0e01598a702a09e259d9.zip
chromium_src-ecc4d3b3f6f131387b8c0e01598a702a09e259d9.tar.gz
chromium_src-ecc4d3b3f6f131387b8c0e01598a702a09e259d9.tar.bz2
Fix InMemoryUrlProtocol available_bytes computation.
Fixed available_bytes computation to properly handle large buffers and add defensive logic to Read() to protect against negative sizes. BUG=364065 TESTS=InMemoryUrlProtocolTest.* Review URL: https://codereview.chromium.org/253923002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 5ddaf32..3e215b1 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -576,6 +576,8 @@
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
'filters/ffmpeg_video_decoder.cc',
'filters/ffmpeg_video_decoder.h',
+ 'filters/in_memory_url_protocol.cc',
+ 'filters/in_memory_url_protocol.h',
],
}],
['media_use_libvpx==1', {
@@ -1040,6 +1042,7 @@
'filters/h264_bit_reader_unittest.cc',
'filters/h264_parser_unittest.cc',
'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
+ 'filters/in_memory_url_protocol_unittest.cc',
'filters/opus_audio_decoder_unittest.cc',
'filters/pipeline_integration_test.cc',
'filters/pipeline_integration_test_base.cc',
@@ -1120,6 +1123,7 @@
'filters/ffmpeg_glue_unittest.cc',
'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
'filters/ffmpeg_video_decoder_unittest.cc',
+ 'filters/in_memory_url_protocol_unittest.cc',
'filters/opus_audio_decoder_unittest.cc',
'filters/pipeline_integration_test.cc',
'filters/pipeline_integration_test_base.cc',