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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h

Issue 1690193003: Remove Reset from conditionally-compiled decoders. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.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 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 * 9 *
10 */ 10 */
(...skipping 22 matching lines...) Expand all
33 class H264DecoderImpl : public H264Decoder { 33 class H264DecoderImpl : public H264Decoder {
34 public: 34 public:
35 H264DecoderImpl(); 35 H264DecoderImpl();
36 ~H264DecoderImpl() override; 36 ~H264DecoderImpl() override;
37 37
38 // If |codec_settings| is NULL it is ignored. If it is not NULL, 38 // If |codec_settings| is NULL it is ignored. If it is not NULL,
39 // |codec_settings->codecType| must be |kVideoCodecH264|. 39 // |codec_settings->codecType| must be |kVideoCodecH264|.
40 int32_t InitDecode(const VideoCodec* codec_settings, 40 int32_t InitDecode(const VideoCodec* codec_settings,
41 int32_t number_of_cores) override; 41 int32_t number_of_cores) override;
42 int32_t Release() override; 42 int32_t Release() override;
43 int32_t Reset() override;
44 43
45 int32_t RegisterDecodeCompleteCallback( 44 int32_t RegisterDecodeCompleteCallback(
46 DecodedImageCallback* callback) override; 45 DecodedImageCallback* callback) override;
47 46
48 // |missing_frames|, |fragmentation| and |render_time_ms| are ignored. 47 // |missing_frames|, |fragmentation| and |render_time_ms| are ignored.
49 int32_t Decode(const EncodedImage& input_image, 48 int32_t Decode(const EncodedImage& input_image,
50 bool /*missing_frames*/, 49 bool /*missing_frames*/,
51 const RTPFragmentationHeader* /*fragmentation*/, 50 const RTPFragmentationHeader* /*fragmentation*/,
52 const CodecSpecificInfo* codec_specific_info = nullptr, 51 const CodecSpecificInfo* codec_specific_info = nullptr,
53 int64_t render_time_ms = -1) override; 52 int64_t render_time_ms = -1) override;
(...skipping 12 matching lines...) Expand all
66 I420BufferPool pool_; 65 I420BufferPool pool_;
67 rtc::scoped_ptr<AVCodecContext, AVCodecContextDeleter> av_context_; 66 rtc::scoped_ptr<AVCodecContext, AVCodecContextDeleter> av_context_;
68 rtc::scoped_ptr<AVFrame, AVFrameDeleter> av_frame_; 67 rtc::scoped_ptr<AVFrame, AVFrameDeleter> av_frame_;
69 68
70 DecodedImageCallback* decoded_image_callback_; 69 DecodedImageCallback* decoded_image_callback_;
71 }; 70 };
72 71
73 } // namespace webrtc 72 } // namespace webrtc
74 73
75 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_ 74 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_DECODER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698