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

Side by Side Diff: media/cdm/cenc_utils.cc

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android Created 4 years, 7 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
« no previous file with comments | « media/base/yuv_convert_unittest.cc ('k') | media/renderers/default_renderer_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/cdm/cenc_utils.h" 5 #include "media/cdm/cenc_utils.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h"
8 #include "media/formats/mp4/box_definitions.h" 9 #include "media/formats/mp4/box_definitions.h"
9 #include "media/formats/mp4/box_reader.h" 10 #include "media/formats/mp4/box_reader.h"
10 11
11 namespace media { 12 namespace media {
12 13
13 // The initialization data for encrypted media files using the ISO Common 14 // The initialization data for encrypted media files using the ISO Common
14 // Encryption ('cenc') protection scheme may contain one or more protection 15 // Encryption ('cenc') protection scheme may contain one or more protection
15 // system specific header ('pssh') boxes. 16 // system specific header ('pssh') boxes.
16 // ref: https://w3c.github.io/encrypted-media/cenc-format.html 17 // ref: https://w3c.github.io/encrypted-media/cenc-format.html
17 18
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 pssh_data->assign(child.data.begin(), child.data.end()); 117 pssh_data->assign(child.data.begin(), child.data.end());
117 return true; 118 return true;
118 } 119 }
119 } 120 }
120 121
121 // No matching 'pssh' box found. 122 // No matching 'pssh' box found.
122 return false; 123 return false;
123 } 124 }
124 125
125 } // namespace media 126 } // namespace media
OLDNEW
« no previous file with comments | « media/base/yuv_convert_unittest.cc ('k') | media/renderers/default_renderer_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698