eb939f45b8
This patch allows coding frames using references of different resolution, in ZEROMV mode. For compound prediction, either reference may be scaled. To test, I use the resize_test and enable WRITE_RECON_BUFFER in vp9_onyxd_if.c. It's also useful to apply this patch to test/i420_video_source.h: --- a/test/i420_video_source.h +++ b/test/i420_video_source.h @@ -93,6 +93,7 @@ class I420VideoSource : public VideoSource { virtual void FillFrame() { // Read a frame from input_file. + if (frame_ != 3) if (fread(img_->img_data, raw_sz_, 1, input_file_) == 0) { limit_ = frame_; } This forces the frame that the resolution changes on to be coded with no motion, only scaling, and improves the quality of the result. Change-Id: I1ee75d19a437ff801192f767fd02a36bcbd1d496
49 lines
1.9 KiB
C
49 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#ifndef VP9_ENCODER_VP9_RDOPT_H_
|
|
#define VP9_ENCODER_VP9_RDOPT_H_
|
|
|
|
#define RDCOST(RM,DM,R,D) ( ((128+((int64_t)R)*(RM)) >> 8) + ((int64_t)DM)*(D) )
|
|
#define RDCOST_8x8(RM,DM,R,D) ( ((128+((int64_t)R)*(RM)) >> 8) + ((int64_t)DM)*(D) )
|
|
|
|
extern void vp9_initialize_rd_consts(VP9_COMP *cpi, int Qvalue);
|
|
|
|
extern void vp9_initialize_me_consts(VP9_COMP *cpi, int QIndex);
|
|
|
|
extern void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
|
int *r, int *d);
|
|
|
|
extern void vp9_rd_pick_intra_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x,
|
|
int *r, int *d);
|
|
|
|
extern void vp9_rd_pick_intra_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x,
|
|
int *r, int *d);
|
|
|
|
extern void vp9_pick_mode_inter_macroblock(VP9_COMP *cpi, MACROBLOCK *x,
|
|
int mb_row, int mb_col,
|
|
int *r, int *d);
|
|
|
|
extern int64_t vp9_rd_pick_inter_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x,
|
|
int mb_row, int mb_col,
|
|
int *r, int *d);
|
|
|
|
extern int64_t vp9_rd_pick_inter_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x,
|
|
int mb_row, int mb_col,
|
|
int *r, int *d);
|
|
|
|
extern void vp9_init_me_luts();
|
|
|
|
extern void vp9_set_mbmode_and_mvs(MACROBLOCK *x,
|
|
MB_PREDICTION_MODE mb, int_mv *mv);
|
|
|
|
#endif // VP9_ENCODER_VP9_RDOPT_H_
|