dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-13 14:34:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add GetCanvasSize() method to mux

Browse Source 
Change-Id: If910f5024f4c301a92e6c2e8ee9c315a103c5df7
This commit is contained in:
Urvang Joshi
2013-05-02 13:54:25 -07:00
parent 6393fe4b7c
commit fffefd18c3
6 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mux/muxi.h
View File

@ -236,6 +236,12 @@ WebPChunk** MuxGetChunkListFromId(const WebPMux* mux, WebPChunkId id);
// Validates that the given mux has a single image.
WebPMuxError MuxValidateForImage(const WebPMux* const mux);
// Get the canvas width and height after validating that VP8X/VP8/VP8L chunk and
// canvas size are valid. This method can be used for validation-only purposes
// by passing 'width' and 'height' to be NULL.
WebPMuxError MuxGetCanvasSize(const WebPMux* const mux, int* width,
int* height);
// Validates the given mux object.
WebPMuxError MuxValidate(const WebPMux* const mux);

4
src/mux/muxinternal.c
View File

@ -503,6 +503,10 @@ WebPMuxError MuxValidate(const WebPMux* const mux) {
// Verify mux has at least one image.
if (mux->images_ == NULL) return WEBP_MUX_INVALID_ARGUMENT;
// Validate that VP8X/VP8/VP8L chunk and canvas size are valid.
err = MuxGetCanvasSize(mux, NULL, NULL);
if (err != WEBP_MUX_OK) return err;
err = WebPMuxGetFeatures(mux, &flags);
if (err != WEBP_MUX_OK) return err;

32
src/mux/muxread.c
View File

@ -260,6 +260,38 @@ WebPMux* WebPMuxCreateInternal(const WebPData* bitstream, int copy_data,
//------------------------------------------------------------------------------
// Get API(s).
WebPMuxError MuxGetCanvasSize(const WebPMux* const mux, int* width,
int* height) {
int w, h;
WebPData data;
assert(mux != NULL);
// Check if VP8X chunk is present.
if (MuxGet(mux, IDX_VP8X, 1, &data) == WEBP_MUX_OK) {
if (data.size < VP8X_CHUNK_SIZE) return WEBP_MUX_BAD_DATA;
w = GetLE24(data.bytes + 4) + 1;
h = GetLE24(data.bytes + 7) + 1;
} else { // Single image case.
WebPMuxError err = MuxValidateForImage(mux);
if (err != WEBP_MUX_OK) return err;
err = MuxGetImageWidthHeight(mux->images_->img_, &w, &h);
if (err != WEBP_MUX_OK) return err;
}
if (w * (uint64_t)h >= MAX_IMAGE_AREA) return WEBP_MUX_BAD_DATA;
if (width) *width = w;
if (height) *height = h;
return WEBP_MUX_OK;
}
WebPMuxError WebPMuxGetCanvasSize(const WebPMux* mux, int* width, int* height) {
if (mux == NULL || width == NULL || height == NULL) {
return WEBP_MUX_INVALID_ARGUMENT;
}
return MuxGetCanvasSize(mux, width, height);
}
WebPMuxError WebPMuxGetFeatures(const WebPMux* mux, uint32_t* flags) {
WebPData data;