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

Side by Side Diff: media/filters/h265_parser.cc

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 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/filters/h265_parser.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6 8
9 #include <memory>
ddorwin 2016/04/21 23:14:20 It looks like this isn't even necessary.
dcheng 2016/04/21 23:16:28 Done.
10
7 #include "base/logging.h" 11 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h"
9 #include "base/stl_util.h" 12 #include "base/stl_util.h"
10
11 #include "media/base/decrypt_config.h" 13 #include "media/base/decrypt_config.h"
12 #include "media/filters/h265_parser.h"
13 14
14 namespace media { 15 namespace media {
15 16
16 #define READ_BITS_OR_RETURN(num_bits, out) \ 17 #define READ_BITS_OR_RETURN(num_bits, out) \
17 do { \ 18 do { \
18 int _out; \ 19 int _out; \
19 if (!br_.ReadBits(num_bits, &_out)) { \ 20 if (!br_.ReadBits(num_bits, &_out)) { \
20 DVLOG(1) \ 21 DVLOG(1) \
21 << "Error in stream: unexpected EOS while trying to read " #out; \ 22 << "Error in stream: unexpected EOS while trying to read " #out; \
22 return kInvalidStream; \ 23 return kInvalidStream; \
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 READ_BITS_OR_RETURN(3, &nalu->nuh_temporal_id_plus1); 155 READ_BITS_OR_RETURN(3, &nalu->nuh_temporal_id_plus1);
155 156
156 DVLOG(4) << "NALU type: " << static_cast<int>(nalu->nal_unit_type) 157 DVLOG(4) << "NALU type: " << static_cast<int>(nalu->nal_unit_type)
157 << " at: " << reinterpret_cast<const void*>(nalu->data) 158 << " at: " << reinterpret_cast<const void*>(nalu->data)
158 << " size: " << nalu->size; 159 << " size: " << nalu->size;
159 160
160 return kOk; 161 return kOk;
161 } 162 }
162 163
163 } // namespace media 164 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698