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

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

Issue 1254953004: Hacking ffvp9 decoder support for profiling. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Supress windows warning Created 4 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 unified diff | Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/threading/thread_checker.h" 13 #include "base/threading/thread_checker.h"
14 #include "media/base/video_decoder.h" 14 #include "media/base/video_decoder.h"
15 #include "media/base/video_decoder_config.h" 15 #include "media/base/video_decoder_config.h"
16 #include "media/base/video_frame_pool.h" 16 #include "media/base/video_frame_pool.h"
17 #include "media/ffmpeg/ffmpeg_deleters.h" 17 #include "media/ffmpeg/ffmpeg_deleters.h"
18 18
19 struct AVCodecContext; 19 struct AVCodecContext;
20 struct AVCodecParserContext;
20 struct AVFrame; 21 struct AVFrame;
21 22
22 namespace base { 23 namespace base {
23 class SingleThreadTaskRunner; 24 class SingleThreadTaskRunner;
24 } 25 }
25 26
26 namespace media { 27 namespace media {
27 28
28 class DecoderBuffer; 29 class DecoderBuffer;
29 30
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // FFmpeg structures owned by this object. 86 // FFmpeg structures owned by this object.
86 scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; 87 scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
87 scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_; 88 scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
88 89
89 VideoDecoderConfig config_; 90 VideoDecoderConfig config_;
90 91
91 VideoFramePool frame_pool_; 92 VideoFramePool frame_pool_;
92 93
93 bool decode_nalus_; 94 bool decode_nalus_;
94 95
96 scoped_ptr<AVCodecParserContext, ScopedPtrAVFreeParserContext>
97 parser_context_;
98
95 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 99 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
96 }; 100 };
97 101
98 } // namespace media 102 } // namespace media
99 103
100 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 104 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698