Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

H264 #7

Merged
merged 32 commits into from
Dec 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a79455e
wip
Nov 11, 2019
b2050ec
working sample
Nov 11, 2019
5af9dd4
video media extractor: remove ffmpy and encode video chunks directly via
Nov 12, 2019
950e751
fixed import of MP4Reader
Nov 13, 2019
151651c
using worker for decoder
Nov 13, 2019
61fa2d0
cleanup
Nov 14, 2019
ea69acf
recompile decoder to increase memory size
Nov 14, 2019
2a58cbd
performance logs
Nov 15, 2019
19103a2
fixed Broadway YUV->RGBA conversation
Nov 18, 2019
3539872
fixed preview creating
Nov 18, 2019
b5607ed
asm.js -> wasm
Nov 19, 2019
025506e
added cropImage function
Nov 19, 2019
9a2c04e
added mimetype for wasm ext
Nov 19, 2019
87cb87a
set crf=10 for original chunks
Nov 20, 2019
38ef91d
Merge remote-tracking branch 'develop' into h264
Nov 20, 2019
acbeb87
missed Decoder.js
Nov 20, 2019
600fef7
downscale compressed video chunks
Nov 26, 2019
ccdaf6d
move upscale to player (it works much faster)
Nov 26, 2019
75b8dde
two chunk types
Nov 26, 2019
6df2ed3
added flag to create tasks with zip chunks for video data
Nov 26, 2019
e5c1c86
fixed player
Nov 29, 2019
b644989
wip
Dec 2, 2019
5a9f335
couple of fixes
Dec 2, 2019
8a0ace3
uncomment downscaling
Dec 3, 2019
0511b6a
fixed player
Dec 3, 2019
776b6ed
removed comments
Dec 3, 2019
f75db83
fixed cleanup method
Dec 5, 2019
7c18c40
little code refactoring
Dec 5, 2019
dc6c319
added decoded frames cache limits
Dec 5, 2019
79bb02a
wip
Dec 10, 2019
3ca071c
added filtering of data chunk requests, fixes
Dec 11, 2019
e781938
fixed onmessage handler for archives
Dec 12, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ RUN apt-get update && \
dpkg-reconfigure -f noninteractive tzdata && \
add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \
add-apt-repository --remove ppa:mc3man/xerus-media -y && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/* && \
echo 'application/wasm wasm' >> /etc/mime.types

# Add a non-root user
ENV USER=${USER}
Expand Down
249 changes: 177 additions & 72 deletions cvat-core/src/frames.js

Large diffs are not rendered by default.

22 changes: 20 additions & 2 deletions cvat-core/src/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,9 @@
stop_frame: undefined,
frame_filter: undefined,
data_chunk_size: undefined,
data_chunk_type: undefined,
data_compressed_chunk_type: undefined,
data_original_chunk_type: undefined,
use_zip_chunks: undefined,
};

for (const property in data) {
Expand Down Expand Up @@ -950,6 +952,17 @@
data.image_quality = quality;
},
},
useZipChunks: {
get: () => data.use_zip_chunks,
set: (useZipChunks) => {
if (typeof (useZipChunks) !== 'boolean') {
throw new ArgumentError(
'Value must be a boolean',
);
}
data.use_zip_chunks = useZipChunks;
},
},
/**
* After task has been created value can be appended only.
* @name labels
Expand Down Expand Up @@ -1144,7 +1157,7 @@
},
},
dataChunkType: {
get: () => data.data_chunk_type,
get: () => data.data_compressed_chunk_type,
},
}));

Expand Down Expand Up @@ -1269,6 +1282,8 @@
this.task.dataChunkType,
this.task.mode,
frame,
this.startFrame,
this.stopFrame,
);
return frameData;
};
Expand Down Expand Up @@ -1384,6 +1399,7 @@
server_files: this.serverFiles,
remote_files: this.remoteFiles,
image_quality: this.imageQuality,
use_zip_chunks: this.useZipChunks,
};

if (typeof (this.startFrame) !== 'undefined') {
Expand Down Expand Up @@ -1424,6 +1440,8 @@
this.dataChunkType,
this.mode,
frame,
0,
this.size - 1,
);
return result;
};
Expand Down
86 changes: 86 additions & 0 deletions cvat-data/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cvat-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"babel": "^5.8.23",
"babel-core": "^6.26.3",
"babel-loader": "^8.0.6",
"copy-webpack-plugin": "^5.0.5",
"core-js": "^3.2.1",
"eslint": "^6.4.0",
"eslint-config-airbnb-base": "^14.0.0",
Expand Down
Loading