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

Side by Side Diff: source/libvpx/vp9/common/vp9_onyxc_int.h

Issue 1169543007: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 6 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/common/vp9_filter.h ('k') | source/libvpx/vp9/common/vp9_reconintra.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
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 #if CONFIG_VP9_POSTPROC 258 #if CONFIG_VP9_POSTPROC
259 struct postproc_state postproc_state; 259 struct postproc_state postproc_state;
260 #endif 260 #endif
261 261
262 int error_resilient_mode; 262 int error_resilient_mode;
263 int frame_parallel_decoding_mode; 263 int frame_parallel_decoding_mode;
264 264
265 int log2_tile_cols, log2_tile_rows; 265 int log2_tile_cols, log2_tile_rows;
266 int byte_alignment; 266 int byte_alignment;
267 int skip_loop_filter;
267 268
268 // Private data associated with the frame buffer callbacks. 269 // Private data associated with the frame buffer callbacks.
269 void *cb_priv; 270 void *cb_priv;
270 vpx_get_frame_buffer_cb_fn_t get_fb_cb; 271 vpx_get_frame_buffer_cb_fn_t get_fb_cb;
271 vpx_release_frame_buffer_cb_fn_t release_fb_cb; 272 vpx_release_frame_buffer_cb_fn_t release_fb_cb;
272 273
273 // Handles memory for the codec. 274 // Handles memory for the codec.
274 InternalFrameBufferList int_frame_buffers; 275 InternalFrameBufferList int_frame_buffers;
275 276
276 // External BufferPool passed from outside. 277 // External BufferPool passed from outside.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 return ALIGN_POWER_OF_TWO(n_mis, MI_BLOCK_SIZE_LOG2); 335 return ALIGN_POWER_OF_TWO(n_mis, MI_BLOCK_SIZE_LOG2);
335 } 336 }
336 337
337 static INLINE void init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) { 338 static INLINE void init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) {
338 int i; 339 int i;
339 340
340 for (i = 0; i < MAX_MB_PLANE; ++i) { 341 for (i = 0; i < MAX_MB_PLANE; ++i) {
341 xd->plane[i].dqcoeff = xd->dqcoeff; 342 xd->plane[i].dqcoeff = xd->dqcoeff;
342 xd->above_context[i] = cm->above_context + 343 xd->above_context[i] = cm->above_context +
343 i * sizeof(*cm->above_context) * 2 * mi_cols_aligned_to_sb(cm->mi_cols); 344 i * sizeof(*cm->above_context) * 2 * mi_cols_aligned_to_sb(cm->mi_cols);
345
346 if (xd->plane[i].plane_type == PLANE_TYPE_Y) {
347 memcpy(xd->plane[i].seg_dequant, cm->y_dequant, sizeof(cm->y_dequant));
348 } else {
349 memcpy(xd->plane[i].seg_dequant, cm->uv_dequant, sizeof(cm->uv_dequant));
350 }
351 xd->fc = cm->fc;
352 xd->frame_parallel_decoding_mode = cm->frame_parallel_decoding_mode;
344 } 353 }
345 354
346 xd->above_seg_context = cm->above_seg_context; 355 xd->above_seg_context = cm->above_seg_context;
347 xd->mi_stride = cm->mi_stride; 356 xd->mi_stride = cm->mi_stride;
348 xd->error_info = &cm->error; 357 xd->error_info = &cm->error;
349 } 358 }
350 359
351 static INLINE int frame_is_intra_only(const VP9_COMMON *const cm) { 360 static INLINE int frame_is_intra_only(const VP9_COMMON *const cm) {
352 return cm->frame_type == KEY_FRAME || cm->intra_only; 361 return cm->frame_type == KEY_FRAME || cm->intra_only;
353 } 362 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 assert(bsl >= 0); 443 assert(bsl >= 0);
435 444
436 return (left * 2 + above) + bsl * PARTITION_PLOFFSET; 445 return (left * 2 + above) + bsl * PARTITION_PLOFFSET;
437 } 446 }
438 447
439 #ifdef __cplusplus 448 #ifdef __cplusplus
440 } // extern "C" 449 } // extern "C"
441 #endif 450 #endif
442 451
443 #endif // VP9_COMMON_VP9_ONYXC_INT_H_ 452 #endif // VP9_COMMON_VP9_ONYXC_INT_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_filter.h ('k') | source/libvpx/vp9/common/vp9_reconintra.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698