diff options
| author | nisse <nisse@chromium.org> | 2015-12-07 01:30:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-07 09:32:06 +0000 |
| commit | 7a153fb24c371f0793e3b1ae89c23049f9ba7f6a (patch) | |
| tree | 4e93648173f6e151ede8c93230cf36a0eac4b99f /media | |
| parent | aefd501253fcacb70693d386076a0dc0782c8f25 (diff) | |
| download | chromium_src-7a153fb24c371f0793e3b1ae89c23049f9ba7f6a.zip chromium_src-7a153fb24c371f0793e3b1ae89c23049f9ba7f6a.tar.gz chromium_src-7a153fb24c371f0793e3b1ae89c23049f9ba7f6a.tar.bz2 | |
Fix js/c++ incompatibility in parsing of video capture formats.
For the chrome://media-internals UI, manager.js parses the format
string produced by VideoCaptureFormat::ToString. But they don't agree
on the format. This cl fixes punctuation, and updates the js parser.
Further refactoring is desirable, but not done for this bug fix.
BUG=556396
Review URL: https://codereview.chromium.org/1487283003
Cr-Commit-Position: refs/heads/master@{#363429}
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/video_capture_types.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/base/video_capture_types.cc b/media/base/video_capture_types.cc index f68eeb3..1bd91fa 100644 --- a/media/base/video_capture_types.cc +++ b/media/base/video_capture_types.cc @@ -69,8 +69,10 @@ size_t VideoCaptureFormat::ImageAllocationSize() const { //static std::string VideoCaptureFormat::ToString(const VideoCaptureFormat& format) { + // Beware: This string is parsed by manager.js:parseVideoCaptureFormat_, + // take care when changing the formatting. return base::StringPrintf( - "(%s)@%.3ffps, pixel format: %s storage: %s.", + "(%s)@%.3ffps, pixel format: %s, storage: %s", format.frame_size.ToString().c_str(), format.frame_rate, VideoPixelFormatToString(format.pixel_format).c_str(), PixelStorageToString(format.pixel_storage).c_str()); |