#include "dsputil.h"
#include "mpegvideo.h"
#include "dsputil.h"
-#include "bswap.h"
#include "vp3data.h"
* Define one or more of the following compile-time variables to 1 to obtain
* elaborate information about certain aspects of the decoding process.
*
+ * KEYFRAMES_ONLY: set this to 1 to only see keyframes (VP3 slideshow mode)
* DEBUG_VP3: high-level decoding flow
* DEBUG_INIT: initialization parameters
* DEBUG_DEQUANTIZERS: display how the dequanization tables are built
* DEBUG_IDCT: show every detail of the IDCT process
*/
+#define KEYFRAMES_ONLY 0
+
#define DEBUG_VP3 0
#define DEBUG_INIT 0
#define DEBUG_DEQUANTIZERS 0
int last_coeff;
int motion_x;
int motion_y;
- /* this indicates which ffmpeg put_pixels() function to use:
- * 00b = no halfpel, 01b = x halfpel, 10b = y halfpel, 11b = both halfpel */
- int motion_halfpel_index;
/* address of first pixel taking into account which plane the fragment
* lives on as well as the plane stride */
int first_pixel;
int superblock_count;
int superblock_width;
int superblock_height;
+ int y_superblock_width;
+ int y_superblock_height;
+ int c_superblock_width;
+ int c_superblock_height;
int u_superblock_start;
int v_superblock_start;
unsigned char *superblock_coding;
* numbers corresponds to the fragment indices 0..5 which comprise
* the macroblock (4 Y fragments and 2 C fragments). */
int *macroblock_fragments;
- /* This is an array of flags indicating whether a particular
- * macroblock is coded. */
- unsigned char *macroblock_coded;
+ /* This is an array that indicates how a particular macroblock
+ * is coded. */
+ unsigned char *macroblock_coding;
+
+ int first_coded_y_fragment;
+ int first_coded_c_fragment;
+ int last_coded_y_fragment;
+ int last_coded_c_fragment;
} Vp3DecodeContext;
* This function sets up all of the various blocks mappings:
* superblocks <-> fragments, macroblocks <-> fragments,
* superblocks <-> macroblocks
+ *
+ * Returns 0 is successful; returns 1 if *anything* went wrong.
*/
-static void init_block_mapping(Vp3DecodeContext *s)
+static int init_block_mapping(Vp3DecodeContext *s)
{
int i, j;
signed int hilbert_walk_y[16];
/* start of Y superblocks */
right_edge = s->fragment_width;
bottom_edge = s->fragment_height;
- current_width = 0;
+ current_width = -1;
current_height = 0;
- superblock_row_inc = 3 * s->fragment_width;
+ superblock_row_inc = 3 * s->fragment_width -
+ (s->y_superblock_width * 4 - s->fragment_width);
hilbert = hilbert_walk_y;
/* the first operation for this variable is to advance by 1 */
/* start of U superblocks */
right_edge = s->fragment_width / 2;
bottom_edge = s->fragment_height / 2;
- current_width = 0;
+ current_width = -1;
current_height = 0;
- superblock_row_inc = 3 * (s->fragment_width / 2);
+ superblock_row_inc = 3 * (s->fragment_width / 2) -
+ (s->c_superblock_width * 4 - s->fragment_width / 2);
hilbert = hilbert_walk_c;
/* the first operation for this variable is to advance by 1 */
/* start of V superblocks */
right_edge = s->fragment_width / 2;
bottom_edge = s->fragment_height / 2;
- current_width = 0;
+ current_width = -1;
current_height = 0;
- superblock_row_inc = 3 * (s->fragment_width / 2);
+ superblock_row_inc = 3 * (s->fragment_width / 2) -
+ (s->c_superblock_width * 4 - s->fragment_width / 2);
hilbert = hilbert_walk_c;
/* the first operation for this variable is to advance by 1 */
}
- if (current_width >= right_edge) {
+ if (current_width >= right_edge - 1) {
/* reset width and move to next superblock row */
- current_width = 0;
+ current_width = -1;
current_height += 4;
/* fragment is now at the start of a new superblock row */
/* iterate through all 16 fragments in a superblock */
for (j = 0; j < 16; j++) {
current_fragment += hilbert[j];
+ current_width += travel_width[j];
current_height += travel_height[j];
/* check if the fragment is in bounds */
- if ((current_width <= right_edge) &&
+ if ((current_width < right_edge) &&
(current_height < bottom_edge)) {
s->superblock_fragments[mapping_index] = current_fragment;
- debug_init(" mapping fragment %d to superblock %d, position %d\n",
- s->superblock_fragments[mapping_index], i, j);
+ debug_init(" mapping fragment %d to superblock %d, position %d (%d/%d x %d/%d)\n",
+ s->superblock_fragments[mapping_index], i, j,
+ current_width, right_edge, current_height, bottom_edge);
} else {
s->superblock_fragments[mapping_index] = -1;
- debug_init(" superblock %d, position %d has no fragment\n",
- i, j);
+ debug_init(" superblock %d, position %d has no fragment (%d/%d x %d/%d)\n",
+ i, j,
+ current_width, right_edge, current_height, bottom_edge);
}
- current_width += travel_width[j];
mapping_index++;
}
}
* all of the Y plane superblocks to build this mapping */
right_edge = s->macroblock_width;
bottom_edge = s->macroblock_height;
- current_width = 0;
+ current_width = -1;
current_height = 0;
- superblock_row_inc = s->macroblock_width;
+ superblock_row_inc = s->macroblock_width -
+ (s->y_superblock_width * 2 - s->macroblock_width);;
hilbert = hilbert_walk_mb;
mapping_index = 0;
current_macroblock = -1;
for (i = 0; i < s->u_superblock_start; i++) {
- if (current_width >= right_edge) {
+ if (current_width >= right_edge - 1) {
/* reset width and move to next superblock row */
- current_width = 0;
+ current_width = -1;
current_height += 2;
/* macroblock is now at the start of a new superblock row */
/* iterate through each potential macroblock in the superblock */
for (j = 0; j < 4; j++) {
current_macroblock += hilbert_walk_mb[j];
+ current_width += travel_width_mb[j];
current_height += travel_height_mb[j];
/* check if the macroblock is in bounds */
- if ((current_width <= right_edge) &&
+ if ((current_width < right_edge) &&
(current_height < bottom_edge)) {
s->superblock_macroblocks[mapping_index] = current_macroblock;
- debug_init(" mapping macroblock %d to superblock %d, position %d\n",
- s->superblock_macroblocks[mapping_index], i, j);
+ debug_init(" mapping macroblock %d to superblock %d, position %d (%d/%d x %d/%d)\n",
+ s->superblock_macroblocks[mapping_index], i, j,
+ current_width, right_edge, current_height, bottom_edge);
} else {
s->superblock_macroblocks[mapping_index] = -1;
- debug_init(" superblock %d, position %d has no macroblock\n",
- i, j);
+ debug_init(" superblock %d, position %d has no macroblock (%d/%d x %d/%d)\n",
+ i, j,
+ current_width, right_edge, current_height, bottom_edge);
}
- current_width += travel_width_mb[j];
mapping_index++;
}
}
/* C planes */
c_fragment = s->u_fragment_start +
(i * s->fragment_width / 4) + (j / 2);
- s->all_fragments[c_fragment].macroblock = s->macroblock_count;
+ s->all_fragments[c_fragment].macroblock = s->macroblock_count;
s->macroblock_fragments[mapping_index++] = c_fragment;
debug_init("%d ", c_fragment);
c_fragment = s->v_fragment_start +
(i * s->fragment_width / 4) + (j / 2);
- s->all_fragments[c_fragment].macroblock = s->macroblock_count;
+ s->all_fragments[c_fragment].macroblock = s->macroblock_count;
s->macroblock_fragments[mapping_index++] = c_fragment;
debug_init("%d ", c_fragment);
current_fragment += s->fragment_width;
}
+
+ return 0; /* successful path out */
}
/*
memset(s->all_fragments[i].coeffs, 0, 64 * sizeof(DCTELEM));
s->all_fragments[i].coeff_count = 0;
s->all_fragments[i].last_coeff = 0;
+s->all_fragments[i].motion_x = 0xbeef;
+s->all_fragments[i].motion_y = 0xbeef;
}
}
* the dequantization phase */
for (i = 1; i < 64; i++) {
- j = quant_index[i];
+ j = zigzag_index[i];
s->intra_y_dequant[j] = vp31_intra_y_dequant[i] * quality_scale / 100;
if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL)
* This function unpacks all of the superblock/macroblock/fragment coding
* information from the bitstream.
*/
-static void unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
+static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
{
int bit = 0;
int current_superblock = 0;
int current_run = 0;
int decode_fully_flags = 0;
int decode_partial_blocks = 0;
+ int first_c_fragment_seen;
int i, j;
int current_fragment;
/* if any of the superblocks are not partially coded, flag
* a boolean to decode the list of fully-coded superblocks */
- if (bit == 0)
+ if (bit == 0) {
decode_fully_flags = 1;
- } else {
-
- /* make a note of the fact that there are partially coded
- * superblocks */
- decode_partial_blocks = 1;
+ } else {
+ /* make a note of the fact that there are partially coded
+ * superblocks */
+ decode_partial_blocks = 1;
+ }
}
s->superblock_coding[current_superblock++] =
(bit) ? SB_PARTIALLY_CODED : SB_NOT_CODED;
/* figure out which fragments are coded; iterate through each
* superblock (all planes) */
s->coded_fragment_list_index = 0;
- memset(s->macroblock_coded, 0, s->macroblock_count);
+ s->first_coded_y_fragment = s->first_coded_c_fragment = 0;
+ s->last_coded_y_fragment = s->last_coded_c_fragment = -1;
+ first_c_fragment_seen = 0;
+ memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
for (i = 0; i < s->superblock_count; i++) {
/* iterate through all 16 fragments in a superblock */
/* if the fragment is in bounds, check its coding status */
current_fragment = s->superblock_fragments[i * 16 + j];
+ if (current_fragment >= s->fragment_count) {
+ printf (" vp3:unpack_superblocks(): bad fragment number (%d >= %d)\n",
+ current_fragment, s->fragment_count);
+ return 1;
+ }
if (current_fragment != -1) {
if (s->superblock_coding[i] == SB_NOT_CODED) {
}
if (bit) {
- /* mode will be decoded in the next phase */
+ /* default mode; actual mode will be decoded in
+ * the next phase */
s->all_fragments[current_fragment].coding_method =
MODE_INTER_NO_MV;
- s->coded_fragment_list[s->coded_fragment_list_index++] =
+ s->coded_fragment_list[s->coded_fragment_list_index] =
current_fragment;
- s->macroblock_coded[s->all_fragments[current_fragment].macroblock] = 1;
+ if ((current_fragment >= s->u_fragment_start) &&
+ (s->last_coded_y_fragment == -1) &&
+ (!first_c_fragment_seen)) {
+ s->first_coded_c_fragment = s->coded_fragment_list_index;
+ s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
+ first_c_fragment_seen = 1;
+ }
+ s->coded_fragment_list_index++;
+ s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
debug_block_coding(" superblock %d is partially coded, fragment %d is coded\n",
i, current_fragment);
} else {
* coding will be determined in next step */
s->all_fragments[current_fragment].coding_method =
MODE_INTER_NO_MV;
- s->coded_fragment_list[s->coded_fragment_list_index++] =
+ s->coded_fragment_list[s->coded_fragment_list_index] =
current_fragment;
- s->macroblock_coded[s->all_fragments[current_fragment].macroblock] = 1;
+ if ((current_fragment >= s->u_fragment_start) &&
+ (s->last_coded_y_fragment == -1) &&
+ (!first_c_fragment_seen)) {
+ s->first_coded_c_fragment = s->coded_fragment_list_index;
+ s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
+ first_c_fragment_seen = 1;
+ }
+ s->coded_fragment_list_index++;
+ s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
debug_block_coding(" superblock %d is fully coded, fragment %d is coded\n",
i, current_fragment);
}
}
}
}
+
+ if (!first_c_fragment_seen)
+ /* only Y fragments coded in this frame */
+ s->last_coded_y_fragment = s->coded_fragment_list_index - 1;
+ else
+ /* end the list of coded C fragments */
+ s->last_coded_c_fragment = s->coded_fragment_list_index - 1;
+
+ debug_block_coding(" %d total coded fragments, y: %d -> %d, c: %d -> %d\n",
+ s->coded_fragment_list_index,
+ s->first_coded_y_fragment,
+ s->last_coded_y_fragment,
+ s->first_coded_c_fragment,
+ s->last_coded_c_fragment);
+
+ return 0;
}
/*
* This function unpacks all the coding mode data for individual macroblocks
* from the bitstream.
*/
-static void unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
+static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
{
int i, j, k;
int scheme;
if (scheme == 0) {
debug_modes(" custom mode alphabet ahead:\n");
for (i = 0; i < 8; i++)
- ModeAlphabet[0][i] = get_bits(gb, 3);
+ ModeAlphabet[scheme][get_bits(gb, 3)] = i;
}
for (i = 0; i < 8; i++)
for (j = 0; j < 4; j++) {
current_macroblock = s->superblock_macroblocks[i * 4 + j];
if ((current_macroblock == -1) ||
- (!s->macroblock_coded[current_macroblock]))
+ (s->macroblock_coding[current_macroblock] == MODE_COPY))
continue;
+ if (current_macroblock >= s->macroblock_count) {
+ printf (" vp3:unpack_modes(): bad macroblock number (%d >= %d)\n",
+ current_macroblock, s->macroblock_count);
+ return 1;
+ }
/* mode 7 means get 3 bits for each coding mode */
if (scheme == 7)
else
coding_mode = ModeAlphabet[scheme][get_mode_code(gb)];
+ s->macroblock_coding[current_macroblock] = coding_mode;
for (k = 0; k < 6; k++) {
current_fragment =
s->macroblock_fragments[current_macroblock * 6 + k];
+ if (current_fragment == -1)
+ continue;
+ if (current_fragment >= s->fragment_count) {
+ printf (" vp3:unpack_modes(): bad fragment number (%d >= %d)\n",
+ current_fragment, s->fragment_count);
+ return 1;
+ }
if (s->all_fragments[current_fragment].coding_method !=
MODE_COPY)
s->all_fragments[current_fragment].coding_method =
}
}
}
-}
-
-/*
- * This function adjusts the components of a motion vector for the halfpel
- * motion grid. c_plane indicates whether the vector applies to the U or V
- * plane. The function returns the halfpel function index to be used in
- * ffmpeg's put_pixels[]() array of functions.
- */
-static inline int adjust_vector(int *x, int *y, int c_plane)
-{
- int motion_halfpel_index = 0;
- int x_halfpel;
- int y_halfpel;
-
- if (!c_plane) {
-
- x_halfpel = *x & 1;
- motion_halfpel_index |= x_halfpel;
- if (*x >= 0)
- *x >>= 1;
- else
- *x = -( (-(*x) >> 1) + x_halfpel);
-
- y_halfpel = *y & 1;
- motion_halfpel_index |= (y_halfpel << 1);
- if (*y >= 0)
- *y >>= 1;
- else
- *y = -( (-(*y) >> 1) + y_halfpel);
-
- } else {
-
- x_halfpel = ((*x & 0x03) != 0);
- motion_halfpel_index |= x_halfpel;
- if (*x >= 0)
- *x >>= 2;
- else
- *x = -( (-(*x) >> 2) + x_halfpel);
-
- y_halfpel = ((*y & 0x03) != 0);
- motion_halfpel_index |= (y_halfpel << 1);
- if (*y >= 0)
- *y >>= 2;
- else
- *y = -( (-(*y) >> 2) + y_halfpel);
-
- }
- return motion_halfpel_index;
+ return 0;
}
/*
* This function unpacks all the motion vectors for the individual
* macroblocks from the bitstream.
*/
-static void unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
+static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
{
int i, j, k;
int coding_mode;
for (j = 0; j < 4; j++) {
current_macroblock = s->superblock_macroblocks[i * 4 + j];
if ((current_macroblock == -1) ||
- (!s->macroblock_coded[current_macroblock]))
+ (s->macroblock_coding[current_macroblock] == MODE_COPY))
continue;
+ if (current_macroblock >= s->macroblock_count) {
+ printf (" vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n",
+ current_macroblock, s->macroblock_count);
+ return 1;
+ }
current_fragment = s->macroblock_fragments[current_macroblock * 6];
- switch (s->all_fragments[current_fragment].coding_method) {
+ if (current_fragment >= s->fragment_count) {
+ printf (" vp3:unpack_vectors(): bad fragment number (%d >= %d\n",
+ current_fragment, s->fragment_count);
+ return 1;
+ }
+ switch (s->macroblock_coding[current_macroblock]) {
case MODE_INTER_PLUS_MV:
case MODE_GOLDEN_MV:
}
/* vector maintenance, only on MODE_INTER_PLUS_MV */
- if (s->all_fragments[current_fragment].coding_method ==
+ if (s->macroblock_coding[current_macroblock] ==
MODE_INTER_PLUS_MV) {
prior_last_motion_x = last_motion_x;
prior_last_motion_y = last_motion_y;
/* assign the motion vectors to the correct fragments */
debug_vectors(" vectors for macroblock starting @ fragment %d (coding method %d):\n",
current_fragment,
- s->all_fragments[current_fragment].coding_method);
+ s->macroblock_coding[current_macroblock]);
for (k = 0; k < 6; k++) {
current_fragment =
s->macroblock_fragments[current_macroblock * 6 + k];
- s->all_fragments[current_fragment].motion_halfpel_index =
- adjust_vector(&motion_x[k], &motion_y[k],
- ((k == 4) || (k == 5)));
+ if (current_fragment == -1)
+ continue;
+ if (current_fragment >= s->fragment_count) {
+ printf (" vp3:unpack_vectors(): bad fragment number (%d >= %d)\n",
+ current_fragment, s->fragment_count);
+ return 1;
+ }
s->all_fragments[current_fragment].motion_x = motion_x[k];
s->all_fragments[current_fragment].motion_y = motion_y[k];
- debug_vectors(" vector %d: fragment %d = (%d, %d), index %d\n",
- k, current_fragment, motion_x[k], motion_y[k],
- s->all_fragments[current_fragment].motion_halfpel_index);
+ debug_vectors(" vector %d: fragment %d = (%d, %d)\n",
+ k, current_fragment, motion_x[k], motion_y[k]);
}
}
}
}
+
+ return 0;
}
/*
DCTELEM coeff;
Vp3Fragment *fragment;
- for (i = first_fragment; i < last_fragment; i++) {
+ if ((first_fragment >= s->fragment_count) ||
+ (last_fragment >= s->fragment_count)) {
+
+ printf (" vp3:unpack_vlcs(): bad fragment number (%d -> %d ?)\n",
+ first_fragment, last_fragment);
+ return 0;
+ }
+
+ for (i = first_fragment; i <= last_fragment; i++) {
fragment = &s->all_fragments[s->coded_fragment_list[i]];
if (fragment->coeff_count > coeff_index)
* This function unpacks all of the DCT coefficient data from the
* bitstream.
*/
-static void unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
+static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
{
int i;
int dc_y_table;
int ac_c_table;
int residual_eob_run = 0;
- /* for the binary search */
- int left, middle, right, found;
- /* this indicates the first fragment of the color plane data */
- int plane_split = 0;
-
- debug_vp3(" vp3: unpacking DCT coefficients\n");
-
- /* find the plane split (the first color plane fragment) using a binary
- * search; test the boundaries first */
- if (s->coded_fragment_list_index == 0)
- return;
- if (s->u_fragment_start <= s->coded_fragment_list[0])
- plane_split = 0; /* this means no Y fragments */
- else if (s->coded_fragment_list[s->coded_fragment_list_index - 1] >
- s->u_fragment_start) {
-
- left = 0;
- right = s->coded_fragment_list_index - 1;
- found = 0;
- do {
- middle = (left + right + 1) / 2;
- if ((s->coded_fragment_list[middle] >= s->u_fragment_start) &&
- (s->coded_fragment_list[middle - 1] < s->u_fragment_start))
- found = 1;
- else if (s->coded_fragment_list[middle] < s->u_fragment_start)
- left = middle;
- else
- right = middle;
- } while (!found);
-
- plane_split = middle;
- }
-
- debug_vp3(" plane split @ index %d (fragment %d)\n", plane_split,
- s->coded_fragment_list[plane_split]);
-
/* fetch the DC table indices */
dc_y_table = get_bits(gb, 4);
dc_c_table = get_bits(gb, 4);
debug_vp3(" vp3: unpacking Y plane DC coefficients using table %d\n",
dc_y_table);
residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0,
- 0, plane_split, residual_eob_run);
+ s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
/* unpack the C plane DC coefficients */
debug_vp3(" vp3: unpacking C plane DC coefficients using table %d\n",
dc_c_table);
residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
- plane_split, s->coded_fragment_list_index, residual_eob_run);
+ s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
- /* fetch the level 1 AC table indices */
+ /* fetch the AC table indices */
ac_y_table = get_bits(gb, 4);
ac_c_table = get_bits(gb, 4);
- /* unpack the level 1 AC coefficients (coeffs 1-5) */
+ /* unpack the group 1 AC coefficients (coeffs 1-5) */
for (i = 1; i <= 5; i++) {
debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
i, ac_y_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_y_table], i,
- 0, plane_split, residual_eob_run);
+ s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
i, ac_c_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_c_table], i,
- plane_split, s->coded_fragment_list_index, residual_eob_run);
+ s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
}
- /* unpack the level 2 AC coefficients (coeffs 6-14) */
+ /* unpack the group 2 AC coefficients (coeffs 6-14) */
for (i = 6; i <= 14; i++) {
debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
i, ac_y_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_y_table], i,
- 0, plane_split, residual_eob_run);
+ s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
i, ac_c_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_c_table], i,
- plane_split, s->coded_fragment_list_index, residual_eob_run);
+ s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
}
- /* unpack the level 3 AC coefficients (coeffs 15-27) */
+ /* unpack the group 3 AC coefficients (coeffs 15-27) */
for (i = 15; i <= 27; i++) {
debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
i, ac_y_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_y_table], i,
- 0, plane_split, residual_eob_run);
+ s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
i, ac_c_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_c_table], i,
- plane_split, s->coded_fragment_list_index, residual_eob_run);
+ s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
}
- /* unpack the level 4 AC coefficients (coeffs 28-63) */
+ /* unpack the group 4 AC coefficients (coeffs 28-63) */
for (i = 28; i <= 63; i++) {
debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
i, ac_y_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_y_table], i,
- 0, plane_split, residual_eob_run);
+ s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
i, ac_c_table);
residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_c_table], i,
- plane_split, s->coded_fragment_list_index, residual_eob_run);
+ s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
}
+
+ return 0;
}
/*
#define COMPATIBLE_FRAME(x) \
(compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
#define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY)
-#define HIGHBITDUPPED(X) (((signed short) X) >> 15)
static inline int iabs (int x) { return ((x < 0) ? -x : x); }
static void reverse_dc_prediction(Vp3DecodeContext *s,
int j;
int16_t *dequantizer;
DCTELEM dequant_block[64];
+ DCTELEM dequant_block_permuted[64];
unsigned char *output_plane;
unsigned char *last_plane;
unsigned char *golden_plane;
int stride;
int motion_x, motion_y;
- int motion_x_limit, motion_y_limit;
+ int upper_motion_limit, lower_motion_limit;
int motion_halfpel_index;
- unsigned char *motion_source;
+ unsigned int motion_source;
debug_vp3(" vp3: rendering final fragments for %s\n",
(plane == 0) ? "Y plane" : (plane == 1) ? "U plane" : "V plane");
last_plane = s->last_frame.data[0];
golden_plane = s->golden_frame.data[0];
stride = -s->current_frame.linesize[0];
+ upper_motion_limit = 7 * s->current_frame.linesize[0];
+ lower_motion_limit = height * s->current_frame.linesize[0] + width - 8;
} else if (plane == 1) {
dequantizer = s->intra_c_dequant;
output_plane = s->current_frame.data[1];
last_plane = s->last_frame.data[1];
golden_plane = s->golden_frame.data[1];
stride = -s->current_frame.linesize[1];
+ upper_motion_limit = 7 * s->current_frame.linesize[1];
+ lower_motion_limit = height * s->current_frame.linesize[1] + width - 8;
} else {
dequantizer = s->intra_c_dequant;
output_plane = s->current_frame.data[2];
last_plane = s->last_frame.data[2];
golden_plane = s->golden_frame.data[2];
stride = -s->current_frame.linesize[2];
+ upper_motion_limit = 7 * s->current_frame.linesize[2];
+ lower_motion_limit = height * s->current_frame.linesize[2] + width - 8;
}
- motion_x_limit = width - 8;
- motion_y_limit = height - 8;
-
/* for each fragment row... */
for (y = 0; y < height; y += 8) {
/* for each fragment in a row... */
for (x = 0; x < width; x += 8, i++) {
+ if ((i < 0) || (i >= s->fragment_count)) {
+ printf (" vp3:render_fragments(): bad fragment number (%d)\n", i);
+ return;
+ }
+
/* transform if this block was coded */
if (s->all_fragments[i].coding_method != MODE_COPY) {
-// if (s->all_fragments[i].coding_method == MODE_INTRA) {
-
- /* sort out the motion vector */
- motion_x = x + s->all_fragments[i].motion_x;
- motion_y = y + s->all_fragments[i].motion_y;
- motion_halfpel_index = s->all_fragments[i].motion_halfpel_index;
-
- if (motion_x < 0)
- motion_x = 0;
- if (motion_y < 0)
- motion_y = 0;
- if (motion_x > motion_x_limit)
- motion_x = motion_x_limit;
- if (motion_y > motion_y_limit)
- motion_y = motion_y_limit;
+
+ motion_source = s->all_fragments[i].first_pixel;
+ motion_halfpel_index = 0;
+
+ /* sort out the motion vector if this fragment is coded
+ * using a motion vector method */
+ if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
+ (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
+ motion_x = s->all_fragments[i].motion_x;
+ motion_y = s->all_fragments[i].motion_y;
+if ((motion_x == 0xbeef) || (motion_y == 0xbeef))
+printf (" help! got beefy vector! (%X, %X)\n", motion_x, motion_y);
+
+ if (motion_x >= 0) {
+ motion_halfpel_index = motion_x & 0x01;
+ motion_source += (motion_x >> 1);
+ } else {
+ motion_x = -motion_x;
+ motion_halfpel_index = motion_x & 0x01;
+ motion_source -= ((motion_x + 1) >> 1);
+ }
+
+// motion_y = -motion_y;
+ if (motion_y >= 0) {
+ motion_halfpel_index |= (motion_y & 0x01) << 1;
+ motion_source += ((motion_y >> 1) * stride);
+ } else {
+ motion_y = -motion_y;
+ motion_halfpel_index |= (motion_y & 0x01) << 1;
+ motion_source -= (((motion_y + 1) >> 1) * stride);
+ }
+
+ /* if the are any problems with a motion vector, refuse
+ * to render the block */
+ if ((motion_source < upper_motion_limit) ||
+ (motion_source > lower_motion_limit)) {
+// printf (" vp3: help! motion source (%d) out of range (%d..%d)\n",
+// motion_source, upper_motion_limit, lower_motion_limit);
+ continue;
+ }
+ }
/* first, take care of copying a block from either the
* previous or the golden frame */
if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
(s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) {
- motion_source = golden_plane;
- motion_source += motion_x;
- motion_source += (motion_y * -stride);
-
s->dsp.put_pixels_tab[1][motion_halfpel_index](
output_plane + s->all_fragments[i].first_pixel,
- motion_source,
+ golden_plane + motion_source,
stride, 8);
} else
if (s->all_fragments[i].coding_method != MODE_INTRA) {
- motion_source = last_plane;
- motion_source += motion_x;
- motion_source += (motion_y * -stride);
-
s->dsp.put_pixels_tab[1][motion_halfpel_index](
output_plane + s->all_fragments[i].first_pixel,
- motion_source,
+ last_plane + motion_source,
stride, 8);
}
i, s->all_fragments[i].coding_method,
s->all_fragments[i].coeffs[0], dequantizer[0]);
for (j = 0; j < 64; j++)
- dequant_block[dequant_index[j]] =
+ dequant_block[dezigzag_index[j]] =
s->all_fragments[i].coeffs[j] *
dequantizer[j];
- dequant_block[0] += 1024;
+ for (j = 0; j < 64; j++)
+ dequant_block_permuted[s->dsp.idct_permutation[j]] =
+ dequant_block[j];
debug_idct("dequantized block:\n");
for (m = 0; m < 8; m++) {
}
debug_idct("\n");
- /* invert DCT and place in final output */
+ /* invert DCT and place (or add) in final output */
- if (s->all_fragments[i].coding_method == MODE_INTRA)
+ if (s->all_fragments[i].coding_method == MODE_INTRA) {
+ dequant_block_permuted[0] += 1024;
s->dsp.idct_put(
output_plane + s->all_fragments[i].first_pixel,
- stride, dequant_block);
- else
-// s->dsp.idct_add(
- s->dsp.idct_put(
+ stride, dequant_block_permuted);
+ } else {
+ s->dsp.idct_add(
output_plane + s->all_fragments[i].first_pixel,
- stride, dequant_block);
+ stride, dequant_block_permuted);
+ }
debug_idct("block after idct_%s():\n",
(s->all_fragments[i].coding_method == MODE_INTRA)?
{
Vp3DecodeContext *s = avctx->priv_data;
int i;
+ int c_width;
+ int c_height;
+ int y_superblock_count;
+ int c_superblock_count;
s->avctx = avctx;
+#if 0
s->width = avctx->width;
s->height = avctx->height;
+#else
+ s->width = (avctx->width + 15) & 0xFFFFFFF0;
+ s->height = (avctx->height + 15) & 0xFFFFFFF0;
+#endif
avctx->pix_fmt = PIX_FMT_YUV420P;
avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
* in the first frame decode */
s->quality_index = -1;
- s->superblock_width = (s->width + 31) / 32;
- s->superblock_height = (s->height + 31) / 32;
- s->superblock_count = s->superblock_width * s->superblock_height * 3 / 2;
- s->u_superblock_start = s->superblock_width * s->superblock_height;
- s->v_superblock_start = s->superblock_width * s->superblock_height * 5 / 4;
+ s->y_superblock_width = (s->width + 31) / 32;
+ s->y_superblock_height = (s->height + 31) / 32;
+ y_superblock_count = s->y_superblock_width * s->y_superblock_height;
+
+ /* work out the dimensions for the C planes */
+ c_width = s->width / 2;
+ c_height = s->height / 2;
+ s->c_superblock_width = (c_width + 31) / 32;
+ s->c_superblock_height = (c_height + 31) / 32;
+ c_superblock_count = s->c_superblock_width * s->c_superblock_height;
+
+ s->superblock_count = y_superblock_count + (c_superblock_count * 2);
+ s->u_superblock_start = y_superblock_count;
+ s->v_superblock_start = s->u_superblock_start + c_superblock_count;
s->superblock_coding = av_malloc(s->superblock_count);
s->macroblock_width = (s->width + 15) / 16;
s->u_fragment_start = s->fragment_width * s->fragment_height;
s->v_fragment_start = s->fragment_width * s->fragment_height * 5 / 4;
- debug_init(" width: %d x %d\n", s->width, s->height);
- debug_init(" superblocks: %d x %d, %d total\n",
- s->superblock_width, s->superblock_height, s->superblock_count);
+ debug_init(" Y plane: %d x %d\n", s->width, s->height);
+ debug_init(" C plane: %d x %d\n", c_width, c_height);
+ debug_init(" Y superblocks: %d x %d, %d total\n",
+ s->y_superblock_width, s->y_superblock_height, y_superblock_count);
+ debug_init(" C superblocks: %d x %d, %d total\n",
+ s->c_superblock_width, s->c_superblock_height, c_superblock_count);
+ debug_init(" total superblocks = %d, U starts @ %d, V starts @ %d\n",
+ s->superblock_count, s->u_superblock_start, s->v_superblock_start);
debug_init(" macroblocks: %d x %d, %d total\n",
s->macroblock_width, s->macroblock_height, s->macroblock_count);
debug_init(" %d fragments, %d x %d, u starts @ %d, v starts @ %d\n",
/* init VLC tables */
for (i = 0; i < 16; i++) {
- /* Dc histograms */
+ /* DC histograms */
init_vlc(&s->dc_vlc[i], 5, 32,
&dc_bias[i][0][1], 4, 2,
&dc_bias[i][0][0], 4, 2);
- /* level 1 AC histograms */
+ /* group 1 AC histograms */
init_vlc(&s->ac_vlc_1[i], 5, 32,
&ac_bias_0[i][0][1], 4, 2,
&ac_bias_0[i][0][0], 4, 2);
- /* level 2 AC histograms */
+ /* group 2 AC histograms */
init_vlc(&s->ac_vlc_2[i], 5, 32,
&ac_bias_1[i][0][1], 4, 2,
&ac_bias_1[i][0][0], 4, 2);
- /* level 3 AC histograms */
+ /* group 3 AC histograms */
init_vlc(&s->ac_vlc_3[i], 5, 32,
&ac_bias_2[i][0][1], 4, 2,
&ac_bias_2[i][0][0], 4, 2);
- /* level 4 AC histograms */
+ /* group 4 AC histograms */
init_vlc(&s->ac_vlc_4[i], 5, 32,
&ac_bias_3[i][0][1], 4, 2,
&ac_bias_3[i][0][0], 4, 2);
}
- /* build quantization table */
+ /* build quantization zigzag table */
for (i = 0; i < 64; i++)
- quant_index[dequant_index[i]] = i;
+ zigzag_index[dezigzag_index[i]] = i;
/* work out the block mapping tables */
s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int));
s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int));
s->macroblock_fragments = av_malloc(s->macroblock_count * 6 * sizeof(int));
- s->macroblock_coded = av_malloc(s->macroblock_count + 1);
+ s->macroblock_coding = av_malloc(s->macroblock_count + 1);
init_block_mapping(s);
for (i = 0; i < 3; i++) {
skip_bits(&gb, 1);
s->last_quality_index = s->quality_index;
s->quality_index = get_bits(&gb, 6);
- if (s->quality_index != s->last_quality_index)
- init_dequantizer(s);
debug_vp3(" VP3 frame #%d: Q index = %d", counter, s->quality_index);
counter++;
+ if (s->quality_index != s->last_quality_index)
+ init_dequantizer(s);
+
if (s->keyframe) {
- /* release the previous golden frame and get a new one */
- if (s->golden_frame.data[0])
- avctx->release_buffer(avctx, &s->golden_frame);
- /* last frame, if allocated, is hereby invalidated */
- if (s->last_frame.data[0])
- avctx->release_buffer(avctx, &s->last_frame);
+ debug_vp3(", keyframe\n");
+ /* skip the other 2 header bytes for now */
+ skip_bits(&gb, 16);
+
+ if (s->last_frame.data[0] == s->golden_frame.data[0]) {
+ if (s->golden_frame.data[0])
+ avctx->release_buffer(avctx, &s->golden_frame);
+ } else {
+ if (s->golden_frame.data[0])
+ avctx->release_buffer(avctx, &s->golden_frame);
+ if (s->last_frame.data[0])
+ avctx->release_buffer(avctx, &s->last_frame);
+ }
s->golden_frame.reference = 0;
if(avctx->get_buffer(avctx, &s->golden_frame) < 0) {
} else {
+ debug_vp3("\n");
+
/* allocate a new current frame */
s->current_frame.reference = 0;
if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
printf("vp3: get_buffer() failed\n");
return -1;
}
-
}
- if (s->keyframe) {
- debug_vp3(", keyframe\n");
- /* skip the other 2 header bytes for now */
- skip_bits(&gb, 16);
- } else
- debug_vp3("\n");
-
init_frame(s, &gb);
- unpack_superblocks(s, &gb);
- unpack_modes(s, &gb);
- unpack_vectors(s, &gb);
- unpack_dct_coeffs(s, &gb);
+#if KEYFRAMES_ONLY
+if (!s->keyframe) {
+
+ memcpy(s->current_frame.data[0], s->golden_frame.data[0],
+ s->current_frame.linesize[0] * s->height);
+ memcpy(s->current_frame.data[1], s->golden_frame.data[1],
+ s->current_frame.linesize[1] * s->height / 2);
+ memcpy(s->current_frame.data[2], s->golden_frame.data[2],
+ s->current_frame.linesize[2] * s->height / 2);
+
+} else {
+#endif
+
+ if (unpack_superblocks(s, &gb) ||
+ unpack_modes(s, &gb) ||
+ unpack_vectors(s, &gb) ||
+ unpack_dct_coeffs(s, &gb)) {
+
+ printf(" vp3: could not decode frame\n");
+ return -1;
+ }
reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height);
reverse_dc_prediction(s, s->u_fragment_start,
s->fragment_width / 2, s->fragment_height / 2);
render_fragments(s, 0, s->width, s->height, 0);
+#if 1
render_fragments(s, s->u_fragment_start, s->width / 2, s->height / 2, 1);
render_fragments(s, s->v_fragment_start, s->width / 2, s->height / 2, 2);
+#else
+memset(s->current_frame.data[1], 0x80, s->width * s->height / 4);
+memset(s->current_frame.data[2], 0x80, s->width * s->height / 4);
+#endif
+
+#if KEYFRAMES_ONLY
+}
+#endif
*data_size=sizeof(AVFrame);
*(AVFrame*)data= s->current_frame;
av_free(s->superblock_fragments);
av_free(s->superblock_macroblocks);
av_free(s->macroblock_fragments);
- av_free(s->macroblock_coded);
+ av_free(s->macroblock_coding);
/* release all frames */
- avctx->release_buffer(avctx, &s->golden_frame);
- avctx->release_buffer(avctx, &s->last_frame);
- avctx->release_buffer(avctx, &s->current_frame);
+ if (s->golden_frame.data[0])
+ avctx->release_buffer(avctx, &s->golden_frame);
+ if (s->last_frame.data[0])
+ avctx->release_buffer(avctx, &s->last_frame);
+ /* no need to release the current_frame since it will always be pointing
+ * to the same frame as either the golden or last frame */
return 0;
}