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

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

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 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_unittest.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 #include <memory> 9 #include <memory>
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 namespace media { 23 namespace media {
24 24
25 class DecoderBuffer; 25 class DecoderBuffer;
26 class MediaLog; 26 class MediaLog;
27 27
28 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { 28 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
29 public: 29 public:
30 static bool IsCodecSupported(VideoCodec codec); 30 static bool IsCodecSupported(VideoCodec codec);
31 31
32 explicit FFmpegVideoDecoder(scoped_refptr<MediaLog> media_log); 32 explicit FFmpegVideoDecoder(MediaLog* media_log);
33 ~FFmpegVideoDecoder() override; 33 ~FFmpegVideoDecoder() override;
34 34
35 // Allow decoding of individual NALU. Entire frames are required by default. 35 // Allow decoding of individual NALU. Entire frames are required by default.
36 // Disables low-latency mode. Must be called before Initialize(). 36 // Disables low-latency mode. Must be called before Initialize().
37 void set_decode_nalus(bool decode_nalus) { decode_nalus_ = decode_nalus; } 37 void set_decode_nalus(bool decode_nalus) { decode_nalus_ = decode_nalus; }
38 38
39 // VideoDecoder implementation. 39 // VideoDecoder implementation.
40 std::string GetDisplayName() const override; 40 std::string GetDisplayName() const override;
41 void Initialize(const VideoDecoderConfig& config, 41 void Initialize(const VideoDecoderConfig& config,
42 bool low_delay, 42 bool low_delay,
(...skipping 25 matching lines...) Expand all
68 68
69 // Handles (re-)initializing the decoder with a (new) config. 69 // Handles (re-)initializing the decoder with a (new) config.
70 // Returns true if initialization was successful. 70 // Returns true if initialization was successful.
71 bool ConfigureDecoder(bool low_delay); 71 bool ConfigureDecoder(bool low_delay);
72 72
73 // Releases resources associated with |codec_context_| and |av_frame_| 73 // Releases resources associated with |codec_context_| and |av_frame_|
74 // and resets them to NULL. 74 // and resets them to NULL.
75 void ReleaseFFmpegResources(); 75 void ReleaseFFmpegResources();
76 76
77 base::ThreadChecker thread_checker_; 77 base::ThreadChecker thread_checker_;
78 scoped_refptr<MediaLog> media_log_; 78 MediaLog* media_log_;
79 79
80 DecoderState state_; 80 DecoderState state_;
81 81
82 OutputCB output_cb_; 82 OutputCB output_cb_;
83 83
84 // FFmpeg structures owned by this object. 84 // FFmpeg structures owned by this object.
85 std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; 85 std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
86 std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_; 86 std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
87 87
88 VideoDecoderConfig config_; 88 VideoDecoderConfig config_;
89 89
90 VideoFramePool frame_pool_; 90 VideoFramePool frame_pool_;
91 91
92 bool decode_nalus_; 92 bool decode_nalus_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 94 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
95 }; 95 };
96 96
97 } // namespace media 97 } // namespace media
98 98
99 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 99 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698