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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/temporal_layers.h

Issue 2489843002: Revert of Extract bitrate allocation of spatial/temporal layers out of codec impl. (Closed)
Patch Set: Created 4 years, 1 month 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
OLDNEW
1 /* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 1 /* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
2 * 2 *
3 * Use of this source code is governed by a BSD-style license 3 * Use of this source code is governed by a BSD-style license
4 * that can be found in the LICENSE file in the root of the source 4 * that can be found in the LICENSE file in the root of the source
5 * tree. An additional intellectual property rights grant can be found 5 * tree. An additional intellectual property rights grant can be found
6 * in the file PATENTS. All contributing project authors may 6 * in the file PATENTS. All contributing project authors may
7 * be found in the AUTHORS file in the root of the source tree. 7 * be found in the AUTHORS file in the root of the source tree.
8 */ 8 */
9 /* 9 /*
10 * This file defines the interface for doing temporal layers with VP8. 10 * This file defines the interface for doing temporal layers with VP8.
11 */ 11 */
12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_
13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_
14 14
15 #include <vector> 15 #include "vpx/vpx_encoder.h"
16 16
17 #include "webrtc/common_video/include/video_image.h" 17 #include "webrtc/common_video/include/video_image.h"
18 #include "webrtc/typedefs.h" 18 #include "webrtc/typedefs.h"
19 19
20 struct vpx_codec_enc_cfg;
21 typedef struct vpx_codec_enc_cfg vpx_codec_enc_cfg_t;
22
23 namespace webrtc { 20 namespace webrtc {
24 21
25 struct CodecSpecificInfoVP8; 22 struct CodecSpecificInfoVP8;
26 23
27 class TemporalLayers { 24 class TemporalLayers {
28 public: 25 public:
29 // Factory for TemporalLayer strategy. Default behavior is a fixed pattern 26 // Factory for TemporalLayer strategy. Default behaviour is a fixed pattern
30 // of temporal layers. See default_temporal_layers.cc 27 // of temporal layers. See default_temporal_layers.cc
31 virtual ~TemporalLayers() {} 28 virtual ~TemporalLayers() {}
32 29
33 // Returns the recommended VP8 encode flags needed. May refresh the decoder 30 // Returns the recommended VP8 encode flags needed. May refresh the decoder
34 // and/or update the reference buffers. 31 // and/or update the reference buffers.
35 virtual int EncodeFlags(uint32_t timestamp) = 0; 32 virtual int EncodeFlags(uint32_t timestamp) = 0;
36 33
37 // Update state based on new bitrate target and incoming framerate. 34 virtual bool ConfigureBitrates(int bitrate_kbit,
38 // Returns the bitrate allocation for the active temporal layers. 35 int max_bitrate_kbit,
39 virtual std::vector<uint32_t> OnRatesUpdated(int bitrate_kbps, 36 int framerate,
40 int max_bitrate_kbps, 37 vpx_codec_enc_cfg_t* cfg) = 0;
41 int framerate) = 0;
42
43 // Update the encoder configuration with target bitrates or other parameters.
44 // Returns true iff the configuration was actually modified.
45 virtual bool UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) = 0;
46 38
47 virtual void PopulateCodecSpecific(bool base_layer_sync, 39 virtual void PopulateCodecSpecific(bool base_layer_sync,
48 CodecSpecificInfoVP8* vp8_info, 40 CodecSpecificInfoVP8* vp8_info,
49 uint32_t timestamp) = 0; 41 uint32_t timestamp) = 0;
50 42
51 virtual void FrameEncoded(unsigned int size, uint32_t timestamp, int qp) = 0; 43 virtual void FrameEncoded(unsigned int size, uint32_t timestamp, int qp) = 0;
52 44
53 virtual int CurrentLayerId() const = 0; 45 virtual int CurrentLayerId() const = 0;
46
47 virtual bool UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) = 0;
54 }; 48 };
55 49
56 class TemporalLayersListener;
57 class TemporalLayersFactory { 50 class TemporalLayersFactory {
58 public: 51 public:
59 TemporalLayersFactory() : listener_(nullptr) {}
60 virtual ~TemporalLayersFactory() {} 52 virtual ~TemporalLayersFactory() {}
61 virtual TemporalLayers* Create(int simulcast_id, 53 virtual TemporalLayers* Create(int temporal_layers,
62 int temporal_layers,
63 uint8_t initial_tl0_pic_idx) const; 54 uint8_t initial_tl0_pic_idx) const;
64 void SetListener(TemporalLayersListener* listener);
65
66 protected:
67 TemporalLayersListener* listener_;
68 }; 55 };
69 56
70 // Factory for a temporal layers strategy that adaptively changes the number of 57 // Factory for a temporal layers strategy that adaptively changes the number of
71 // layers based on input frame rate so that the base layer has an acceptable 58 // layers based on input framerate so that the base layer has an acceptable
72 // frame rate. See realtime_temporal_layers.cc 59 // framerate. See realtime_temporal_layers.cc
73 class RealTimeTemporalLayersFactory : public TemporalLayersFactory { 60 class RealTimeTemporalLayersFactory : public TemporalLayersFactory {
74 public: 61 public:
75 RealTimeTemporalLayersFactory() {}
76 ~RealTimeTemporalLayersFactory() override {} 62 ~RealTimeTemporalLayersFactory() override {}
77 TemporalLayers* Create(int simulcast_id, 63 TemporalLayers* Create(int num_temporal_layers,
78 int num_temporal_layers,
79 uint8_t initial_tl0_pic_idx) const override; 64 uint8_t initial_tl0_pic_idx) const override;
80 }; 65 };
81 66
82 class TemporalLayersListener {
83 public:
84 TemporalLayersListener() {}
85 virtual ~TemporalLayersListener() {}
86
87 virtual void OnTemporalLayersCreated(int simulcast_id,
88 TemporalLayers* layers) = 0;
89 };
90
91 } // namespace webrtc 67 } // namespace webrtc
92 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ 68 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698