Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Side by Side Diff: media/formats/mp2t/es_adapter_video_unittest.cc

Issue 2158923004: Convert media constants to constexpr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <sstream> 8 #include <sstream>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 29 matching lines...) Expand all
40 const bool* is_key_frame, 40 const bool* is_key_frame,
41 size_t frame_count) { 41 size_t frame_count) {
42 uint8_t dummy_buffer[] = {0, 0, 0, 0}; 42 uint8_t dummy_buffer[] = {0, 0, 0, 0};
43 43
44 StreamParserBuffer::BufferQueue buffers(frame_count); 44 StreamParserBuffer::BufferQueue buffers(frame_count);
45 for (size_t k = 0; k < frame_count; k++) { 45 for (size_t k = 0; k < frame_count; k++) {
46 buffers[k] = StreamParserBuffer::CopyFrom( 46 buffers[k] = StreamParserBuffer::CopyFrom(
47 dummy_buffer, arraysize(dummy_buffer), 47 dummy_buffer, arraysize(dummy_buffer),
48 is_key_frame[k], DemuxerStream::VIDEO, 0); 48 is_key_frame[k], DemuxerStream::VIDEO, 0);
49 if (frame_pts_ms[k] < 0) { 49 if (frame_pts_ms[k] < 0) {
50 buffers[k]->set_timestamp(kNoTimestamp()); 50 buffers[k]->set_timestamp(kNoTimestamp);
51 } else { 51 } else {
52 buffers[k]->set_timestamp( 52 buffers[k]->set_timestamp(
53 base::TimeDelta::FromMilliseconds(frame_pts_ms[k])); 53 base::TimeDelta::FromMilliseconds(frame_pts_ms[k]));
54 } 54 }
55 } 55 }
56 return buffers; 56 return buffers;
57 } 57 }
58 58
59 } 59 }
60 60
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 bool is_key_frame[] = {false, false, false, true, false, false}; 163 bool is_key_frame[] = {false, false, false, true, false, false};
164 StreamParserBuffer::BufferQueue buffer_queue = 164 StreamParserBuffer::BufferQueue buffer_queue =
165 GenerateFakeBuffers(pts_ms, is_key_frame, arraysize(pts_ms)); 165 GenerateFakeBuffers(pts_ms, is_key_frame, arraysize(pts_ms));
166 166
167 EXPECT_EQ("(70,Y) (30,Y) (30,N) (30,N)", 167 EXPECT_EQ("(70,Y) (30,Y) (30,N) (30,N)",
168 RunAdapterTest(buffer_queue)); 168 RunAdapterTest(buffer_queue));
169 } 169 }
170 170
171 } // namespace mp2t 171 } // namespace mp2t
172 } // namespace media 172 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698