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

Side by Side Diff: patched-ffmpeg-mt/libavcodec/vp56.h

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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
OLDNEW
1 /** 1 /**
2 * @file libavcodec/vp56.h 2 * @file libavcodec/vp56.h
3 * VP5 and VP6 compatible video decoder (common features) 3 * VP5 and VP6 compatible video decoder (common features)
4 * 4 *
5 * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> 5 * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org>
6 * 6 *
7 * This file is part of FFmpeg. 7 * This file is part of FFmpeg.
8 * 8 *
9 * FFmpeg is free software; you can redistribute it and/or 9 * FFmpeg is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 /* DC predictors management */ 115 /* DC predictors management */
116 VP56RefDc *above_blocks; 116 VP56RefDc *above_blocks;
117 VP56RefDc left_block[4]; 117 VP56RefDc left_block[4];
118 int above_block_idx[6]; 118 int above_block_idx[6];
119 DCTELEM prev_dc[3][3]; /* [plan][ref_frame] */ 119 DCTELEM prev_dc[3][3]; /* [plan][ref_frame] */
120 120
121 /* blocks / macroblock */ 121 /* blocks / macroblock */
122 VP56mb mb_type; 122 VP56mb mb_type;
123 VP56Macroblock *macroblocks; 123 VP56Macroblock *macroblocks;
124 DECLARE_ALIGNED_16(DCTELEM, block_coeff)[6][64]; 124 DECLARE_ALIGNED(16, DCTELEM, block_coeff)[6][64];
125 125
126 /* motion vectors */ 126 /* motion vectors */
127 VP56mv mv[6]; /* vectors for each block in MB */ 127 VP56mv mv[6]; /* vectors for each block in MB */
128 VP56mv vector_candidate[2]; 128 VP56mv vector_candidate[2];
129 int vector_candidate_pos; 129 int vector_candidate_pos;
130 130
131 /* filtering hints */ 131 /* filtering hints */
132 int filter_header; /* used in vp6 only */ 132 int filter_header; /* used in vp6 only */
133 int deblock_filtering; 133 int deblock_filtering;
134 int filter_selection; 134 int filter_selection;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 while (tree->val > 0) { 262 while (tree->val > 0) {
263 if (vp56_rac_get_prob(c, probs[tree->prob_idx])) 263 if (vp56_rac_get_prob(c, probs[tree->prob_idx]))
264 tree += tree->val; 264 tree += tree->val;
265 else 265 else
266 tree++; 266 tree++;
267 } 267 }
268 return -tree->val; 268 return -tree->val;
269 } 269 }
270 270
271 #endif /* AVCODEC_VP56_H */ 271 #endif /* AVCODEC_VP56_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698