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

Side by Side Diff: media/filters/ffmpeg_video_decoder.h

Issue 5970011: Revert 70077 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initi... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 // The TimeTuple struct is used to hold the needed timestamp data needed for 66 // The TimeTuple struct is used to hold the needed timestamp data needed for
67 // enqueuing a video frame. 67 // enqueuing a video frame.
68 struct TimeTuple { 68 struct TimeTuple {
69 base::TimeDelta timestamp; 69 base::TimeDelta timestamp;
70 base::TimeDelta duration; 70 base::TimeDelta duration;
71 }; 71 };
72 72
73 enum DecoderState { 73 enum DecoderState {
74 kUnInitialized, 74 kUnInitialized,
75 kInitializing,
76 kNormal, 75 kNormal,
77 kFlushCodec, 76 kFlushCodec,
78 kDecodeFinished, 77 kDecodeFinished,
79 kPausing, 78 kPausing,
80 kFlushing, 79 kFlushing,
81 kStopped 80 kStopped
82 }; 81 };
83 82
84 void OnFlushComplete(FilterCallback* callback); 83 void OnFlushComplete(FilterCallback* callback);
85 void OnSeekComplete(FilterCallback* callback); 84 void OnSeekComplete(FilterCallback* callback);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 131
133 // Pointer to the demuxer stream that will feed us compressed buffers. 132 // Pointer to the demuxer stream that will feed us compressed buffers.
134 scoped_refptr<DemuxerStream> demuxer_stream_; 133 scoped_refptr<DemuxerStream> demuxer_stream_;
135 134
136 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 135 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
137 }; 136 };
138 137
139 } // namespace media 138 } // namespace media
140 139
141 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 140 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698