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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_mbgraph.c

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_firstpass.c ('k') | source/libvpx/vp9/encoder/vp9_mcomp.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 #include <limits.h> 11 #include <limits.h>
12 12
13 #include "./vp9_rtcd.h" 13 #include "./vp9_rtcd.h"
14 #include "./vpx_dsp_rtcd.h" 14 #include "./vpx_dsp_rtcd.h"
15 15
16 #include "vpx_dsp/vpx_dsp_common.h"
16 #include "vpx_mem/vpx_mem.h" 17 #include "vpx_mem/vpx_mem.h"
17 #include "vpx_ports/system_state.h" 18 #include "vpx_ports/system_state.h"
18 #include "vp9/encoder/vp9_segmentation.h" 19 #include "vp9/encoder/vp9_segmentation.h"
19 #include "vp9/encoder/vp9_mcomp.h" 20 #include "vp9/encoder/vp9_mcomp.h"
20 #include "vp9/common/vp9_blockd.h" 21 #include "vp9/common/vp9_blockd.h"
21 #include "vp9/common/vp9_reconinter.h" 22 #include "vp9/common/vp9_reconinter.h"
22 #include "vp9/common/vp9_reconintra.h" 23 #include "vp9/common/vp9_reconintra.h"
23 24
24 25
25 static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi, 26 static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 assert(q_cur != NULL); 410 assert(q_cur != NULL);
410 411
411 update_mbgraph_frame_stats(cpi, frame_stats, &q_cur->img, 412 update_mbgraph_frame_stats(cpi, frame_stats, &q_cur->img,
412 golden_ref, cpi->Source); 413 golden_ref, cpi->Source);
413 } 414 }
414 415
415 vpx_clear_system_state(); 416 vpx_clear_system_state();
416 417
417 separate_arf_mbs(cpi); 418 separate_arf_mbs(cpi);
418 } 419 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_firstpass.c ('k') | source/libvpx/vp9/encoder/vp9_mcomp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698