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

Side by Side Diff: media/mojo/common/mojo_decoder_buffer_converter_unittest.cc

Issue 2748923002: Remove dead splice_timestamp() field from DecoderBuffer. (Closed)
Patch Set: Created 3 years, 9 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 "media/mojo/common/mojo_decoder_buffer_converter.h" 5 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const uint8_t kData[] = "hello, world"; 67 const uint8_t kData[] = "hello, world";
68 const uint8_t kSideData[] = "sideshow bob"; 68 const uint8_t kSideData[] = "sideshow bob";
69 const size_t kDataSize = arraysize(kData); 69 const size_t kDataSize = arraysize(kData);
70 const size_t kSideDataSize = arraysize(kSideData); 70 const size_t kSideDataSize = arraysize(kSideData);
71 71
72 scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CopyFrom( 72 scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CopyFrom(
73 reinterpret_cast<const uint8_t*>(&kData), kDataSize, 73 reinterpret_cast<const uint8_t*>(&kData), kDataSize,
74 reinterpret_cast<const uint8_t*>(&kSideData), kSideDataSize)); 74 reinterpret_cast<const uint8_t*>(&kSideData), kSideDataSize));
75 buffer->set_timestamp(base::TimeDelta::FromMilliseconds(123)); 75 buffer->set_timestamp(base::TimeDelta::FromMilliseconds(123));
76 buffer->set_duration(base::TimeDelta::FromMilliseconds(456)); 76 buffer->set_duration(base::TimeDelta::FromMilliseconds(456));
77 buffer->set_splice_timestamp(base::TimeDelta::FromMilliseconds(200));
78 buffer->set_discard_padding( 77 buffer->set_discard_padding(
79 DecoderBuffer::DiscardPadding(base::TimeDelta::FromMilliseconds(5), 78 DecoderBuffer::DiscardPadding(base::TimeDelta::FromMilliseconds(5),
80 base::TimeDelta::FromMilliseconds(6))); 79 base::TimeDelta::FromMilliseconds(6)));
81 80
82 MojoDecoderBufferConverter converter; 81 MojoDecoderBufferConverter converter;
83 converter.ConvertAndVerify(buffer); 82 converter.ConvertAndVerify(buffer);
84 } 83 }
85 84
86 TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_EOS) { 85 TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_EOS) {
87 base::MessageLoop message_loop; 86 base::MessageLoop message_loop;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 converter.writer->WriteDecoderBuffer(media_buffer); 196 converter.writer->WriteDecoderBuffer(media_buffer);
198 converter.reader->ReadDecoderBuffer(std::move(mojo_buffer), mock_cb.Get()); 197 converter.reader->ReadDecoderBuffer(std::move(mojo_buffer), mock_cb.Get());
199 198
200 // Before the entire data is transmitted, close the handle on writer side. 199 // Before the entire data is transmitted, close the handle on writer side.
201 // The reader side will get notified and report the error. 200 // The reader side will get notified and report the error.
202 converter.writer.reset(); 201 converter.writer.reset();
203 run_loop.Run(); 202 run_loop.Run();
204 } 203 }
205 204
206 } // namespace media 205 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/common/media_type_converters_unittest.cc ('k') | media/mojo/interfaces/media_types.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698