Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Side by Side Diff: source/libvpx/vp8/encoder/psnr.c

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vp8/encoder/picklpf.c ('k') | source/libvpx/vp8/encoder/quantize.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 11
12 #include "vpx_scale/yv12config.h" 12 #include "vpx_scale/yv12config.h"
13 #include "math.h" 13 #include "math.h"
14 #include "vp8/common/systemdependent.h" /* for vp8_clear_system_state() */ 14 #include "vp8/common/systemdependent.h" /* for vp8_clear_system_state() */
15 15
16 #define MAX_PSNR 60 16 #define MAX_PSNR 100
17 17
18 double vp8_mse2psnr(double Samples, double Peak, double Mse) 18 double vp8_mse2psnr(double Samples, double Peak, double Mse)
19 { 19 {
20 double psnr; 20 double psnr;
21 21
22 if ((double)Mse > 0.0) 22 if ((double)Mse > 0.0)
23 psnr = 10.0 * log10(Peak * Peak * Samples / Mse); 23 psnr = 10.0 * log10(Peak * Peak * Samples / Mse);
24 else 24 else
25 psnr = MAX_PSNR; /* Limit to prevent / 0 */ 25 psnr = MAX_PSNR; /* Limit to prevent / 0 */
26 26
27 if (psnr > MAX_PSNR) 27 if (psnr > MAX_PSNR)
28 psnr = MAX_PSNR; 28 psnr = MAX_PSNR;
29 29
30 return psnr; 30 return psnr;
31 } 31 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/encoder/picklpf.c ('k') | source/libvpx/vp8/encoder/quantize.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698