Remove the macro of vp9_lookahead_push

angiebird committed 7 years ago

Commit 53a0b131 parent b1021be3 files · +7 −12Browse files

Unified · Split

3 files

@@ -5365,10 +5365,7 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, vpx_enc_frame_flags_t frame_flags, · 5364 unmodified lines
5365	5365	vpx_usec_timer_start(&timer);
5366	5366
5367	5367	if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time,
5368		−#if CONFIG_VP9_HIGHBITDEPTH
5369		− use_highbitdepth,
5370		−#endif // CONFIG_VP9_HIGHBITDEPTH
5371		− frame_flags))
	5368	+ use_highbitdepth, frame_flags))
5372	5369	res = -1;
5373	5370	vpx_usec_timer_mark(&timer);
5374	5371	cpi->time_receive_data += vpx_usec_timer_elapsed(&timer);

@@ -83,10 +83,7 @@ bail: · 82 unmodified lines
83	83	#define USE_PARTIAL_COPY 0
84	84
85	85	int vp9_lookahead_push(struct lookahead_ctx ctx, YV12_BUFFER_CONFIG src,
86		− int64_t ts_start, int64_t ts_end,
87		−#if CONFIG_VP9_HIGHBITDEPTH
88		− int use_highbitdepth,
89		−#endif
	86	+ int64_t ts_start, int64_t ts_end, int use_highbitdepth,
90	87	vpx_enc_frame_flags_t flags) {
91	88	struct lookahead_entry *buf;
92	89	#if USE_PARTIAL_COPY
@@ -101,6 +98,10 @@ int vp9_lookahead_push(struct lookahead_ctx ctx, YV12_BUFFER_CONFIG src, · 8 unmodified lines
101	98	int subsampling_x = src->subsampling_x;
102	99	int subsampling_y = src->subsampling_y;
103	100	int larger_dimensions, new_dimensions;
	101	+#if !CONFIG_VP9_HIGHBITDEPTH
	102	+ (void)use_highbitdepth;
	103	+ assert(use_highbitdepth == 0);
	104	+#endif
104	105
105	106	if (ctx->sz + 1 + MAX_PRE_FRAMES > ctx->max_sz) return 1;
106	107	ctx->sz++;

@@ -73,10 +73,7 @@ void vp9_lookahead_destroy(struct lookahead_ctx *ctx); · 72 unmodified lines
73	73	* \param[in] active_map Map that specifies which macroblock is active
74	74	*/
75	75	int vp9_lookahead_push(struct lookahead_ctx ctx, YV12_BUFFER_CONFIG src,
76		− int64_t ts_start, int64_t ts_end,
77		−#if CONFIG_VP9_HIGHBITDEPTH
78		− int use_highbitdepth,
79		−#endif
	76	+ int64_t ts_start, int64_t ts_end, int use_highbitdepth,
80	77	vpx_enc_frame_flags_t flags);
81	78
82	79	/**\brief Get the next source buffer to encode

Keyboard shortcuts