diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 23:02:41 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 23:02:41 +0000 |
| commit | f2333df090cf3f00846d2ce3ffe41119718d3cc8 (patch) | |
| tree | f0c381736c9e123e33a3289a06689028268be1bf /remoting/remoting.gyp | |
| parent | c64eb4096d30f3018ccd75d076fb90304f0143b7 (diff) | |
| download | chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.zip chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.tar.gz chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.tar.bz2 | |
Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8.
1. Moved video-related protobuf messages from event.proto to video.proto. Removed those that we don't need anymore
2. Fixed naming for enums and some types.
3. Reenabled VP8.
4. Proper RGB-YUV converter for VP8 encoder.
5. Changed the capturer_fake to show more meaningful picture.
BUG=57374
TEST=unittests
Review URL: http://codereview.chromium.org/4136010
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/4255001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 3f5c750..ec32165 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -138,8 +138,8 @@ 'base/constants.cc', 'base/constants.h', 'base/decoder.h', - 'base/decoder_vp8.cc', - 'base/decoder_vp8.h', +# BUG57374,BUG57266 'base/decoder_vp8.cc', +# BUG57374,BUG57266 'base/decoder_vp8.h', 'base/decoder_row_based.cc', 'base/decoder_row_based.h', 'base/decompressor.h', @@ -150,8 +150,8 @@ 'base/encoder.h', 'base/encoder_verbatim.cc', 'base/encoder_verbatim.h', - 'base/encoder_vp8.cc', - 'base/encoder_vp8.h', +# BUG57374 'base/encoder_vp8.cc', +# BUG57374 'base/encoder_vp8.h', 'base/encoder_zlib.cc', 'base/encoder_zlib.h', 'base/multiple_array_input_stream.cc', @@ -162,16 +162,6 @@ 'base/util.cc', 'base/util.h', ], - 'conditions': [ - ['target_arch=="arm"', { - '!sources': [ - 'base/decoder_vp8.cc', - 'base/decoder_vp8.h', - 'base/encoder_vp8.cc', - 'base/encoder_vp8.h', - ], - }], - ], }, # end of target 'chromoting_base' { @@ -430,11 +420,11 @@ # BUG57351 'base/codec_test.cc', # BUG57351 'base/codec_test.h', 'base/compressor_zlib_unittest.cc', -# BUG57351 'base/decoder_vp8_unittest.cc', +# BUG57374 'base/decoder_vp8_unittest.cc', 'base/decompressor_zlib_unittest.cc', # BUG57351 'base/encode_decode_unittest.cc', # BUG57351 'base/encoder_verbatim_unittest.cc', -# BUG57351 'base/encoder_vp8_unittest.cc', +# BUG57374 'base/encoder_vp8_unittest.cc', # BUG57351 'base/encoder_zlib_unittest.cc', 'base/mock_objects.h', 'base/multiple_array_input_stream_unittest.cc', |