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

Side by Side Diff: media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.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: remove include 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ffmpeg_h264_to_annex_b_bitstream_converter.h" 5 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "media/ffmpeg/ffmpeg_common.h" 10 #include "media/ffmpeg/ffmpeg_common.h"
11 #include "media/formats/mp4/box_definitions.h" 11 #include "media/formats/mp4/box_definitions.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 FFmpegH264ToAnnexBBitstreamConverter::FFmpegH264ToAnnexBBitstreamConverter( 15 FFmpegH264ToAnnexBBitstreamConverter::FFmpegH264ToAnnexBBitstreamConverter(
16 AVCodecContext* stream_codec_context) 16 AVCodecContext* stream_codec_context)
17 : configuration_processed_(false), 17 : configuration_processed_(false),
18 stream_codec_context_(stream_codec_context) { 18 stream_codec_context_(stream_codec_context) {
19 CHECK(stream_codec_context_); 19 CHECK(stream_codec_context_);
20 } 20 }
21 21
22 FFmpegH264ToAnnexBBitstreamConverter::~FFmpegH264ToAnnexBBitstreamConverter() {} 22 FFmpegH264ToAnnexBBitstreamConverter::~FFmpegH264ToAnnexBBitstreamConverter() {}
23 23
24 bool FFmpegH264ToAnnexBBitstreamConverter::ConvertPacket(AVPacket* packet) { 24 bool FFmpegH264ToAnnexBBitstreamConverter::ConvertPacket(AVPacket* packet) {
25 scoped_ptr<mp4::AVCDecoderConfigurationRecord> avc_config; 25 std::unique_ptr<mp4::AVCDecoderConfigurationRecord> avc_config;
26 26
27 if (packet == NULL || !packet->data) 27 if (packet == NULL || !packet->data)
28 return false; 28 return false;
29 29
30 // Calculate the needed output buffer size. 30 // Calculate the needed output buffer size.
31 if (!configuration_processed_) { 31 if (!configuration_processed_) {
32 if (!stream_codec_context_->extradata || 32 if (!stream_codec_context_->extradata ||
33 stream_codec_context_->extradata_size <= 0) 33 stream_codec_context_->extradata_size <= 0)
34 return false; 34 return false;
35 35
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 configuration_processed_ = true; 73 configuration_processed_ = true;
74 74
75 // At the end we must destroy the old packet. 75 // At the end we must destroy the old packet.
76 av_packet_unref(packet); 76 av_packet_unref(packet);
77 *packet = dest_packet; // Finally, replace the values in the input packet. 77 *packet = dest_packet; // Finally, replace the values in the input packet.
78 78
79 return true; 79 return true;
80 } 80 }
81 81
82 } // namespace media 82 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_glue_unittest.cc ('k') | media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698