summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorposciak@chromium.org <posciak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 22:25:28 +0000
committerposciak@chromium.org <posciak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 22:25:28 +0000
commit81ca720c7594b0a08a5015b8f894f3a18bc7cd1c (patch)
tree390642d1714fc4b0d05521a9e424a46d93b53c63 /content
parentcbffb21ea3221e175aa09af74c611c3f044fa4ec (diff)
downloadchromium_src-81ca720c7594b0a08a5015b8f894f3a18bc7cd1c.zip
chromium_src-81ca720c7594b0a08a5015b8f894f3a18bc7cd1c.tar.gz
chromium_src-81ca720c7594b0a08a5015b8f894f3a18bc7cd1c.tar.bz2
veatest: Fix parameter string parse order.
Fix parsing order of the stream parameters string to match the documented order. TEST=Run BUG=None TBR=fischman@chromium.org Review URL: https://codereview.chromium.org/257713003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/gpu/media/video_encode_accelerator_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc
index ecebcef..d8c8eef 100644
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc
@@ -119,14 +119,14 @@ static void ParseAndReadTestStreamData(const base::FilePath::StringType& data,
if (fields.size() >= 6 && !fields[5].empty())
CHECK(base::StringToUint(fields[5], &test_stream->requested_bitrate));
- if (fields.size() >= 7 && !fields[6].empty()) {
- CHECK(base::StringToUint(fields[6],
+ if (fields.size() >= 7 && !fields[6].empty())
+ CHECK(base::StringToUint(fields[6], &test_stream->requested_framerate));
+
+ if (fields.size() >= 8 && !fields[7].empty()) {
+ CHECK(base::StringToUint(fields[7],
&test_stream->requested_subsequent_bitrate));
}
- if (fields.size() >= 8 && !fields[7].empty())
- CHECK(base::StringToUint(fields[7], &test_stream->requested_framerate));
-
if (fields.size() >= 9 && !fields[8].empty()) {
CHECK(base::StringToUint(fields[8],
&test_stream->requested_subsequent_framerate));