Skip to content

Commit 4527bd3

Browse files
committed
fix(core): keep ratio default
1 parent 3f5ec1a commit 4527bd3

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

e2e/jest-puppeteer.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
server: {
99
command: './node_modules/ts-node/dist/bin.js e2e/server.ts',
1010
port: 9898,
11-
launchTimeout: 50000,
11+
launchTimeout: 80000,
1212
debug: true
1313
}
1414
};

packages/paddlejs-backend-webgl/src/ops/shader/custom/imgFeed.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function mainFunc() {
1010
void main(void) {
1111
vec2 outCoord = vCoord.xy;
1212
// 支持模型不按比例拉伸
13-
if (u_keep_ratio > 0) {
13+
if (u_keep_ratio == 0) {
1414
vec4 origin = TEXTURE2D(texture_origin, outCoord);
1515
setPackedOutput(origin);
1616
return;

packages/paddlejs-core/src/runner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ export default class Runner {
281281

282282
const {
283283
webglFeedProcess = false,
284-
keepRatio = false
284+
keepRatio = true
285285
} = this.runnerConfig;
286286
if (webglFeedProcess || env.get('webgl_gpu_pipeline')) {
287287
// support imageDataLike feed which has unit8ClampedArray data and width + height or shape

packages/paddlejs-core/src/transform/feedProcess.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export default class WebglFeedProcess extends Transformer {
9898
},
9999
u_keep_ratio: {
100100
type: UniformType.uniform1i,
101-
value: 0
101+
value: 1
102102
}
103103
},
104104
isPacked: true

packages/paddlejs-models/detect/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export async function init() {
1414
mean: [0.5, 0.5, 0.5],
1515
std: [0.5, 0.5, 0.5],
1616
bgr: true,
17-
keepRatio: true,
17+
keepRatio: false,
1818
webglFeedProcess: true
1919
});
2020

0 commit comments

Comments
 (0)