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

Side by Side Diff: chromecast/media/cma/test/frame_generator_for_test.cc

Issue 1553503002: Convert Pass()→std::move() in //chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 "chromecast/media/cma/test/frame_generator_for_test.h" 5 #include "chromecast/media/cma/test/frame_generator_for_test.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility>
8 9
9 #include "base/macros.h" 10 #include "base/macros.h"
10 #include "chromecast/media/cma/base/decoder_buffer_adapter.h" 11 #include "chromecast/media/cma/base/decoder_buffer_adapter.h"
11 #include "chromecast/media/cma/base/decoder_buffer_base.h" 12 #include "chromecast/media/cma/base/decoder_buffer_base.h"
12 #include "media/base/decoder_buffer.h" 13 #include "media/base/decoder_buffer.h"
13 #include "media/base/decrypt_config.h" 14 #include "media/base/decrypt_config.h"
14 15
15 namespace chromecast { 16 namespace chromecast {
16 namespace media { 17 namespace media {
17 18
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 95
95 char iv[] = { 96 char iv[] = {
96 0x0, 0x2, 0x1, 0x3, 0x5, 0x4, 0x7, 0x6, 97 0x0, 0x2, 0x1, 0x3, 0x5, 0x4, 0x7, 0x6,
97 0x9, 0x8, 0xb, 0xa, 0xd, 0xc, 0xf, 0xe }; 98 0x9, 0x8, 0xb, 0xa, 0xd, 0xc, 0xf, 0xe };
98 99
99 scoped_ptr< ::media::DecryptConfig> decrypt_config( 100 scoped_ptr< ::media::DecryptConfig> decrypt_config(
100 new ::media::DecryptConfig( 101 new ::media::DecryptConfig(
101 std::string(key_id, arraysize(key_id)), 102 std::string(key_id, arraysize(key_id)),
102 std::string(iv, arraysize(iv)), 103 std::string(iv, arraysize(iv)),
103 subsamples)); 104 subsamples));
104 buffer->set_decrypt_config(decrypt_config.Pass()); 105 buffer->set_decrypt_config(std::move(decrypt_config));
105 } 106 }
106 107
107 return scoped_refptr<DecoderBufferBase>(new DecoderBufferAdapter(buffer)); 108 return scoped_refptr<DecoderBufferBase>(new DecoderBufferAdapter(buffer));
108 } 109 }
109 110
110 size_t FrameGeneratorForTest::RemainingFrameCount() const { 111 size_t FrameGeneratorForTest::RemainingFrameCount() const {
111 size_t count = frame_specs_.size() - frame_idx_; 112 size_t count = frame_specs_.size() - frame_idx_;
112 return count; 113 return count;
113 } 114 }
114 115
115 } // namespace media 116 } // namespace media
116 } // namespace chromecast 117 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/pipeline/video_pipeline_impl.cc ('k') | chromecast/net/connectivity_checker_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698