diff options
Diffstat (limited to 'chromium/media/formats/mpeg')
5 files changed, 28 insertions, 29 deletions
diff --git a/chromium/media/formats/mpeg/adts_stream_parser.cc b/chromium/media/formats/mpeg/adts_stream_parser.cc index ea0f5923096..a59d9ba219d 100644 --- a/chromium/media/formats/mpeg/adts_stream_parser.cc +++ b/chromium/media/formats/mpeg/adts_stream_parser.cc @@ -69,7 +69,7 @@ int ADTSStreamParser::ParseFrameHeader(const uint8* data, if (sync != 0xfff || layer != 0 || frame_length < bytes_read || sample_rate_index >= kADTSFrequencyTableSize || channel_layout_index >= kADTSChannelLayoutTableSize) { - MEDIA_LOG(DEBUG, log_cb()) + MEDIA_LOG(DEBUG, media_log()) << "Invalid header data :" << std::hex << " sync 0x" << sync << " version 0x" << version << " layer 0x" << layer << " sample_rate_index 0x" << sample_rate_index diff --git a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc index 204ee732fce..67b3705b030 100644 --- a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc +++ b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.cc @@ -87,7 +87,7 @@ static const int kCodecDelay = 529; // static bool MPEG1AudioStreamParser::ParseHeader( - const LogCB& log_cb, + const scoped_refptr<MediaLog>& media_log, const uint8* data, Header* header) { BitReader reader(data, kHeaderSize); @@ -128,7 +128,7 @@ bool MPEG1AudioStreamParser::ParseHeader( layer == kLayerReserved || bitrate_index == kBitrateFree || bitrate_index == kBitrateBad || sample_rate_index == kSampleRateReserved) { - MEDIA_LOG(ERROR, log_cb) + MEDIA_LOG(ERROR, media_log) << "Invalid header data :" << std::hex << " sync 0x" << sync << " version 0x" << version << " layer 0x" << layer << " bitrate_index 0x" << bitrate_index << " sample_rate_index 0x" @@ -137,19 +137,19 @@ bool MPEG1AudioStreamParser::ParseHeader( } if (layer == kLayer2 && kIsAllowed[bitrate_index][channel_mode]) { - MEDIA_LOG(ERROR, log_cb) << "Invalid (bitrate_index, channel_mode)" - << " combination :" << std::hex - << " bitrate_index " << bitrate_index - << " channel_mode " << channel_mode; + MEDIA_LOG(ERROR, media_log) << "Invalid (bitrate_index, channel_mode)" + << " combination :" << std::hex + << " bitrate_index " << bitrate_index + << " channel_mode " << channel_mode; return false; } int bitrate = kBitrateMap[bitrate_index][kVersionLayerMap[version][layer]]; if (bitrate == 0) { - MEDIA_LOG(ERROR, log_cb) << "Invalid bitrate :" << std::hex << " version " - << version << " layer " << layer - << " bitrate_index " << bitrate_index; + MEDIA_LOG(ERROR, media_log) << "Invalid bitrate :" << std::hex + << " version " << version << " layer " << layer + << " bitrate_index " << bitrate_index; return false; } @@ -157,9 +157,9 @@ bool MPEG1AudioStreamParser::ParseHeader( int frame_sample_rate = kSampleRateMap[sample_rate_index][version]; if (frame_sample_rate == 0) { - MEDIA_LOG(ERROR, log_cb) << "Invalid sample rate :" << std::hex - << " version " << version << " sample_rate_index " - << sample_rate_index; + MEDIA_LOG(ERROR, media_log) << "Invalid sample rate :" << std::hex + << " version " << version + << " sample_rate_index " << sample_rate_index; return false; } header->sample_rate = frame_sample_rate; @@ -236,7 +236,7 @@ int MPEG1AudioStreamParser::ParseFrameHeader(const uint8* data, return 0; Header header; - if (!ParseHeader(log_cb(), data, &header)) + if (!ParseHeader(media_log(), data, &header)) return -1; *frame_size = header.frame_size; @@ -275,7 +275,7 @@ int MPEG1AudioStreamParser::ParseFrameHeader(const uint8* data, // Check to see if the tag contains 'Xing' or 'Info' if (tag == 0x496e666f || tag == 0x58696e67) { - MEDIA_LOG(DEBUG, log_cb()) << "Skipping XING header."; + MEDIA_LOG(DEBUG, media_log()) << "Skipping XING header."; if (metadata_frame) *metadata_frame = true; return header_bytes_read + reader.bits_read() / 8; diff --git a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h index b2e5086f847..3b299a105bd 100644 --- a/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h +++ b/chromium/media/formats/mpeg/mpeg1_audio_stream_parser.h @@ -62,10 +62,9 @@ class MEDIA_EXPORT MPEG1AudioStreamParser : public MPEGAudioStreamParserBase { // Parses the header starting at |data|. // Assumption: size of array |data| should be at least |kHeaderSize|. // Returns false if the header is not valid. - static bool ParseHeader( - const LogCB& log_cb, - const uint8* data, - Header* header); + static bool ParseHeader(const scoped_refptr<MediaLog>& media_log, + const uint8* data, + Header* header); MPEG1AudioStreamParser(); ~MPEG1AudioStreamParser() override; 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 14fe143c791..d9bf2b529ee 100644 --- a/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.cc +++ b/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/message_loop/message_loop.h" -#include "media/base/buffers.h" #include "media/base/stream_parser_buffer.h" #include "media/base/text_track_config.h" +#include "media/base/timestamp_constants.h" #include "media/base/video_decoder_config.h" namespace media { @@ -62,7 +62,7 @@ void MPEGAudioStreamParserBase::Init( const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, const NewMediaSegmentCB& new_segment_cb, const base::Closure& end_of_segment_cb, - const LogCB& log_cb) { + const scoped_refptr<MediaLog>& media_log) { DVLOG(1) << __FUNCTION__; DCHECK_EQ(state_, UNINITIALIZED); init_cb_ = init_cb; @@ -70,7 +70,7 @@ void MPEGAudioStreamParserBase::Init( new_buffers_cb_ = new_buffers_cb; new_segment_cb_ = new_segment_cb; end_of_segment_cb_ = end_of_segment_cb; - log_cb_ = log_cb; + media_log_ = media_log; ChangeState(INITIALIZED); } @@ -79,7 +79,8 @@ void MPEGAudioStreamParserBase::Flush() { DVLOG(1) << __FUNCTION__; DCHECK_NE(state_, UNINITIALIZED); queue_.Reset(); - timestamp_helper_->SetBaseTimestamp(base::TimeDelta()); + if (timestamp_helper_) + timestamp_helper_->SetBaseTimestamp(base::TimeDelta()); in_media_segment_ = false; } @@ -209,7 +210,6 @@ int MPEGAudioStreamParserBase::ParseFrame(const uint8* data, NULL, 0, false, - false, base::TimeDelta(), codec_delay_); @@ -262,7 +262,7 @@ int MPEGAudioStreamParserBase::ParseIcecastHeader(const uint8* data, int size) { int offset = LocateEndOfHeaders(data, locate_size, 4); if (offset < 0) { if (locate_size == kMaxIcecastHeaderSize) { - MEDIA_LOG(ERROR, log_cb_) << "Icecast header is too large."; + MEDIA_LOG(ERROR, media_log_) << "Icecast header is too large."; return -1; } @@ -323,7 +323,7 @@ bool MPEGAudioStreamParserBase::ParseSyncSafeInt(BitReader* reader, for (int i = 0; i < 4; ++i) { uint8 tmp; if (!reader->ReadBits(1, &tmp) || tmp != 0) { - MEDIA_LOG(ERROR, log_cb_) << "ID3 syncsafe integer byte MSb is not 0!"; + MEDIA_LOG(ERROR, media_log_) << "ID3 syncsafe integer byte MSb is not 0!"; return false; } 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 2443322fdd9..832199389eb 100644 --- a/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/chromium/media/formats/mpeg/mpeg_audio_stream_parser_base.h @@ -38,7 +38,7 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, const NewMediaSegmentCB& new_segment_cb, const base::Closure& end_of_segment_cb, - const LogCB& log_cb) override; + const scoped_refptr<MediaLog>& media_log) override; void Flush() override; bool Parse(const uint8* buf, int size) override; @@ -81,7 +81,7 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { int* sample_count, bool* metadata_frame) const = 0; - const LogCB& log_cb() const { return log_cb_; } + const scoped_refptr<MediaLog>& media_log() const { return media_log_; } private: enum State { @@ -137,7 +137,7 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { NewBuffersCB new_buffers_cb_; NewMediaSegmentCB new_segment_cb_; base::Closure end_of_segment_cb_; - LogCB log_cb_; + scoped_refptr<MediaLog> media_log_; ByteQueue queue_; |