Index: webrtc/modules/video_coding/codecs/test/videoprocessor.h |
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h |
index 0855ed2af6123bf4ff3b67383d0a77a8e822ad8c..a7953558fe0c6bfed7523ec382d9e3d962aceb98 100644 |
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h |
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h |
@@ -23,6 +23,8 @@ |
#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" |
#include "webrtc/modules/video_coding/codecs/test/stats.h" |
#include "webrtc/modules/video_coding/utility/ivf_file_writer.h" |
+#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" |
+#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" |
#include "webrtc/test/testsupport/frame_reader.h" |
#include "webrtc/test/testsupport/frame_writer.h" |
@@ -143,6 +145,12 @@ class VideoProcessor { |
// Frame number must be an integer >= 0. |
virtual bool ProcessFrame(int frame_number) = 0; |
+ // Return the qp used by encoder. |
+ virtual int GetQpFromEncoder() = 0; |
brandtr
2017/05/26 07:18:45
See comment below first.
Add parameter "int frame
jianj
2017/05/26 18:20:27
Done.
|
+ |
+ // Return the qp from the qp parser. |
+ virtual int GetQpFromBitstream() = 0; |
brandtr
2017/05/26 07:18:45
Same here.
jianj
2017/05/26 18:20:27
Done.
|
+ |
// Updates the encoder with the target bit rate and the frame rate. |
virtual void SetRates(int bit_rate, int frame_rate) = 0; |
@@ -176,6 +184,9 @@ class VideoProcessorImpl : public VideoProcessor { |
bool Init() override; |
bool ProcessFrame(int frame_number) override; |
+ int GetQpFromEncoder() override; |
brandtr
2017/05/26 07:18:45
Place these two lines in the private section (*),
jianj
2017/05/26 18:20:27
Done.
|
+ int GetQpFromBitstream() override; |
+ |
private: |
// Container that holds per-frame information that needs to be stored between |
// calls to Encode and Decode, as well as the corresponding callbacks. It is |
@@ -256,6 +267,7 @@ class VideoProcessorImpl : public VideoProcessor { |
// Invoked by the callback when a frame has completed decoding. |
void FrameDecoded(const webrtc::VideoFrame& image); |
+ |
brandtr
2017/05/26 07:18:45
Remove.
jianj
2017/05/26 18:20:27
Done.
|
// Updates the encoder with the target bit rate and the frame rate. |
void SetRates(int bit_rate, int frame_rate) override; |
@@ -321,6 +333,9 @@ class VideoProcessorImpl : public VideoProcessor { |
Stats* stats_; |
int num_dropped_frames_; |
int num_spatial_resizes_; |
+ |
+ int qp_encoder_; |
brandtr
2017/05/26 07:18:45
We are trying to get away from using direct member
jianj
2017/05/26 18:20:27
Done.
|
+ int qp_bitstream_; |
}; |
} // namespace test |