diff options
Diffstat (limited to 'chromium/media/formats/mpeg')
10 files changed, 24 insertions, 24 deletions
diff --git a/chromium/media/formats/mpeg/adts_constants.cc b/chromium/media/formats/mpeg/adts_constants.cc index db82ac81678..5714b01d59c 100644 --- a/chromium/media/formats/mpeg/adts_constants.cc +++ b/chromium/media/formats/mpeg/adts_constants.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/adts_constants.h b/chromium/media/formats/mpeg/adts_constants.h index 1156f1ea508..5f8600c5791 100644 --- a/chromium/media/formats/mpeg/adts_constants.h +++ b/chromium/media/formats/mpeg/adts_constants.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/adts_stream_parser.cc b/chromium/media/formats/mpeg/adts_stream_parser.cc index 116f536a64d..a406375fc44 100644 --- a/chromium/media/formats/mpeg/adts_stream_parser.cc +++ b/chromium/media/formats/mpeg/adts_stream_parser.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/adts_stream_parser.h b/chromium/media/formats/mpeg/adts_stream_parser.h index 6b155b1102f..393b2c44f28 100644 --- a/chromium/media/formats/mpeg/adts_stream_parser.h +++ b/chromium/media/formats/mpeg/adts_stream_parser.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/adts_stream_parser_unittest.cc b/chromium/media/formats/mpeg/adts_stream_parser_unittest.cc index 8b3a055441e..53df8614afd 100644 --- a/chromium/media/formats/mpeg/adts_stream_parser_unittest.cc +++ b/chromium/media/formats/mpeg/adts_stream_parser_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc index 5b996764f4f..7ef761848f7 100644 --- a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc +++ b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h index 1b33af97b9f..7ba9b46555c 100644 --- a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h +++ b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc index 0315436cfb4..34d077e57ae 100644 --- a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc +++ b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.cc index e2cdd453233..237f7966666 100644 --- a/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.cc +++ b/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -64,20 +64,20 @@ MPEGAudioStreamParserBase::~MPEGAudioStreamParserBase() = default; void MPEGAudioStreamParserBase::Init( InitCB init_cb, - const NewConfigCB& config_cb, - const NewBuffersCB& new_buffers_cb, + NewConfigCB config_cb, + NewBuffersCB new_buffers_cb, bool ignore_text_tracks, - const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, - const NewMediaSegmentCB& new_segment_cb, - const EndMediaSegmentCB& end_of_segment_cb, + EncryptedMediaInitDataCB encrypted_media_init_data_cb, + NewMediaSegmentCB new_segment_cb, + EndMediaSegmentCB end_of_segment_cb, MediaLog* media_log) { DVLOG(1) << __func__; DCHECK_EQ(state_, UNINITIALIZED); init_cb_ = std::move(init_cb); - config_cb_ = config_cb; - new_buffers_cb_ = new_buffers_cb; - new_segment_cb_ = new_segment_cb; - end_of_segment_cb_ = end_of_segment_cb; + config_cb_ = std::move(config_cb); + new_buffers_cb_ = std::move(new_buffers_cb); + new_segment_cb_ = std::move(new_segment_cb); + end_of_segment_cb_ = std::move(end_of_segment_cb); media_log_ = media_log; ChangeState(INITIALIZED); diff --git a/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.h index 58e4f114c64..5fbaa09127e 100644 --- a/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -40,12 +40,12 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { // StreamParser implementation. void Init(InitCB init_cb, - const NewConfigCB& config_cb, - const NewBuffersCB& new_buffers_cb, + NewConfigCB config_cb, + NewBuffersCB new_buffers_cb, bool ignore_text_tracks, - const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, - const NewMediaSegmentCB& new_segment_cb, - const EndMediaSegmentCB& end_of_segment_cb, + EncryptedMediaInitDataCB encrypted_media_init_data_cb, + NewMediaSegmentCB new_segment_cb, + EndMediaSegmentCB end_of_segment_cb, MediaLog* media_log) override; void Flush() override; bool GetGenerateTimestampsFlag() const override; |