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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 <sstream> 5 #include <sstream>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 17 matching lines...) Expand all
28 gfx::Size natural_size(320, 240); 28 gfx::Size natural_size(320, 240);
29 return VideoDecoderConfig(kCodecH264, H264PROFILE_MAIN, PIXEL_FORMAT_I420, 29 return VideoDecoderConfig(kCodecH264, H264PROFILE_MAIN, PIXEL_FORMAT_I420,
30 COLOR_SPACE_UNSPECIFIED, coded_size, visible_rect, 30 COLOR_SPACE_UNSPECIFIED, coded_size, visible_rect,
31 natural_size, EmptyExtraData(), false); 31 natural_size, EmptyExtraData(), false);
32 } 32 }
33 33
34 StreamParserBuffer::BufferQueue 34 StreamParserBuffer::BufferQueue
35 GenerateFakeBuffers(const int* frame_pts_ms, 35 GenerateFakeBuffers(const int* frame_pts_ms,
36 const bool* is_key_frame, 36 const bool* is_key_frame,
37 size_t frame_count) { 37 size_t frame_count) {
38 uint8 dummy_buffer[] = {0, 0, 0, 0}; 38 uint8_t dummy_buffer[] = {0, 0, 0, 0};
39 39
40 StreamParserBuffer::BufferQueue buffers(frame_count); 40 StreamParserBuffer::BufferQueue buffers(frame_count);
41 for (size_t k = 0; k < frame_count; k++) { 41 for (size_t k = 0; k < frame_count; k++) {
42 buffers[k] = StreamParserBuffer::CopyFrom( 42 buffers[k] = StreamParserBuffer::CopyFrom(
43 dummy_buffer, arraysize(dummy_buffer), 43 dummy_buffer, arraysize(dummy_buffer),
44 is_key_frame[k], DemuxerStream::VIDEO, 0); 44 is_key_frame[k], DemuxerStream::VIDEO, 0);
45 if (frame_pts_ms[k] < 0) { 45 if (frame_pts_ms[k] < 0) {
46 buffers[k]->set_timestamp(kNoTimestamp()); 46 buffers[k]->set_timestamp(kNoTimestamp());
47 } else { 47 } else {
48 buffers[k]->set_timestamp( 48 buffers[k]->set_timestamp(
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 bool is_key_frame[] = {false, false, false, true, false, false}; 159 bool is_key_frame[] = {false, false, false, true, false, false};
160 StreamParserBuffer::BufferQueue buffer_queue = 160 StreamParserBuffer::BufferQueue buffer_queue =
161 GenerateFakeBuffers(pts_ms, is_key_frame, arraysize(pts_ms)); 161 GenerateFakeBuffers(pts_ms, is_key_frame, arraysize(pts_ms));
162 162
163 EXPECT_EQ("(70,Y) (30,Y) (30,N) (30,N)", 163 EXPECT_EQ("(70,Y) (30,Y) (30,N) (30,N)",
164 RunAdapterTest(buffer_queue)); 164 RunAdapterTest(buffer_queue));
165 } 165 }
166 166
167 } // namespace mp2t 167 } // namespace mp2t
168 } // namespace media 168 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698