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

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 508dd095407f27020fe3558156e48890391d5661..5c5732509d707d3ad0e3894df581991bed55b406 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -123,10 +123,10 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
// into memory we control.
scoped_refptr<DecoderBuffer> buffer;
if (side_data_size > 0) {
- buffer = DecoderBuffer::CopyFrom(packet.get()->data, packet.get()->size,
+ buffer = DecoderBuffer::copy_from(packet.get()->data, packet.get()->size,
side_data, side_data_size);
} else {
- buffer = DecoderBuffer::CopyFrom(packet.get()->data, packet.get()->size);
+ buffer = DecoderBuffer::copy_from(packet.get()->data, packet.get()->size);
}
if ((type() == DemuxerStream::AUDIO && audio_config_.is_encrypted()) ||
@@ -140,17 +140,17 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
buffer->SetDecryptConfig(config.Pass());
}
- buffer->SetTimestamp(ConvertStreamTimestamp(
+ buffer->set_timestamp(ConvertStreamTimestamp(
stream_->time_base, packet->pts));
- buffer->SetDuration(ConvertStreamTimestamp(
+ buffer->set_duration(ConvertStreamTimestamp(
stream_->time_base, packet->duration));
- if (buffer->GetTimestamp() != kNoTimestamp() &&
+ if (buffer->get_timestamp() != kNoTimestamp() &&
last_packet_timestamp_ != kNoTimestamp() &&
- last_packet_timestamp_ < buffer->GetTimestamp()) {
- buffered_ranges_.Add(last_packet_timestamp_, buffer->GetTimestamp());
+ last_packet_timestamp_ < buffer->get_timestamp()) {
+ buffered_ranges_.Add(last_packet_timestamp_, buffer->get_timestamp());
demuxer_->NotifyBufferingChanged();
}
- last_packet_timestamp_ = buffer->GetTimestamp();
+ last_packet_timestamp_ = buffer->get_timestamp();
buffer_queue_.Push(buffer);
SatisfyPendingRead();
@@ -175,7 +175,7 @@ void FFmpegDemuxerStream::Stop() {
buffer_queue_.Clear();
if (!read_cb_.is_null()) {
base::ResetAndReturn(&read_cb_).Run(
- DemuxerStream::kOk, DecoderBuffer::CreateEOSBuffer());
+ DemuxerStream::kOk, DecoderBuffer::create_eos_buffer());
}
demuxer_ = NULL;
stream_ = NULL;
@@ -202,7 +202,7 @@ void FFmpegDemuxerStream::Read(const ReadCB& read_cb) {
// TODO(scherkus): it would be cleaner to reply with an error message.
if (!demuxer_) {
base::ResetAndReturn(&read_cb_).Run(
- DemuxerStream::kOk, DecoderBuffer::CreateEOSBuffer());
+ DemuxerStream::kOk, DecoderBuffer::create_eos_buffer());
return;
}
@@ -249,7 +249,7 @@ void FFmpegDemuxerStream::SatisfyPendingRead() {
DemuxerStream::kOk, buffer_queue_.Pop());
} else if (end_of_stream_) {
base::ResetAndReturn(&read_cb_).Run(
- DemuxerStream::kOk, DecoderBuffer::CreateEOSBuffer());
+ DemuxerStream::kOk, DecoderBuffer::create_eos_buffer());
}
}

Powered by Google App Engine
This is Rietveld 408576698