ref: 740883897a7ae91d03cd0fab88e35416d87aea9c
parent: eedda5f9249de8446d8406d4c30d6a1b211552d1
parent: f87a4594fbd0b19071a2befebf52d3f5fabd1a9e
author: Johann Koenig <johannkoenig@google.com>
date: Wed Jan 17 15:17:33 EST 2018
Merge "Revert "Add frame width & height to frame pkt. Add test."" into mandarinduck
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -277,21 +277,6 @@
SetMode(GET_PARAM(1));
}
- virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {
- ASSERT_NE(static_cast<int>(pkt->data.frame.width), 0);
- ASSERT_NE(static_cast<int>(pkt->data.frame.height), 0);
- encode_frame_width_.push_back(pkt->data.frame.width);
- encode_frame_height_.push_back(pkt->data.frame.height);
- }
-
- unsigned int GetFrameWidth(size_t idx) const {
- return encode_frame_width_[idx];
- }
-
- unsigned int GetFrameHeight(size_t idx) const {
- return encode_frame_height_[idx];
- }
-
virtual void DecompressedFrameHook(const vpx_image_t &img,
vpx_codec_pts_t pts) {
frame_info_list_.push_back(FrameInfo(pts, img.d_w, img.d_h));
@@ -298,8 +283,6 @@
}
std::vector<FrameInfo> frame_info_list_;
- std::vector<unsigned int> encode_frame_width_;
- std::vector<unsigned int> encode_frame_height_;
};
TEST_P(ResizeTest, TestExternalResizeWorks) {
@@ -313,9 +296,6 @@
const unsigned int frame = static_cast<unsigned>(info->pts);
unsigned int expected_w;
unsigned int expected_h;
- const size_t idx = info - frame_info_list_.begin();
- ASSERT_EQ(info->w, GetFrameWidth(idx));
- ASSERT_EQ(info->h, GetFrameHeight(idx));
ScaleForFrameNumber(frame, kInitialWidth, kInitialHeight, &expected_w,
&expected_h, 0);
EXPECT_EQ(expected_w, info->w)
@@ -484,23 +464,8 @@
++mismatch_nframes_;
}
- virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {
- ASSERT_NE(static_cast<int>(pkt->data.frame.width), 0);
- ASSERT_NE(static_cast<int>(pkt->data.frame.height), 0);
- encode_frame_width_.push_back(pkt->data.frame.width);
- encode_frame_height_.push_back(pkt->data.frame.height);
- }
-
unsigned int GetMismatchFrames() { return mismatch_nframes_; }
- unsigned int GetFrameWidth(size_t idx) const {
- return encode_frame_width_[idx];
- }
-
- unsigned int GetFrameHeight(size_t idx) const {
- return encode_frame_height_[idx];
- }
-
void DefaultConfig() {
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 600;
@@ -528,8 +493,6 @@
bool change_bitrate_;
double mismatch_psnr_;
int mismatch_nframes_;
- std::vector<unsigned int> encode_frame_width_;
- std::vector<unsigned int> encode_frame_height_;
};
TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) {
@@ -619,9 +582,6 @@
int resize_count = 0;
for (std::vector<FrameInfo>::const_iterator info = frame_info_list_.begin();
info != frame_info_list_.end(); ++info) {
- const size_t idx = info - frame_info_list_.begin();
- ASSERT_EQ(info->w, GetFrameWidth(idx));
- ASSERT_EQ(info->h, GetFrameHeight(idx));
if (info->w != last_w || info->h != last_h) {
resize_count++;
if (resize_count == 1) {
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -902,8 +902,6 @@
(unsigned long)((delta * ctx->cfg.g_timebase.den + round) /
ctx->cfg.g_timebase.num / 10000000);
pkt.data.frame.flags = lib_flags << 16;
- pkt.data.frame.width = cpi->common.Width;
- pkt.data.frame.height = cpi->common.Height;
if (lib_flags & FRAMEFLAGS_KEY) {
pkt.data.frame.flags |= VPX_FRAME_IS_KEY;
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -1260,8 +1260,6 @@
pkt.data.frame.duration = (unsigned long)ticks_to_timebase_units(
timebase, dst_end_time_stamp - dst_time_stamp);
pkt.data.frame.flags = get_frame_pkt_flags(cpi, lib_flags);
- pkt.data.frame.width = cpi->common.width;
- pkt.data.frame.height = cpi->common.height;
if (ctx->pending_cx_data) {
ctx->pending_frame_sizes[ctx->pending_frame_count++] = size;
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -63,7 +63,7 @@
* fields to structures
*/
#define VPX_ENCODER_ABI_VERSION \
- (7 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
+ (6 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
/*! \brief Encoder capabilities bitfield
*
@@ -182,8 +182,6 @@
* Only applicable when "output partition" mode is enabled. First
* partition has id 0.*/
int partition_id;
- unsigned int width; /**< frame width */
- unsigned int height; /**< frame height */
} frame; /**< data for compressed frame packet */
vpx_fixed_buf_t twopass_stats; /**< data for two-pass packet */
vpx_fixed_buf_t firstpass_mb_stats; /**< first pass mb packet */