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

Side by Side Diff: media/formats/mp2t/es_parser_h264.h

Issue 1874413003: Convert media/formats 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 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 #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_ 5 #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
6 #define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_ 6 #define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <utility> 11 #include <utility>
11 12
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
18 #include "media/base/video_decoder_config.h" 18 #include "media/base/video_decoder_config.h"
19 #include "media/formats/mp2t/es_adapter_video.h" 19 #include "media/formats/mp2t/es_adapter_video.h"
20 #include "media/formats/mp2t/es_parser.h" 20 #include "media/formats/mp2t/es_parser.h"
21 21
22 namespace media { 22 namespace media {
23 class EncryptionScheme; 23 class EncryptionScheme;
24 class H264Parser; 24 class H264Parser;
25 struct H264SPS; 25 struct H264SPS;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // Update the video decoder config based on an H264 SPS. 71 // Update the video decoder config based on an H264 SPS.
72 // Return true if successful. 72 // Return true if successful.
73 bool UpdateVideoDecoderConfig(const H264SPS* sps, 73 bool UpdateVideoDecoderConfig(const H264SPS* sps,
74 const EncryptionScheme& scheme); 74 const EncryptionScheme& scheme);
75 75
76 EsAdapterVideo es_adapter_; 76 EsAdapterVideo es_adapter_;
77 77
78 // H264 parser state. 78 // H264 parser state.
79 // - |current_access_unit_pos_| is pointing to an annexB syncword 79 // - |current_access_unit_pos_| is pointing to an annexB syncword
80 // representing the first NALU of an H264 access unit. 80 // representing the first NALU of an H264 access unit.
81 scoped_ptr<H264Parser> h264_parser_; 81 std::unique_ptr<H264Parser> h264_parser_;
82 int64_t current_access_unit_pos_; 82 int64_t current_access_unit_pos_;
83 int64_t next_access_unit_pos_; 83 int64_t next_access_unit_pos_;
84 84
85 // Last video decoder config. 85 // Last video decoder config.
86 VideoDecoderConfig last_video_decoder_config_; 86 VideoDecoderConfig last_video_decoder_config_;
87 87
88 DISALLOW_COPY_AND_ASSIGN(EsParserH264); 88 DISALLOW_COPY_AND_ASSIGN(EsParserH264);
89 }; 89 };
90 90
91 } // namespace mp2t 91 } // namespace mp2t
92 } // namespace media 92 } // namespace media
93 93
94 #endif 94 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698