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

minor style fixes

Browse Source 
Change-Id: I78a6fa19a799c41d6536631f547279692b658c4d
This commit is contained in:
Pascal Massimino 2012-04-30 06:57:57 +00:00 committed by James Zern
parent b38dfccf8d
commit 50679acf25
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/enc/frame.c
View File

@ -113,7 +113,7 @@ static int Record(int bit, proba_t* const stats) {
// Note: no need to record the fixed probas. // Note: no need to record the fixed probas.
static int RecordCoeffs(int ctx, const VP8Residual* const res) { static int RecordCoeffs(int ctx, const VP8Residual* const res) {
int n = res->first; int n = res->first;
proba_t *s = res->stats[VP8EncBands[n]][ctx]; proba_t* s = res->stats[VP8EncBands[n]][ctx];
if (res->last < 0) { if (res->last < 0) {
Record(0, s + 0); Record(0, s + 0);
return 0; return 0;
@ -242,7 +242,7 @@ static void SetResidualCoeffs(const int16_t* const coeffs,
static int GetResidualCost(int ctx, const VP8Residual* const res) { static int GetResidualCost(int ctx, const VP8Residual* const res) {
int n = res->first; int n = res->first;
int p0 = res->prob[VP8EncBands[n]][ctx][0]; int p0 = res->prob[VP8EncBands[n]][ctx][0];
const uint16_t *t = res->cost[VP8EncBands[n]][ctx]; const uint16_t* t = res->cost[VP8EncBands[n]][ctx];
int cost; int cost;
if (res->last < 0) { if (res->last < 0) {
@ -717,16 +717,16 @@ static void StoreSideInfo(const VP8EncIterator* const it) {
const VP8MBInfo* const mb = it->mb_; const VP8MBInfo* const mb = it->mb_;
WebPPicture* const pic = enc->pic_; WebPPicture* const pic = enc->pic_;
if (pic->stats) { if (pic->stats != NULL) {
StoreSSE(it); StoreSSE(it);
enc->block_count_[0] += (mb->type_ == 0); enc->block_count_[0] += (mb->type_ == 0);
enc->block_count_[1] += (mb->type_ == 1); enc->block_count_[1] += (mb->type_ == 1);
enc->block_count_[2] += (mb->skip_ != 0); enc->block_count_[2] += (mb->skip_ != 0);
} }
if (pic->extra_info) { if (pic->extra_info != NULL) {
uint8_t* const info = &pic->extra_info[it->x_ + it->y_ * enc->mb_w_]; uint8_t* const info = &pic->extra_info[it->x_ + it->y_ * enc->mb_w_];
switch(pic->extra_info_type) { switch (pic->extra_info_type) {
case 1: *info = mb->type_; break; case 1: *info = mb->type_; break;
case 2: *info = mb->segment_; break; case 2: *info = mb->segment_; break;
case 3: *info = enc->dqm_[mb->segment_].quant_; break; case 3: *info = enc->dqm_[mb->segment_].quant_; break;

6
src/enc/webpenc.c
View File

@ -49,7 +49,7 @@ int WebPPictureInitInternal(WebPPicture* const picture, int version) {
if (version != WEBP_ENCODER_ABI_VERSION) { if (version != WEBP_ENCODER_ABI_VERSION) {
return 0; // caller/system version mismatch! return 0; // caller/system version mismatch!
} }
if (picture) { if (picture != NULL) {
memset(picture, 0, sizeof(*picture)); memset(picture, 0, sizeof(*picture));
picture->writer = DummyWriter; picture->writer = DummyWriter;
WebPEncodingSetError(picture, VP8_ENC_OK); WebPEncodingSetError(picture, VP8_ENC_OK);
@ -260,7 +260,7 @@ static VP8Encoder* InitEncoder(const WebPConfig* const config,
} }
static void DeleteEncoder(VP8Encoder* enc) { static void DeleteEncoder(VP8Encoder* enc) {
if (enc) { if (enc != NULL) {
VP8EncDeleteAlpha(enc); VP8EncDeleteAlpha(enc);
#ifdef WEBP_EXPERIMENTAL_FEATURES #ifdef WEBP_EXPERIMENTAL_FEATURES
VP8EncDeleteLayer(enc); VP8EncDeleteLayer(enc);
@ -287,7 +287,7 @@ static void FinalizePSNR(const VP8Encoder* const enc) {
static void StoreStats(VP8Encoder* const enc) { static void StoreStats(VP8Encoder* const enc) {
WebPAuxStats* const stats = enc->pic_->stats; WebPAuxStats* const stats = enc->pic_->stats;
if (stats) { if (stats != NULL) {
int i, s; int i, s;
for (i = 0; i < NUM_MB_SEGMENTS; ++i) { for (i = 0; i < NUM_MB_SEGMENTS; ++i) {
stats->segment_level[i] = enc->dqm_[i].fstrength_; stats->segment_level[i] = enc->dqm_[i].fstrength_;