Merge "vp9: Allow for disabling loopfilter per spatial layer"

Marco Paniconi committed 6 years ago

Commit 3f7fee22 parents b1d704f 7beafef6 files · +96 −7Browse files

Unified · Split

6 files

test/svc_end_to_end_test.cc +84 −1
test/svc_test.cc +7 −6
vp9/encoder/vp9_svc_layercontext.c +2 −0
vp9/encoder/vp9_svc_layercontext.h +1 −0
vp9/vp9_cx_iface.c +1 −0
vpx/vpx_encoder.h +1 −0

@@ -494,7 +494,31 @@ class LoopfilterOnePassCbrSvc : public OnePassCbrSvc, · 493 unmodified lines
494	virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,	494	virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
495	::libvpx_test::Encoder *encoder) {	495	::libvpx_test::Encoder *encoder) {
496	PreEncodeFrameHookSetup(video, encoder);	496	PreEncodeFrameHookSetup(video, encoder);
497	encoder->Control(VP9E_SET_DISABLE_LOOPFILTER, loopfilter_off_);	497	if (number_temporal_layers_ > 1 \|\| number_spatial_layers_ > 1) {
		498	// Consider 3 cases:
		499	if (loopfilter_off_ == 0) {
		500	// loopfilter is on for all spatial layers on every superrframe.
		501	for (int i = 0; i < VPX_SS_MAX_LAYERS; ++i) {
		502	svc_params_.loopfilter_ctrl[i] = 0;
		503	}
		504	} else if (loopfilter_off_ == 1) {
		505	// loopfilter is off for non-reference frames for all spatial layers.
		506	for (int i = 0; i < VPX_SS_MAX_LAYERS; ++i) {
		507	svc_params_.loopfilter_ctrl[i] = 1;
		508	}
		509	} else {
		510	// loopfilter is off for all SL0 frames, and off only for non-reference
		511	// frames for SL > 0.
		512	svc_params_.loopfilter_ctrl[0] = 2;
		513	for (int i = 1; i < VPX_SS_MAX_LAYERS; ++i) {
		514	svc_params_.loopfilter_ctrl[i] = 1;
		515	}
		516	}
		517	encoder->Control(VP9E_SET_SVC_PARAMETERS, &svc_params_);
		518	} else if (number_temporal_layers_ == 1 && number_spatial_layers_ == 1) {
		519	// For non-SVC mode use the single layer control.
		520	encoder->Control(VP9E_SET_DISABLE_LOOPFILTER, loopfilter_off_);
		521	}
498	}	522	}
499		523
500	virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {	524	virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {
@@ -524,6 +548,35 @@ class LoopfilterOnePassCbrSvc : public OnePassCbrSvc, · 23 unmodified lines
524	int num_nonref_frames_;	548	int num_nonref_frames_;
525	};	549	};
526		550
		551	TEST_P(LoopfilterOnePassCbrSvc, OnePassCbrSvc1SL1TLLoopfilterOff) {
		552	SetSvcConfig(1, 1);
		553	cfg_.rc_buf_initial_sz = 500;
		554	cfg_.rc_buf_optimal_sz = 500;
		555	cfg_.rc_buf_sz = 1000;
		556	cfg_.rc_min_quantizer = 0;
		557	cfg_.rc_max_quantizer = 63;
		558	cfg_.g_threads = 1;
		559	cfg_.rc_dropframe_thresh = 0;
		560	cfg_.rc_target_bitrate = 800;
		561	cfg_.kf_max_dist = 9999;
		562	cfg_.rc_end_usage = VPX_CBR;
		563	cfg_.g_lag_in_frames = 0;
		564	cfg_.g_error_resilient = 1;
		565	cfg_.ts_rate_decimator[0] = 1;
		566	cfg_.temporal_layering_mode = 0;
		567	::libvpx_test::I420VideoSource video("niklas_640_480_30.yuv", 640, 480, 30, 1,
		568	0, 400);
		569	cfg_.rc_target_bitrate = 600;
		570	AssignLayerBitrates();
		571	ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
		572	#if CONFIG_VP9_DECODER
		573	if (loopfilter_off_ == 0)
		574	EXPECT_EQ(GetNonRefFrames(), GetMismatchFrames());
		575	else
		576	EXPECT_EQ(GetMismatchFrames(), 0);
		577	#endif
		578	}
		579
527	TEST_P(LoopfilterOnePassCbrSvc, OnePassCbrSvc1SL3TLLoopfilterOff) {	580	TEST_P(LoopfilterOnePassCbrSvc, OnePassCbrSvc1SL3TLLoopfilterOff) {
528	SetSvcConfig(1, 3);	581	SetSvcConfig(1, 3);
529	cfg_.rc_buf_initial_sz = 500;	582	cfg_.rc_buf_initial_sz = 500;
@@ -542,7 +595,37 @@ TEST_P(LoopfilterOnePassCbrSvc, OnePassCbrSvc1SL3TLLoopfilterOff) { · 12 unmodified lines
542	cfg_.ts_rate_decimator[1] = 2;	595	cfg_.ts_rate_decimator[1] = 2;
543	cfg_.ts_rate_decimator[2] = 1;	596	cfg_.ts_rate_decimator[2] = 1;
544	cfg_.temporal_layering_mode = 3;	597	cfg_.temporal_layering_mode = 3;
		598	::libvpx_test::I420VideoSource video("niklas_640_480_30.yuv", 640, 480, 30, 1,
		599	0, 400);
		600	cfg_.rc_target_bitrate = 600;
		601	AssignLayerBitrates();
		602	ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
		603	#if CONFIG_VP9_DECODER
		604	if (loopfilter_off_ == 0)
		605	EXPECT_EQ(GetNonRefFrames(), GetMismatchFrames());
		606	else
		607	EXPECT_EQ(GetMismatchFrames(), 0);
		608	#endif
		609	}
545		610
		611	TEST_P(LoopfilterOnePassCbrSvc, OnePassCbrSvc3SL3TLLoopfilterOff) {
		612	SetSvcConfig(3, 3);
		613	cfg_.rc_buf_initial_sz = 500;
		614	cfg_.rc_buf_optimal_sz = 500;
		615	cfg_.rc_buf_sz = 1000;
		616	cfg_.rc_min_quantizer = 0;
		617	cfg_.rc_max_quantizer = 63;
		618	cfg_.g_threads = 1;
		619	cfg_.rc_dropframe_thresh = 0;
		620	cfg_.rc_target_bitrate = 800;
		621	cfg_.kf_max_dist = 9999;
		622	cfg_.rc_end_usage = VPX_CBR;
		623	cfg_.g_lag_in_frames = 0;
		624	cfg_.g_error_resilient = 1;
		625	cfg_.ts_rate_decimator[0] = 4;
		626	cfg_.ts_rate_decimator[1] = 2;
		627	cfg_.ts_rate_decimator[2] = 1;
		628	cfg_.temporal_layering_mode = 3;
546	::libvpx_test::I420VideoSource video("niklas_640_480_30.yuv", 640, 480, 30, 1,	629	::libvpx_test::I420VideoSource video("niklas_640_480_30.yuv", 640, 480, 30, 1,
547	0, 400);	630	0, 400);
548	cfg_.rc_target_bitrate = 600;	631	cfg_.rc_target_bitrate = 600;

test/svc_test.cc+7−6

       svc_params_.max_quantizers[i] = 63;
       svc_params_.min_quantizers[i] = 0;
     }
-    svc_params_.speed_per_layer[0] = base_speed_setting_;
+    if (number_temporal_layers_ > 1 || number_spatial_layers_ > 1) {
-    for (int i = 1; i < VPX_SS_MAX_LAYERS; ++i) {
+      svc_params_.speed_per_layer[0] = base_speed_setting_;
-      svc_params_.speed_per_layer[i] = speed_setting_;
+      for (int i = 1; i < VPX_SS_MAX_LAYERS; ++i) {
+        svc_params_.speed_per_layer[i] = speed_setting_;
+      }
+      encoder->Control(VP9E_SET_SVC, 1);
+      encoder->Control(VP9E_SET_SVC_PARAMETERS, &svc_params_);
     }
-    encoder->Control(VP9E_SET_SVC, 1);
-    encoder->Control(VP9E_SET_SVC_PARAMETERS, &svc_params_);
     encoder->Control(VP8E_SET_CPUUSED, speed_setting_);
     encoder->Control(VP9E_SET_AQ_MODE, 3);
     encoder->Control(VP8E_SET_MAX_INTRA_BITRATE_PCT, 300);

vp9/encoder/vp9_svc_layercontext.c+2−0

   if (is_one_pass_cbr_svc(cpi) && lc->speed > 0) {
     cpi->oxcf.speed = lc->speed;
   }
+  if (lc->loopfilter_ctrl >= 0 || lc->loopfilter_ctrl < 3)
+    cpi->loopfilter_ctrl = lc->loopfilter_ctrl;
   // Reset the frames_since_key and frames_to_key counters to their values
   // before the layer restore. Keep these defined for the stream (not layer).
   if (cpi->svc.number_temporal_layers > 1 ||

vp9/encoder/vp9_svc_layercontext.h+1−0

@@ -71,6 +71,7 @@ typedef struct { · 70 unmodified lines
71	int actual_num_seg2_blocks;	71	int actual_num_seg2_blocks;
72	int counter_encode_maxq_scene_change;	72	int counter_encode_maxq_scene_change;
73	uint8_t speed;	73	uint8_t speed;
		74	int loopfilter_ctrl;
74	} LAYER_CONTEXT;	75	} LAYER_CONTEXT;
75		76
76	typedef struct SVC {	77	typedef struct SVC {

vp9/vp9_cx_iface.c+1−0

@@ -1573,6 +1573,7 @@ static vpx_codec_err_t ctrl_set_svc_parameters(vpx_codec_alg_priv_t *ctx, · 1572 unmodified lines
1573	lc->scaling_factor_num = params->scaling_factor_num[sl];	1573	lc->scaling_factor_num = params->scaling_factor_num[sl];
1574	lc->scaling_factor_den = params->scaling_factor_den[sl];	1574	lc->scaling_factor_den = params->scaling_factor_den[sl];
1575	lc->speed = params->speed_per_layer[sl];	1575	lc->speed = params->speed_per_layer[sl];
		1576	lc->loopfilter_ctrl = params->loopfilter_ctrl[sl];
1576	}	1577	}
1577	}	1578	}
1578		1579

vpx/vpx_encoder.h+1−0

@@ -705,6 +705,7 @@ typedef struct vpx_svc_parameters { · 704 unmodified lines
705	int scaling_factor_den[VPX_MAX_LAYERS]; /*< Scaling factor-denominator /	705	int scaling_factor_den[VPX_MAX_LAYERS]; /*< Scaling factor-denominator /
706	int speed_per_layer[VPX_MAX_LAYERS]; /*< Speed setting for each sl /	706	int speed_per_layer[VPX_MAX_LAYERS]; /*< Speed setting for each sl /
707	int temporal_layering_mode; /*< Temporal layering mode /	707	int temporal_layering_mode; /*< Temporal layering mode /
		708	int loopfilter_ctrl[VPX_MAX_LAYERS]; /*< Loopfilter ctrl for each sl /
708	} vpx_svc_extra_cfg_t;	709	} vpx_svc_extra_cfg_t;
709		710
710	/*!\brief Initialize an encoder instance	711	/*!\brief Initialize an encoder instance

Merge "vp9: Allow for disabling loopfilter per spatial layer"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code