Skip to content

Commit

Permalink
media: Add out-of-line copy ctors for complex classes.
Browse files Browse the repository at this point in the history
This patch adds out of line copy constructors for classes that our
clang-plugin considers heavy. This is an effort to enable copy
constructor checks by default.

BUG=436357
R=dalecurtis@chromium.org, dcheng@chromium.org, thakis@chromium.org

Review URL: https://codereview.chromium.org/1731403002

Cr-Commit-Position: refs/heads/master@{#377967}
  • Loading branch information
vmpstr authored and Commit bot committed Feb 26, 2016
1 parent 60c10a4 commit 9750c9d
Show file tree
Hide file tree
Showing 38 changed files with 74 additions and 0 deletions.
3 changes: 3 additions & 0 deletions media/base/audio_decoder_config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec,
extra_data, is_encrypted, base::TimeDelta(), 0);
}

AudioDecoderConfig::AudioDecoderConfig(const AudioDecoderConfig& other) =
default;

void AudioDecoderConfig::Initialize(AudioCodec codec,
SampleFormat sample_format,
ChannelLayout channel_layout,
Expand Down
2 changes: 2 additions & 0 deletions media/base/audio_decoder_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ class MEDIA_EXPORT AudioDecoderConfig {
const std::vector<uint8_t>& extra_data,
bool is_encrypted);

AudioDecoderConfig(const AudioDecoderConfig& other);

~AudioDecoderConfig();

// Resets the internal state of this object. |codec_delay| is in frames.
Expand Down
3 changes: 3 additions & 0 deletions media/base/audio_shifter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ AudioShifter::AudioQueueEntry::AudioQueueEntry(
audio(audio_.release()) {
}

AudioShifter::AudioQueueEntry::AudioQueueEntry(const AudioQueueEntry& other) =
default;

AudioShifter::AudioQueueEntry::~AudioQueueEntry() {}

AudioShifter::AudioShifter(base::TimeDelta max_buffer_size,
Expand Down
1 change: 1 addition & 0 deletions media/base/audio_shifter.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class MEDIA_EXPORT AudioShifter {
struct AudioQueueEntry {
AudioQueueEntry(base::TimeTicks target_playout_time_,
scoped_ptr<AudioBus> audio_);
AudioQueueEntry(const AudioQueueEntry& other);
~AudioQueueEntry();
base::TimeTicks target_playout_time;
linked_ptr<AudioBus> audio;
Expand Down
3 changes: 3 additions & 0 deletions media/base/audio_video_metadata_extractor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ const int kAttachedImageSizeLimit = 4 * 1024 * 1024;

AudioVideoMetadataExtractor::StreamInfo::StreamInfo() {}

AudioVideoMetadataExtractor::StreamInfo::StreamInfo(const StreamInfo& other) =
default;

AudioVideoMetadataExtractor::StreamInfo::~StreamInfo() {}

AudioVideoMetadataExtractor::AudioVideoMetadataExtractor()
Expand Down
1 change: 1 addition & 0 deletions media/base/audio_video_metadata_extractor.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class MEDIA_EXPORT AudioVideoMetadataExtractor {

struct StreamInfo {
StreamInfo();
StreamInfo(const StreamInfo& other);
~StreamInfo();
std::string type;
TagDictionary tags;
Expand Down
2 changes: 2 additions & 0 deletions media/base/bitstream_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ BitstreamBuffer::BitstreamBuffer(int32_t id,
size_(size),
presentation_timestamp_(presentation_timestamp) {}

BitstreamBuffer::BitstreamBuffer(const BitstreamBuffer& other) = default;

BitstreamBuffer::~BitstreamBuffer() {}

void BitstreamBuffer::SetDecryptConfig(const DecryptConfig& decrypt_config) {
Expand Down
2 changes: 2 additions & 0 deletions media/base/bitstream_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class MEDIA_EXPORT BitstreamBuffer {
size_t size,
base::TimeDelta presentation_timestamp);

BitstreamBuffer(const BitstreamBuffer& other);

~BitstreamBuffer();

void SetDecryptConfig(const DecryptConfig& decrypt_config);
Expand Down
2 changes: 2 additions & 0 deletions media/base/cdm_key_information.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ CdmKeyInformation::CdmKeyInformation(const uint8_t* key_id_data,
status(status),
system_code(system_code) {}

CdmKeyInformation::CdmKeyInformation(const CdmKeyInformation& other) = default;

CdmKeyInformation::~CdmKeyInformation() {
}

Expand Down
1 change: 1 addition & 0 deletions media/base/cdm_key_information.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ struct MEDIA_EXPORT CdmKeyInformation {
size_t key_id_length,
KeyStatus status,
uint32_t system_code);
CdmKeyInformation(const CdmKeyInformation& other);
~CdmKeyInformation();

std::vector<uint8_t> key_id;
Expand Down
2 changes: 2 additions & 0 deletions media/base/key_system_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ namespace media {
KeySystemInfo::KeySystemInfo() {
}

KeySystemInfo::KeySystemInfo(const KeySystemInfo& other) = default;

KeySystemInfo::~KeySystemInfo() {
}

Expand Down
1 change: 1 addition & 0 deletions media/base/key_system_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ namespace media {
// the corresponding CDM.
struct MEDIA_EXPORT KeySystemInfo {
KeySystemInfo();
KeySystemInfo(const KeySystemInfo& other);
~KeySystemInfo();

std::string key_system;
Expand Down
1 change: 1 addition & 0 deletions media/base/serial_runner.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ static void RunOnTaskRunner(
}

SerialRunner::Queue::Queue() {}
SerialRunner::Queue::Queue(const Queue& other) = default;
SerialRunner::Queue::~Queue() {}

void SerialRunner::Queue::Push(const base::Closure& closure) {
Expand Down
1 change: 1 addition & 0 deletions media/base/serial_runner.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class MEDIA_EXPORT SerialRunner {
class MEDIA_EXPORT Queue {
public:
Queue();
Queue(const Queue& other);
~Queue();

void Push(const base::Closure& closure);
Expand Down
2 changes: 2 additions & 0 deletions media/base/text_track_config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ TextTrackConfig::TextTrackConfig(TextKind kind,
id_(id) {
}

TextTrackConfig::TextTrackConfig(const TextTrackConfig& other) = default;

bool TextTrackConfig::Matches(const TextTrackConfig& config) const {
return config.kind() == kind_ &&
config.label() == label_ &&
Expand Down
1 change: 1 addition & 0 deletions media/base/text_track_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ enum TextKind {
class MEDIA_EXPORT TextTrackConfig {
public:
TextTrackConfig();
TextTrackConfig(const TextTrackConfig& other);
TextTrackConfig(TextKind kind,
const std::string& label,
const std::string& language,
Expand Down
3 changes: 3 additions & 0 deletions media/base/video_decoder_config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
natural_size, extra_data, is_encrypted);
}

VideoDecoderConfig::VideoDecoderConfig(const VideoDecoderConfig& other) =
default;

VideoDecoderConfig::~VideoDecoderConfig() {}

void VideoDecoderConfig::Initialize(VideoCodec codec,
Expand Down
2 changes: 2 additions & 0 deletions media/base/video_decoder_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class MEDIA_EXPORT VideoDecoderConfig {
const std::vector<uint8_t>& extra_data,
bool is_encrypted);

VideoDecoderConfig(const VideoDecoderConfig& other);

~VideoDecoderConfig();

// Resets the internal state of this object.
Expand Down
3 changes: 3 additions & 0 deletions media/capture/video/video_capture_device_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ VideoCaptureDeviceInfo::VideoCaptureDeviceInfo(
: name(name), supported_formats(supported_formats) {
}

VideoCaptureDeviceInfo::VideoCaptureDeviceInfo(
const VideoCaptureDeviceInfo& other) = default;

VideoCaptureDeviceInfo::~VideoCaptureDeviceInfo() {
}

Expand Down
1 change: 1 addition & 0 deletions media/capture/video/video_capture_device_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ struct MEDIA_EXPORT VideoCaptureDeviceInfo {
VideoCaptureDeviceInfo();
VideoCaptureDeviceInfo(const VideoCaptureDevice::Name& name,
const VideoCaptureFormats& supported_formats);
VideoCaptureDeviceInfo(const VideoCaptureDeviceInfo& other);
~VideoCaptureDeviceInfo();

VideoCaptureDevice::Name name;
Expand Down
7 changes: 7 additions & 0 deletions media/cast/cast_config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ VideoSenderConfig::VideoSenderConfig()
codec(CODEC_VIDEO_VP8),
number_of_encode_threads(1) {}

VideoSenderConfig::VideoSenderConfig(const VideoSenderConfig& other) = default;

VideoSenderConfig::~VideoSenderConfig() {}

AudioSenderConfig::AudioSenderConfig()
Expand All @@ -72,6 +74,8 @@ AudioSenderConfig::AudioSenderConfig()
bitrate(kDefaultAudioEncoderBitrate),
codec(CODEC_AUDIO_OPUS) {}

AudioSenderConfig::AudioSenderConfig(const AudioSenderConfig& other) = default;

AudioSenderConfig::~AudioSenderConfig() {}

FrameReceiverConfig::FrameReceiverConfig()
Expand All @@ -84,6 +88,9 @@ FrameReceiverConfig::FrameReceiverConfig()
target_frame_rate(0),
codec(CODEC_UNKNOWN) {}

FrameReceiverConfig::FrameReceiverConfig(const FrameReceiverConfig& other) =
default;

FrameReceiverConfig::~FrameReceiverConfig() {}

} // namespace cast
Expand Down
3 changes: 3 additions & 0 deletions media/cast/cast_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ enum SuggestedDefaults {
// http://crbug.com/530839
struct AudioSenderConfig {
AudioSenderConfig();
AudioSenderConfig(const AudioSenderConfig& other);
~AudioSenderConfig();

// Identifier referring to the sender, used by the receiver.
Expand Down Expand Up @@ -97,6 +98,7 @@ struct AudioSenderConfig {

struct VideoSenderConfig {
VideoSenderConfig();
VideoSenderConfig(const VideoSenderConfig& other);
~VideoSenderConfig();

// Identifier referring to the sender, used by the receiver.
Expand Down Expand Up @@ -163,6 +165,7 @@ struct VideoSenderConfig {
// TODO(miu): Naming and minor type changes are badly needed in a later CL.
struct FrameReceiverConfig {
FrameReceiverConfig();
FrameReceiverConfig(const FrameReceiverConfig& other);
~FrameReceiverConfig();

// The receiver's SSRC identifier.
Expand Down
1 change: 1 addition & 0 deletions media/cast/logging/logging_defines.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ FrameEvent::FrameEvent()
target_bitrate(0),
encoder_cpu_utilization(-1.0),
idealized_bitrate_utilization(-1.0) {}
FrameEvent::FrameEvent(const FrameEvent& other) = default;
FrameEvent::~FrameEvent() {}

PacketEvent::PacketEvent()
Expand Down
1 change: 1 addition & 0 deletions media/cast/logging/logging_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ enum EventMediaType {

struct FrameEvent {
FrameEvent();
FrameEvent(const FrameEvent& other);
~FrameEvent();

RtpTimeTicks rtp_timestamp;
Expand Down
2 changes: 2 additions & 0 deletions media/cast/net/rtcp/rtcp_defines.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ RtcpReceiverEventLogMessage::~RtcpReceiverEventLogMessage() {}

RtcpReceiverFrameLogMessage::RtcpReceiverFrameLogMessage(RtpTimeTicks timestamp)
: rtp_timestamp_(timestamp) {}
RtcpReceiverFrameLogMessage::RtcpReceiverFrameLogMessage(
const RtcpReceiverFrameLogMessage& other) = default;
RtcpReceiverFrameLogMessage::~RtcpReceiverFrameLogMessage() {}

RtcpReceiverReferenceTimeReport::RtcpReceiverReferenceTimeReport()
Expand Down
1 change: 1 addition & 0 deletions media/cast/net/rtcp/rtcp_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages;

struct RtcpReceiverFrameLogMessage {
explicit RtcpReceiverFrameLogMessage(RtpTimeTicks rtp_timestamp);
RtcpReceiverFrameLogMessage(const RtcpReceiverFrameLogMessage& other);
~RtcpReceiverFrameLogMessage();

const RtpTimeTicks rtp_timestamp_;
Expand Down
3 changes: 3 additions & 0 deletions media/cdm/player_tracker_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ PlayerTrackerImpl::PlayerCallbacks::PlayerCallbacks(
const base::Closure& cdm_unset_cb)
: new_key_cb(new_key_cb), cdm_unset_cb(cdm_unset_cb) {}

PlayerTrackerImpl::PlayerCallbacks::PlayerCallbacks(
const PlayerCallbacks& other) = default;

PlayerTrackerImpl::PlayerCallbacks::~PlayerCallbacks() {
}

Expand Down
1 change: 1 addition & 0 deletions media/cdm/player_tracker_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class MEDIA_EXPORT PlayerTrackerImpl : public PlayerTracker {
struct PlayerCallbacks {
PlayerCallbacks(const base::Closure& new_key_cb,
const base::Closure& cdm_unset_cb);
PlayerCallbacks(const PlayerCallbacks& other);
~PlayerCallbacks();

base::Closure new_key_cb;
Expand Down
3 changes: 3 additions & 0 deletions media/filters/gpu_video_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ GpuVideoDecoder::PendingDecoderBuffer::PendingDecoderBuffer(
: shm_buffer(s), buffer(b), done_cb(done_cb) {
}

GpuVideoDecoder::PendingDecoderBuffer::PendingDecoderBuffer(
const PendingDecoderBuffer& other) = default;

GpuVideoDecoder::PendingDecoderBuffer::~PendingDecoderBuffer() {}

GpuVideoDecoder::BufferData::BufferData(int32_t bbid,
Expand Down
1 change: 1 addition & 0 deletions media/filters/gpu_video_decoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ class MEDIA_EXPORT GpuVideoDecoder
PendingDecoderBuffer(SHMBuffer* s,
const scoped_refptr<DecoderBuffer>& b,
const DecodeCB& done_cb);
PendingDecoderBuffer(const PendingDecoderBuffer& other);
~PendingDecoderBuffer();
SHMBuffer* shm_buffer;
scoped_refptr<DecoderBuffer> buffer;
Expand Down
3 changes: 3 additions & 0 deletions media/filters/video_renderer_algorithm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ VideoRendererAlgorithm::ReadyFrame::ReadyFrame(
drop_count(0) {
}

VideoRendererAlgorithm::ReadyFrame::ReadyFrame(const ReadyFrame& other) =
default;

VideoRendererAlgorithm::ReadyFrame::~ReadyFrame() {
}

Expand Down
1 change: 1 addition & 0 deletions media/filters/video_renderer_algorithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class MEDIA_EXPORT VideoRendererAlgorithm {
// Metadata container for enqueued frames. See |frame_queue_| below.
struct ReadyFrame {
ReadyFrame(const scoped_refptr<VideoFrame>& frame);
ReadyFrame(const ReadyFrame& other);
~ReadyFrame();

// For use with std::lower_bound.
Expand Down
2 changes: 2 additions & 0 deletions media/formats/webm/tracks_builder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ TracksBuilder::Track::Track(int track_num,
}
}

TracksBuilder::Track::Track(const Track& other) = default;

int TracksBuilder::Track::GetSize() const {
return MasterElementSize(kWebMIdTrackEntry, GetPayloadSize());
}
Expand Down
1 change: 1 addition & 0 deletions media/formats/webm/tracks_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class TracksBuilder {
int audio_channels,
double audio_sampling_frequency,
bool allow_invalid_values);
Track(const Track& other);

int GetSize() const;
void Write(uint8_t** buf, int* buf_size) const;
Expand Down
2 changes: 2 additions & 0 deletions media/formats/webm/webm_cluster_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,8 @@ WebMClusterParser::Track::Track(int track_num,
default_duration_ > base::TimeDelta());
}

WebMClusterParser::Track::Track(const Track& other) = default;

WebMClusterParser::Track::~Track() {}

DecodeTimestamp WebMClusterParser::Track::GetReadyUpperBound() {
Expand Down
1 change: 1 addition & 0 deletions media/formats/webm/webm_cluster_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
bool is_video,
base::TimeDelta default_duration,
const scoped_refptr<MediaLog>& media_log);
Track(const Track& other);
~Track();

int track_num() const { return track_num_; }
Expand Down
3 changes: 3 additions & 0 deletions media/video/video_decode_accelerator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ VideoDecodeAccelerator::SupportedProfile::~SupportedProfile() {}

VideoDecodeAccelerator::Capabilities::Capabilities() : flags(NO_FLAGS) {}

VideoDecodeAccelerator::Capabilities::Capabilities(const Capabilities& other) =
default;

VideoDecodeAccelerator::Capabilities::~Capabilities() {}

std::string VideoDecodeAccelerator::Capabilities::AsHumanReadableString()
Expand Down
1 change: 1 addition & 0 deletions media/video/video_decode_accelerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class MEDIA_EXPORT VideoDecodeAccelerator {

struct MEDIA_EXPORT Capabilities {
Capabilities();
Capabilities(const Capabilities& other);
~Capabilities();

std::string AsHumanReadableString() const;
Expand Down

0 comments on commit 9750c9d

Please sign in to comment.