dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "WebPEncode: clear stats at the start of encode" into 0.2.0

Browse Source
This commit is contained in:
pascal massimino 2012-08-01 12:00:09 -07:00 committed by Gerrit Code Review
commit 5e7963000a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cwebp.c
View File

@ -779,7 +779,7 @@ static int DumpPicture(const WebPPicture* const picture, const char* PGM_name) {
static int ProgressReport(int percent, const WebPPicture* const picture) { static int ProgressReport(int percent, const WebPPicture* const picture) {
printf("[%s]: %3d %% \r", printf("[%s]: %3d %% \r",
(char*)picture->stats->user_data, percent); (char*)picture->user_data, percent);
fflush(stdout); fflush(stdout);
return 1; // all ok return 1; // all ok
} }
@ -1127,7 +1127,7 @@ int main(int argc, const char *argv[]) {
} }
if (!quiet) { if (!quiet) {
picture.stats = &stats; picture.stats = &stats;
stats.user_data = (void*)in_file; picture.user_data = (void*)in_file;
} }
// Compress // Compress

2
src/enc/webpenc.c
View File

@ -344,6 +344,8 @@ int WebPEncode(const WebPConfig* config, WebPPicture* pic) {
if (pic->width > WEBP_MAX_DIMENSION || pic->height > WEBP_MAX_DIMENSION) if (pic->width > WEBP_MAX_DIMENSION || pic->height > WEBP_MAX_DIMENSION)
return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_DIMENSION); return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_DIMENSION);
if (pic->stats != NULL) memset(pic->stats, 0, sizeof(*pic->stats));
if (!config->lossless) { if (!config->lossless) {
VP8Encoder* enc = NULL; VP8Encoder* enc = NULL;
if (pic->y == NULL || pic->u == NULL || pic->v == NULL) { if (pic->y == NULL || pic->u == NULL || pic->v == NULL) {

6
src/webp/encode.h
View File

@ -172,9 +172,6 @@ typedef struct {
int alpha_data_size; // size of the transparency data int alpha_data_size; // size of the transparency data
int layer_data_size; // size of the enhancement layer data int layer_data_size; // size of the enhancement layer data
void* user_data; // this field is free to be set to any value and
// used during callbacks (like progress-report e.g.).
// lossless encoder statistics // lossless encoder statistics
uint32_t lossless_features; // bit0:predictor bit1:cross-color transform uint32_t lossless_features; // bit0:predictor bit1:cross-color transform
// bit2:subtract-green bit3:color indexing // bit2:subtract-green bit3:color indexing
@ -301,6 +298,9 @@ struct WebPPicture {
// If not NULL, report progress during encoding. // If not NULL, report progress during encoding.
WebPProgressHook progress_hook; WebPProgressHook progress_hook;
void* user_data; // this field is free to be set to any value and
// used during callbacks (like progress-report e.g.).
uint32_t pad3[3]; // padding for later use uint32_t pad3[3]; // padding for later use
// Unused for now: original samples (for non-YUV420 modes) // Unused for now: original samples (for non-YUV420 modes)