Remove implicit conversions from scoped_refptr to T* in media/

media/base/stream_parser_buffer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/stream_parser_buffer.h"
 
 #include "base/logging.h"
 #include "media/base/buffers.h"
 
 namespace media {
@@ skipping 51 matching lines @@
 }
 
 DecodeTimestamp StreamParserBuffer::GetDecodeTimestamp() const {
   if (decode_timestamp_ == kNoDecodeTimestamp())
     return DecodeTimestamp::FromPresentationTime(timestamp());
   return decode_timestamp_;
 }
 
 void StreamParserBuffer::SetDecodeTimestamp(DecodeTimestamp timestamp) {
   decode_timestamp_ = timestamp;
-  if (preroll_buffer_)
+  if (preroll_buffer_.get())
     preroll_buffer_->SetDecodeTimestamp(timestamp);
 }
 
 StreamParserBuffer::StreamParserBuffer(const uint8* data, int data_size,
                                        const uint8* side_data,
                                        int side_data_size, bool is_keyframe,
                                        Type type, TrackId track_id)
     : DecoderBuffer(data, data_size, side_data, side_data_size),
       is_keyframe_(is_keyframe),
       decode_timestamp_(kNoDecodeTimestamp()),
       config_id_(kInvalidConfigId),
       type_(type),
       track_id_(track_id) {
   // TODO(scherkus): Should DataBuffer constructor accept a timestamp and
   // duration to force clients to set them? Today they end up being zero which
   // is both a common and valid value and could lead to bugs.
   if (data) {
     set_duration(kNoTimestamp());
   }
 }
 
 StreamParserBuffer::~StreamParserBuffer() {}
 
 int StreamParserBuffer::GetConfigId() const {
   return config_id_;
 }
 
 void StreamParserBuffer::SetConfigId(int config_id) {
   config_id_ = config_id;
-  if (preroll_buffer_)
+  if (preroll_buffer_.get())
     preroll_buffer_->SetConfigId(config_id);
 }
 
 void StreamParserBuffer::ConvertToSpliceBuffer(
     const BufferQueue& pre_splice_buffers) {
   DCHECK(splice_buffers_.empty());
   DCHECK(duration() > base::TimeDelta())
       << "Only buffers with a valid duration can convert to a splice buffer."
       << " pts " << timestamp().InSecondsF()
       << " dts " << GetDecodeTimestamp().InSecondsF()
       << " dur " << duration().InSecondsF();
   DCHECK(!end_of_stream());
 
   // Make a copy of this first, before making any changes.
   scoped_refptr<StreamParserBuffer> overlapping_buffer = CopyBuffer(*this);
   overlapping_buffer->set_splice_timestamp(kNoTimestamp());
 
   const scoped_refptr<StreamParserBuffer>& first_splice_buffer =
       pre_splice_buffers.front();
 
   // Ensure the given buffers are actually before the splice point.
   DCHECK(first_splice_buffer->timestamp() <= overlapping_buffer->timestamp());
 
   // TODO(dalecurtis): We should also clear |data| and |side_data|, but since
   // that implies EOS care must be taken to ensure there are no clients relying
   // on that behavior.
 
   // Move over any preroll from this buffer.
-  if (preroll_buffer_) {
-    DCHECK(!overlapping_buffer->preroll_buffer_);
+  if (preroll_buffer_.get()) {
+    DCHECK(!overlapping_buffer->preroll_buffer_.get());
     overlapping_buffer->preroll_buffer_.swap(preroll_buffer_);
   }
 
   // Rewrite |this| buffer as a splice buffer.
   SetDecodeTimestamp(first_splice_buffer->GetDecodeTimestamp());
   SetConfigId(first_splice_buffer->GetConfigId());
   set_timestamp(first_splice_buffer->timestamp());
   is_keyframe_ = first_splice_buffer->IsKeyframe();
   type_ = first_splice_buffer->type();
   track_id_ = first_splice_buffer->track_id();
   set_splice_timestamp(overlapping_buffer->timestamp());
 
   // The splice duration is the duration of all buffers before the splice plus
   // the highest ending timestamp after the splice point.
   DCHECK(overlapping_buffer->duration() > base::TimeDelta());
   DCHECK(pre_splice_buffers.back()->duration() > base::TimeDelta());
   set_duration(
       std::max(overlapping_buffer->timestamp() + overlapping_buffer->duration(),
                pre_splice_buffers.back()->timestamp() +
                    pre_splice_buffers.back()->duration()) -
       first_splice_buffer->timestamp());
 
   // Copy all pre splice buffers into our wrapper buffer.
   for (BufferQueue::const_iterator it = pre_splice_buffers.begin();
        it != pre_splice_buffers.end();
        ++it) {
     const scoped_refptr<StreamParserBuffer>& buffer = *it;
     DCHECK(!buffer->end_of_stream());
-    DCHECK(!buffer->preroll_buffer());
+    DCHECK(!buffer->preroll_buffer().get());
     DCHECK(buffer->splice_buffers().empty());
-    splice_buffers_.push_back(CopyBuffer(*buffer));
+    splice_buffers_.push_back(CopyBuffer(*buffer.get()));
     splice_buffers_.back()->set_splice_timestamp(splice_timestamp());
   }
 
   splice_buffers_.push_back(overlapping_buffer);
 }
 
 void StreamParserBuffer::SetPrerollBuffer(
     const scoped_refptr<StreamParserBuffer>& preroll_buffer) {
-  DCHECK(!preroll_buffer_);
+  DCHECK(!preroll_buffer_.get());
   DCHECK(!end_of_stream());
   DCHECK(!preroll_buffer->end_of_stream());
-  DCHECK(!preroll_buffer->preroll_buffer_);
+  DCHECK(!preroll_buffer->preroll_buffer_.get());
   DCHECK(preroll_buffer->splice_timestamp() == kNoTimestamp());
   DCHECK(preroll_buffer->splice_buffers().empty());
   DCHECK(preroll_buffer->timestamp() <= timestamp());
   DCHECK(preroll_buffer->discard_padding() == DecoderBuffer::DiscardPadding());
   DCHECK_EQ(preroll_buffer->type(), type());
   DCHECK_EQ(preroll_buffer->track_id(), track_id());
 
   preroll_buffer_ = preroll_buffer;
   preroll_buffer_->set_timestamp(timestamp());
   preroll_buffer_->SetDecodeTimestamp(GetDecodeTimestamp());
 
   // Mark the entire buffer for discard.
   preroll_buffer_->set_discard_padding(
       std::make_pair(kInfiniteDuration(), base::TimeDelta()));
 }
 
 void StreamParserBuffer::set_timestamp(base::TimeDelta timestamp) {
   DecoderBuffer::set_timestamp(timestamp);
-  if (preroll_buffer_)
+  if (preroll_buffer_.get())
     preroll_buffer_->set_timestamp(timestamp);
 }
 
 }  // namespace media