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

Unified Diff: trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc

Issue 14320005: Revert 194993 "Remove reference counting from media::VideoDecode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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
« no previous file with comments | « trunk/src/media/filters/ffmpeg_video_decoder.cc ('k') | trunk/src/media/filters/gpu_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc
===================================================================
--- trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc (revision 195011)
+++ trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc (working copy)
@@ -50,12 +50,14 @@
class FFmpegVideoDecoderTest : public testing::Test {
public:
FFmpegVideoDecoderTest()
- : decoder_(new FFmpegVideoDecoder(message_loop_.message_loop_proxy())),
+ : decoder_(NULL),
demuxer_(new StrictMock<MockDemuxerStream>()),
read_cb_(base::Bind(&FFmpegVideoDecoderTest::FrameReady,
base::Unretained(this))) {
FFmpegGlue::InitializeFFmpeg();
+ decoder_ = new FFmpegVideoDecoder(message_loop_.message_loop_proxy());
+
// Initialize various test buffers.
frame_buffer_.reset(new uint8[kCodedSize.GetArea()]);
end_of_stream_buffer_ = DecoderBuffer::CreateEOSBuffer();
@@ -199,7 +201,7 @@
const scoped_refptr<VideoFrame>&));
MessageLoop message_loop_;
- scoped_ptr<FFmpegVideoDecoder> decoder_;
+ scoped_refptr<FFmpegVideoDecoder> decoder_;
scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_;
MockStatisticsCB statistics_cb_;
VideoDecoderConfig config_;
« no previous file with comments | « trunk/src/media/filters/ffmpeg_video_decoder.cc ('k') | trunk/src/media/filters/gpu_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698