/*****************************************************************************
* vpar_blocks.c : blocks parsing
- * (c)1999 VideoLAN
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
+#include "defs.h"
+
+#include <sys/types.h> /* on BSD, uio.h needs types.h */
+#include <sys/uio.h> /* "input.h" */
#include "config.h"
#include "common.h"
+#include "threads.h"
#include "mtime.h"
-#include "vlc_thread.h"
+#include "plugins.h"
#include "intf_msg.h"
-#include "debug.h" /* ?? temporaire, requis par netlist.h */
+#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
#include "vpar_blocks.h"
#include "vpar_headers.h"
-#include "video_fifo.h"
#include "vpar_synchro.h"
#include "video_parser.h"
+#include "video_fifo.h"
+
+static int i_count = 0;
/*
- * Local prototypes
+ * Welcome to vpar_blocks.c ! Here's where the heavy processor-critical parsing
+ * task is done. This file is divided in several parts :
+ * - Initialization of the lookup tables
+ * - Decoding of coded blocks
+ * - Decoding of motion vectors
+ * - Decoding of the other macroblock structures
+ * - Picture data parsing management (slices and error handling)
+ * It's a pretty long file. Good luck and have a nice day.
*/
-static __inline__ void InitMacroblock( vpar_thread_t * p_vpar,
- macroblock_t * p_mb );
-static __inline__ int MacroblockAddressIncrement( vpar_thread_t * p_vpar );
-static __inline__ void MacroblockModes( vpar_thread_t * p_vpar,
- macroblock_t * p_mb );
-typedef void (*f_decode_block_t)( vpar_thread_t *, macroblock_t *, int );
-static void vpar_DecodeMPEG1Non( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b );
-static void vpar_DecodeMPEG1Intra( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b );
-static void vpar_DecodeMPEG2Non( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b );
-static void vpar_DecodeMPEG2Intra( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b );
+
/*
- * Initialisation tables
+ * Initialization tables
*/
+
/* Table for coded_block_pattern resolution */
-lookup_t pl_coded_pattern_init_table[512] =
+static lookup_t pl_coded_pattern[512] =
{ {MB_ERROR, 0}, {0, 9}, {39, 9}, {27, 9}, {59, 9}, {55, 9}, {47, 9}, {31, 9},
{58, 8}, {58, 8}, {54, 8}, {54, 8}, {46, 8}, {46, 8}, {30, 8}, {30, 8},
{57, 8}, {57, 8}, {53, 8}, {53, 8}, {45, 8}, {45, 8}, {29, 8}, {29, 8},
{41, 8}, {41, 8}, {21, 8}, {21, 8}, {49, 8}, {49, 8}, {13, 8}, {13, 8},
{35, 8}, {35, 8}, {19, 8}, {19, 8}, {11, 8}, {11, 8}, {7, 8}, {7, 8},
{34, 7}, {34, 7}, {34, 7}, {34, 7}, {18, 7}, {18, 7}, {18, 7}, {18, 7},
- {10, 7}, {10, 7}, {10, 7}, {10, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7},
- {33, 7}, {33, 7}, {33, 7}, {33, 7}, {17, 7}, {17, 7}, {17, 7}, {17, 7},
- {9, 7}, {9, 7}, {9, 7}, {9, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7},
- {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6},
- {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6},
- {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6},
- {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6},
+ {10, 7}, {10, 7}, {10, 7}, {10, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7},
+ {33, 7}, {33, 7}, {33, 7}, {33, 7}, {17, 7}, {17, 7}, {17, 7}, {17, 7},
+ {9, 7}, {9, 7}, {9, 7}, {9, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7},
+ {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6},
+ {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6},
+ {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6},
+ {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6},
{62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5},
{62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5},
- {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5},
- {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5},
- {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5},
- {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5},
- {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5},
- {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5},
- {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5},
- {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5},
- {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5},
- {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5},
- {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5},
- {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5},
- {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5},
- {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5},
- {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5},
- {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5},
- {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5},
- {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5},
- {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5},
- {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5},
- {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5},
- {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5},
- {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
- {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
- {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
- {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
- {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
- {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
- {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
- {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
- {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
- {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
- {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
+ {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5},
+ {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5},
+ {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5},
+ {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5},
+ {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5},
+ {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5},
+ {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5},
+ {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5},
+ {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5},
+ {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5},
+ {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5},
+ {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5},
+ {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5},
+ {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5},
+ {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5},
+ {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5},
+ {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5},
+ {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5},
+ {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5},
+ {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5},
+ {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5},
+ {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5},
+ {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
+ {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
+ {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
+ {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
+ {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
+ {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
+ {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
+ {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
{8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
+ {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
+ {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
+ {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
+ {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
{4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
- {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
- {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
{4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
- {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
+ {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3},
{60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3} };
- /* Tables for dc DCT coefficients
+ /* Tables for dc DCT coefficients
* Tables are cut in two parts to reduce memory occupation
*/
-
- /* Table B-12, dct_dc_size_luminance, codes 00xxx ... 11110 */
-lookup_t pl_dct_dc_lum_init_table_1[32] =
+
+ /* Table B-12, dct_dc_size_luminance, codes 00XXX ... 11110 */
+
+static lookup_t pl_dct_dc_lum_init_table_1[32] =
{ {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2},
{2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2},
{0, 3}, {0, 3}, {0, 3}, {0, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3},
{4, 3}, {4, 3}, {4, 3}, {4, 3}, {5, 4}, {5, 4}, {6, 5}, {MB_ERROR, 0}
};
+static lookup_t ppl_dct_dc_init_table_1[2][32] =
+{ { {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2},
+ {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2},
+ {0, 3}, {0, 3}, {0, 3}, {0, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3},
+ {4, 3}, {4, 3}, {4, 3}, {4, 3}, {5, 4}, {5, 4}, {6, 5}, {MB_ERROR, 0}},
+{ {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2},
+ {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2},
+ {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2},
+ {3, 3}, {3, 3}, {3, 3}, {3, 3}, {4, 4}, {4, 4}, {5, 5}, {MB_ERROR, 0}
+ }
+ };
+
/* Table B-12, dct_dc_size_luminance, codes 111110xxx ... 111111111 */
-lookup_t pl_dct_dc_lum_init_table_2[32] =
+
+static lookup_t pl_dct_dc_lum_init_table_2[32] =
{ {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6},
{8, 7}, {8, 7}, {8, 7}, {8, 7}, {9, 8}, {9, 8}, {10,9}, {11,9},
{MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0},
{MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}
};
+static lookup_t ppl_dct_dc_init_table_2[2][32] =
+{ { {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6},
+ {8, 7}, {8, 7}, {8, 7}, {8, 7}, {9, 8}, {9, 8}, {10,9}, {11,9},
+ {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0},
+ {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0},
+ {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0},
+ {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}, {MB_ERROR, 0}},
+ { {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6},
+ {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6},
+ {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7},
+ {8, 8}, {8, 8}, {8, 8}, {8, 8}, {9, 9}, {9, 9}, {10,10}, {11,10}
+ }
+ };
+
/* Table B-13, dct_dc_size_chrominance, codes 00xxx ... 11110 */
-lookup_t pl_dct_dc_chrom_init_table_1[32] =
- { {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2},
+static lookup_t pl_dct_dc_chrom_init_table_1[32] =
+ { {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2},
{1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2},
{2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2},
{3, 3}, {3, 3}, {3, 3}, {3, 3}, {4, 4}, {4, 4}, {5, 5}, {MB_ERROR, 0}
};
+
- /* Table B-13, dct_dc_size_chrominance, codes 111110xxxx ... 1111111111 */
-lookup_t pl_dct_dc_chrom_init_table_2[32] =
+ /* Table B-13, dct_dc_size_chrominance, codes 111110xxxx ... 1111111111 */
+static lookup_t pl_dct_dc_chrom_init_table_2[32] =
{ {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6},
{6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6},
{7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7}, {7, 7},
{8, 8}, {8, 8}, {8, 8}, {8, 8}, {9, 9}, {9, 9}, {10,10}, {11,10}
};
-
- /*
- * Structure to store the tables B14 & B15
- * Is constructed from the tables below
- */
- dct_lookup_t ppl_dct_coef[2][16384];
-
+
/* Tables for ac DCT coefficients. There are cut in many parts to save space */
/* Table B-14, DCT coefficients table zero,
* codes 0100 ... 1xxx (used for first (DC) coefficient)
*/
-dct_lookup_t pl_DCT_tab_dc[12] =
+static dct_lookup_t pl_DCT_tab_dc[12] =
{
{0,2,4}, {2,1,4}, {1,1,3}, {1,1,3},
{0,1,1}, {0,1,1}, {0,1,1}, {0,1,1},
/* Table B-14, DCT coefficients table zero,
* codes 0100 ... 1xxx (used for all other coefficients)
*/
-dct_lookup_t pl_DCT_tab_ac[12] =
+static dct_lookup_t pl_DCT_tab_ac[12] =
{
{0,2,4}, {2,1,4}, {1,1,3}, {1,1,3},
{DCT_EOB,0,2}, {DCT_EOB,0,2}, {DCT_EOB,0,2}, {DCT_EOB,0,2}, /* EOB */
/* Table B-14, DCT coefficients table zero,
* codes 000001xx ... 00111xxx
*/
-dct_lookup_t pl_DCT_tab0[60] =
+static dct_lookup_t pl_DCT_tab0[60] =
{
{DCT_ESCAPE,0,6}, {DCT_ESCAPE,0,6}, {DCT_ESCAPE,0,6}, {DCT_ESCAPE,0,6},
/* Escape */
/* Table B-15, DCT coefficients table one,
* codes 000001xx ... 11111111
*/
-#if 0
-dct_lookup_t pl_DCT_tab0a[252] =
+static dct_lookup_t pl_DCT_tab0a[252] =
{
- {DCT_ESCAPE,0,6}, {DCT_ESCAPE,0,6}, {DCT_ESCAPE,0,6}, {DCT_ESCAPE,0,6},
- /* Escape */
+ {65,0,6}, {65,0,6}, {65,0,6}, {65,0,6}, /* Escape */
{7,1,7}, {7,1,7}, {8,1,7}, {8,1,7},
{6,1,7}, {6,1,7}, {2,2,7}, {2,2,7},
{0,7,6}, {0,7,6}, {0,7,6}, {0,7,6},
{1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
{1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
{1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4}, /* EOB */
- {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4},
- {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4},
- {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4}, {DCT_EOB,0,4},
+ {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4}, /* EOB */
+ {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4},
+ {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4},
+ {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4},
{0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
{0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
{0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
{0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
{0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
{0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
+ {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
{0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
{0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
{0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
{0,9,7}, {0,9,7}, {0,12,8}, {0,13,8},
{2,3,8}, {4,2,8}, {0,14,8}, {0,15,8}
};
-#endif
-
-dct_lookup_t pl_DCT_tab0a[252] =
-{
- {65,0,6}, {65,0,6}, {65,0,6}, {65,0,6}, /* Escape */
- {7,1,7}, {7,1,7}, {8,1,7}, {8,1,7},
- {6,1,7}, {6,1,7}, {2,2,7}, {2,2,7},
- {0,7,6}, {0,7,6}, {0,7,6}, {0,7,6},
- {0,6,6}, {0,6,6}, {0,6,6}, {0,6,6},
- {4,1,6}, {4,1,6}, {4,1,6}, {4,1,6},
- {5,1,6}, {5,1,6}, {5,1,6}, {5,1,6},
- {1,5,8}, {11,1,8}, {0,11,8}, {0,10,8},
- {13,1,8}, {12,1,8}, {3,2,8}, {1,4,8},
- {2,1,5}, {2,1,5}, {2,1,5}, {2,1,5},
- {2,1,5}, {2,1,5}, {2,1,5}, {2,1,5},
- {1,2,5}, {1,2,5}, {1,2,5}, {1,2,5},
- {1,2,5}, {1,2,5}, {1,2,5}, {1,2,5},
- {3,1,5}, {3,1,5}, {3,1,5}, {3,1,5},
- {3,1,5}, {3,1,5}, {3,1,5}, {3,1,5},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {1,1,3}, {1,1,3}, {1,1,3}, {1,1,3},
- {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4}, /* EOB */
- {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4},
- {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4},
- {64,0,4}, {64,0,4}, {64,0,4}, {64,0,4},
- {0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
- {0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
- {0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
- {0,3,4}, {0,3,4}, {0,3,4}, {0,3,4},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,1,2}, {0,1,2}, {0,1,2}, {0,1,2},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,2,3}, {0,2,3}, {0,2,3}, {0,2,3},
- {0,4,5}, {0,4,5}, {0,4,5}, {0,4,5},
- {0,4,5}, {0,4,5}, {0,4,5}, {0,4,5},
- {0,5,5}, {0,5,5}, {0,5,5}, {0,5,5},
- {0,5,5}, {0,5,5}, {0,5,5}, {0,5,5},
- {9,1,7}, {9,1,7}, {1,3,7}, {1,3,7},
- {10,1,7}, {10,1,7}, {0,8,7}, {0,8,7},
- {0,9,7}, {0,9,7}, {0,12,8}, {0,13,8},
- {2,3,8}, {4,2,8}, {0,14,8}, {0,15,8}
-};
-
-
-
/* Table B-14, DCT coefficients table zero,
* codes 0000001000 ... 0000001111
*/
-dct_lookup_t pl_DCT_tab1[8] =
+static dct_lookup_t pl_DCT_tab1[8] =
{
{16,1,10}, {5,2,10}, {0,7,10}, {2,3,10},
{1,4,10}, {15,1,10}, {14,1,10}, {4,2,10}
/* Table B-15, DCT coefficients table one,
* codes 000000100x ... 000000111x
*/
-dct_lookup_t pl_DCT_tab1a[8] =
+static dct_lookup_t pl_DCT_tab1a[8] =
{
{5,2,9}, {5,2,9}, {14,1,9}, {14,1,9},
{2,4,10}, {16,1,10}, {15,1,9}, {15,1,9}
/* Table B-14/15, DCT coefficients table zero / one,
* codes 000000010000 ... 000000011111
*/
-dct_lookup_t pl_DCT_tab2[16] =
+static dct_lookup_t pl_DCT_tab2[16] =
{
{0,11,12}, {8,2,12}, {4,3,12}, {0,10,12},
{2,4,12}, {7,2,12}, {21,1,12}, {20,1,12},
/* Table B-14/15, DCT coefficients table zero / one,
* codes 0000000010000 ... 0000000011111
*/
-dct_lookup_t pl_DCT_tab3[16] =
+static dct_lookup_t pl_DCT_tab3[16] =
{
{10,2,13}, {9,2,13}, {5,3,13}, {3,4,13},
{2,5,13}, {1,7,13}, {1,6,13}, {0,15,13},
/* Table B-14/15, DCT coefficients table zero / one,
* codes 00000000010000 ... 00000000011111
*/
-dct_lookup_t pl_DCT_tab4[16] =
+static dct_lookup_t pl_DCT_tab4[16] =
{
{0,31,14}, {0,30,14}, {0,29,14}, {0,28,14},
{0,27,14}, {0,26,14}, {0,25,14}, {0,24,14},
/* Table B-14/15, DCT coefficients table zero / one,
* codes 000000000010000 ... 000000000011111
*/
-dct_lookup_t pl_DCT_tab5[16] =
+static dct_lookup_t pl_DCT_tab5[16] =
{
{0,40,15}, {0,39,15}, {0,38,15}, {0,37,15},
{0,36,15}, {0,35,15}, {0,34,15}, {0,33,15},
/* Table B-14/15, DCT coefficients table zero / one,
* codes 0000000000010000 ... 0000000000011111
*/
-dct_lookup_t pl_DCT_tab6[16] =
+static dct_lookup_t pl_DCT_tab6[16] =
{
{1,18,16}, {1,17,16}, {1,16,16}, {1,15,16},
{6,3,16}, {16,2,16}, {15,2,16}, {14,2,16},
{13,2,16}, {12,2,16}, {11,2,16}, {31,1,16},
{30,1,16}, {29,1,16}, {28,1,16}, {27,1,16}
};
+
+ /* Pointers on tables of dct coefficients */
+static dct_lookup_t * ppl_dct_tab1[2] = { pl_DCT_tab_ac, pl_DCT_tab0a };
+
+static dct_lookup_t * ppl_dct_tab2[2] = { pl_DCT_tab_ac, pl_DCT_tab_dc };
+
+
+ /* Lookup Table for the chromatic component */
+static int pi_cc_index[12] = { 0, 0, 0, 0, 1, 2, 1, 2, 1, 2 };
+
+
/*
* Initialization of lookup tables
*/
#endif
/*****************************************************************************
- * InitMbAddrInc : Initialize the lookup table for mb_addr_inc
+ * vpar_InitMbAddrInc : Initialize the lookup table for mb_addr_inc
*****************************************************************************/
/* Function for filling up the lookup table for mb_addr_inc */
-void __inline__ FillMbAddrIncTable( vpar_thread_t * p_vpar,
- int i_start, int i_end, int i_step,
+static void FillMbAddrIncTable( vpar_thread_t * p_vpar,
+ int i_start, int i_end, int i_step,
int * pi_value, int i_length )
{
- int i_dummy, i_dummy2;
- for( i_dummy = i_start ; i_dummy < i_end ; i_dummy += i_step )
+ int i_pos, i_offset;
+ for( i_pos = i_start ; i_pos < i_end ; i_pos += i_step )
{
- for( i_dummy2 = 0 ; i_dummy2 < i_step ; i_dummy2 ++ )
+ for( i_offset = 0 ; i_offset < i_step ; i_offset ++ )
{
- p_vpar->pl_mb_addr_inc[i_dummy + i_dummy2].i_value = * pi_value;
- p_vpar->pl_mb_addr_inc[i_dummy + i_dummy2].i_length = i_length;
+ p_vpar->pl_mb_addr_inc[i_pos + i_offset].i_value = * pi_value;
+ p_vpar->pl_mb_addr_inc[i_pos + i_offset].i_length = i_length;
}
(*pi_value)--;
}
}
-
+
/* Function that initialize the table using the last one */
void vpar_InitMbAddrInc( vpar_thread_t * p_vpar )
{
int i_dummy;
int i_value;
-
+
for( i_dummy = 0 ; i_dummy < 8 ; i_dummy++ )
{
p_vpar->pl_mb_addr_inc[i_dummy].i_value = MB_ERROR;
p_vpar->pl_mb_addr_inc[8].i_value = MB_ADDRINC_ESCAPE;
p_vpar->pl_mb_addr_inc[8].i_length = 11;
- for( i_dummy = 9 ; i_dummy < 15 ; i_dummy ++ )
+ for( i_dummy = 9 ; i_dummy < 15 ; i_dummy ++ )
{
p_vpar->pl_mb_addr_inc[i_dummy].i_value = MB_ERROR;
p_vpar->pl_mb_addr_inc[i_dummy].i_length = 0;
p_vpar->pl_mb_addr_inc[15].i_value = MB_ADDRINC_STUFFING;
p_vpar->pl_mb_addr_inc[15].i_length = 11;
- for( i_dummy = 16; i_dummy < 24; i_dummy++ )
+ for( i_dummy = 16; i_dummy < 24; i_dummy++ )
{
p_vpar->pl_mb_addr_inc[i_dummy].i_value = MB_ERROR;
p_vpar->pl_mb_addr_inc[i_dummy].i_length = 0;
}
-
+
i_value = 33;
-
+
FillMbAddrIncTable( p_vpar, 24, 36, 1, &i_value, 11 );
FillMbAddrIncTable( p_vpar, 36, 48, 2, &i_value, 10 );
FillMbAddrIncTable( p_vpar, 48, 96, 8, &i_value, 8 );
}
/*****************************************************************************
- * Init*MBType : Initialize lookup table for the Macroblock type
+ * vpar_Init*MBType : Initialize lookup table for the Macroblock type
*****************************************************************************/
/* Fonction for filling up the tables */
-static void __inline__ FillMBType( vpar_thread_t * p_vpar,
+static void FillMBType( vpar_thread_t * p_vpar,
int i_mb_type,
int i_start,
int i_end,
int i_length )
{
int i_dummy;
-
+
for( i_dummy = i_start ; i_dummy < i_end ; i_dummy++ )
{
p_vpar->ppl_mb_type[i_mb_type][i_dummy].i_value = i_value;
p_vpar->ppl_mb_type[1][0].i_length = 0;
}
-/*****************************************************************************
- * InitCodedPattern : Initialize the lookup table for decoding
- * coded block pattern
- *****************************************************************************/
-void vpar_InitCodedPattern( vpar_thread_t * p_vpar )
-{
- p_vpar->pl_coded_pattern = (lookup_t*) pl_coded_pattern_init_table;
-}
/*****************************************************************************
- * InitDCT : Initialize tables giving the length of the dct coefficient
- * from the vlc code
+ * vpar_InitDCTTables : Initialize tables giving the length of the dct
+ * coefficient from the vlc code
*****************************************************************************/
/* First fonction for filling the table */
-static void __inline__ FillDCTTable( dct_lookup_t * p_tab_dest, dct_lookup_t * p_tab_src,
+static void FillDCTTable( dct_lookup_t * p_tab_dest, dct_lookup_t * p_tab_src,
int i_step, int i_nb_elem, int i_offset )
{
int i_dummy, i_dummy2;
/* Fonction that actually fills the table or create the pointers */
void vpar_InitDCTTables( vpar_thread_t * p_vpar )
{
- /* Tables are cut in two parts to reduce memory occupation */
+ /* Tables are cut in two parts to reduce memory occupation */
p_vpar->pppl_dct_dc_size[0][0] = pl_dct_dc_lum_init_table_1;
p_vpar->pppl_dct_dc_size[0][1] = pl_dct_dc_lum_init_table_2;
p_vpar->pppl_dct_dc_size[1][0] = pl_dct_dc_chrom_init_table_1;
p_vpar->pppl_dct_dc_size[1][1] = pl_dct_dc_chrom_init_table_2;
- memset( ppl_dct_coef[0], MB_ERROR, 16 );
- memset( ppl_dct_coef[1], MB_ERROR, 16 );
-
+ /* XXX?? MB_ERROR is replaced by 0 because if we use -1 we
+ * can block in DecodeMPEG2Intra and others */
+ memset( p_vpar->ppl_dct_coef[0], 0, 16 );
+ memset( p_vpar->ppl_dct_coef[1], 0, 16 );
+
/* For table B14 & B15, we have a pointer to tables */
/* We fill the table thanks to the fonction defined above */
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab0, 256, 60, 4 );
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab1, 64, 8, 8 );
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab2, 16, 16, 16 );
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab3, 8, 16, 16 );
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab4, 4, 16, 16 );
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab5, 2, 16, 16 );
- FillDCTTable( ppl_dct_coef[0], pl_DCT_tab6, 1, 16, 16 );
-
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab0a, 256, 60, 4 );
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab1a, 64, 8, 8 );
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab2, 16, 16, 16 );
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab3, 8, 16, 16 );
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab4, 4, 16, 16 );
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab5, 2, 16, 16 );
- FillDCTTable( ppl_dct_coef[1], pl_DCT_tab6, 1, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab0, 256, 60, 4 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab1, 64, 8, 8 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab2, 16, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab3, 8, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab4, 4, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab5, 2, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[0], pl_DCT_tab6, 1, 16, 16 );
+
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab0a, 256, 60, 4 );
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab1a, 64, 8, 8 );
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab2, 16, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab3, 8, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab4, 4, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab5, 2, 16, 16 );
+ FillDCTTable( p_vpar->ppl_dct_coef[1], pl_DCT_tab6, 1, 16, 16 );
}
+
/*
- * Macroblock parsing functions
+ * Block parsing
*/
/*****************************************************************************
- * vpar_ParseMacroblock : Parse the next macroblock
+ * DecodeMPEG1NonIntra : decode MPEG-1 non-intra blocks
*****************************************************************************/
-void vpar_ParseMacroblock( vpar_thread_t * p_vpar, int * pi_mb_address,
- int i_mb_previous, int i_mb_base )
+static __inline__ void DecodeMPEG1NonIntra( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_b,
+ int i_chroma_format )
{
- static f_addb_t ppf_addb_intra[2] = {vdec_AddBlock, vdec_CopyBlock};
- static f_decode_block_t pppf_decode_block[2][2] =
- { {vpar_DecodeMPEG1Non, vpar_DecodeMPEG1Intra},
- {vpar_DecodeMPEG2Non, vpar_DecodeMPEG2Intra} };
- static int pi_x[12] = {0,8,0,8,0,0,0,0,8,8,8,8};
- static int pi_y[2][12] = { {0,0,8,8,0,0,8,8,0,0,8,8},
- {0,0,1,1,0,0,1,1,0,0,1,1} };
- static int pi_chroma_hor[4] = { 0, 1, 1, 0 };
- static int pi_chroma_ver[4] = { 0, 1, 0, 0 };
-
- int i_mb, i_b, i_mask;
- macroblock_t * p_mb;
- f_addb_t pf_addb;
- elem_t * p_data1;
- elem_t * p_data2;
+ int i_parse;
+ int i_nc;
+ int i_cc;
+ int i_coef;
+ int i_code;
+ int i_length;
+ int i_pos;
+ int i_run;
+ int i_level;
+ boolean_t b_dc;
+ boolean_t b_sign;
+ boolean_t b_chroma;
- /************* DEBUG *************/
- static i_count = 0;
- int i_inc;
- boolean_t b_stop = 0;
+ /* Give the chromatic component (0, 1, 2) */
+ i_cc = pi_cc_index[i_b];
- i_inc = MacroblockAddressIncrement( p_vpar );
-
- *pi_mb_address += i_inc;
+ /* Determine whether it is luminance or not (chrominance) */
+ b_chroma = ( i_cc + 1 ) >> 1;
- //*pi_mb_address += MacroblockAddressIncrement( p_vpar );
- b_stop = i_inc > 1;
- fprintf( stderr, "inc : %d (%d)\n", *pi_mb_address, i_inc );
-if( 0 )//i_count > 8 )
-{
- exit(0);
-}
-i_count++;
+ /* There should be no D picture in non-intra blocks */
+ if( p_vpar->picture.i_coding_type == D_CODING_TYPE )
+ intf_ErrMsg("vpar error : D-picture in non intra block\n");
+
+ /* Decoding of the AC coefficients */
-if( 0 )
- //i_count == 249)
- // i_count != *pi_mb_address)
- //b_stop )
-{
- fprintf( stderr, "i_count = %d (%d)\n", i_count, i_inc );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- exit(0);
-}
+ i_nc = 0;
+ i_coef = 0;
+ b_sign = 0;
- for( i_mb = i_mb_previous; i_mb < *pi_mb_address; i_mb++ )
+ for( i_parse = 0; !p_vpar->b_die; i_parse++ )
{
- /* Skipped macroblock (ISO/IEC 13818-2 7.6.6). */
- static int pi_dc_dct_reinit[4] = {128,256,512,1024};
- static f_motion_t pf_motion_skipped[4] = {NULL, vdec_MotionField,
- vdec_MotionField, vdec_MotionFrame};
-
- /* Reset DC predictors (7.2.1). */
- p_vpar->slice.pi_dc_dct_pred[0] = p_vpar->slice.pi_dc_dct_pred[1]
- = p_vpar->slice.pi_dc_dct_pred[2]
- = pi_dc_dct_reinit[p_vpar->picture.i_intra_dc_precision];
-
- if( p_vpar->picture.i_coding_type == P_CODING_TYPE )
+ i_code = ShowBits( &p_vpar->bit_stream, 16 );
+ if( i_code >= 16384 )
{
- /* Reset motion vector predictors (ISO/IEC 13818-2 7.6.3.4). */
- bzero( p_vpar->slice.pppi_pmv, 8*sizeof(int) );
+ b_dc = !((i_parse + 62)/63);
+ i_run = ppl_dct_tab2[b_dc][(i_code>>12)-4].i_run;
+ i_level = ppl_dct_tab2[b_dc][(i_code>>12)-4].i_level;
+ i_length = ppl_dct_tab2[b_dc][(i_code>>12)-4].i_length;
}
-
- if( (p_mb = p_vpar->picture.pp_mb[i_mb_base + i_mb] =
- vpar_NewMacroblock( &p_vpar->vfifo )) == NULL )
+ else
{
- p_vpar->picture.b_error = 1;
- intf_ErrMsg("vpar error: macroblock list is empty !\n");
- return;
+ i_run = p_vpar->ppl_dct_coef[0][i_code].i_run;
+ i_length = p_vpar->ppl_dct_coef[0][i_code].i_length;
+ i_level = p_vpar->ppl_dct_coef[0][i_code].i_level;
}
- InitMacroblock( p_vpar, p_mb );
-
- /* No IDCT nor AddBlock. */
- for( i_b = 0; i_b < 12; i_b++ )
+ RemoveBits( &p_vpar->bit_stream, i_length );
+
+ switch( i_run )
{
- p_mb->pf_idct[i_b] = vdec_DummyIDCT;
- p_mb->pf_addb[i_b] = vdec_DummyBlock;
+ case DCT_ESCAPE:
+ i_run = GetBits( &p_vpar->bit_stream, 6 );
+ i_level = GetBits( &p_vpar->bit_stream, 8 );
+ if (i_level == 0)
+ i_level = GetBits( &p_vpar->bit_stream, 8 );
+ else if (i_level == 128)
+ i_level = GetBits( &p_vpar->bit_stream, 8 ) - 256;
+ else if (i_level > 128)
+ i_level -= 256;
+
+ if (i_level<0)
+ i_level = -i_level;
+
+ break;
+ case DCT_EOB:
+#ifdef HAVE_MMX
+ /* The MMX IDCT has a precision problem with non-intra
+ * blocks. */
+ p_mb->ppi_blocks[i_b][0] += 4;
+#endif
+ if( i_nc <= 1 )
+ {
+ p_mb->pf_idct[i_b] = vdec_SparseIDCT;
+ p_mb->pi_sparse_pos[i_b] = i_coef;
+ }
+ else
+ {
+ p_mb->pf_idct[i_b] = vdec_IDCT;
+ }
+ return;
+
+ break;
+ default:
+ b_sign = GetBits( &p_vpar->bit_stream, 1 );
}
+ i_coef = i_parse;
+ i_parse += i_run;
+ i_nc ++;
- /* Motion type is picture structure. */
- p_mb->pf_motion = pf_motion_skipped[p_vpar->picture.i_structure];
+ if( i_parse >= 64 )
+ {
+ break;
+ }
- /* Set the field we use for motion compensation */
- p_mb->ppi_field_select[0][0] = p_mb->ppi_field_select[0][1]
- = ( p_vpar->picture.i_current_structure == BOTTOM_FIELD );
- }
-//fprintf(stderr, "MB1\n");
- /* Get a macroblock structure. */
- if( (p_mb = p_vpar->picture.pp_mb[i_mb_base + *pi_mb_address] =
- vpar_NewMacroblock( &p_vpar->vfifo )) == NULL )
- {
- p_vpar->picture.b_error = 1;
- intf_ErrMsg("vpar error: macroblock list is empty !\n");
- return;
+ i_pos = pi_scan[p_vpar->picture.b_alternate_scan][i_parse];
+ i_level = ( ((i_level << 1) + 1) * p_vpar->mb.i_quantizer_scale
+ * p_vpar->sequence.nonintra_quant.pi_matrix[i_pos] ) >> 4;
+ p_mb->ppi_blocks[i_b][i_pos] = b_sign ? -i_level : i_level;
}
- InitMacroblock( p_vpar, p_mb );
-
- /* Parse off macroblock_modes structure. */
- MacroblockModes( p_vpar, p_mb );
+ intf_ErrMsg("vpar error: DCT coeff (non-intra) is out of bounds\n");
+ p_vpar->picture.b_error = 1;
+}
- if( p_vpar->mb.i_mb_type & MB_QUANT )
- {
- LoadQuantizerScale( p_vpar );
- }
+/*****************************************************************************
+ * DecodeMPEG1Intra : decode MPEG-1 intra blocks
+ *****************************************************************************/
+static __inline__ void DecodeMPEG1Intra( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_b ,
+ int i_chroma_format )
+{
+ int i_parse;
+ int i_nc;
+ int i_cc;
+ int i_coef;
+ int i_code;
+ int i_length;
+ int i_pos;
+ int i_dct_dc_size;
+ int i_dct_dc_diff;
+ int i_run;
+ int i_level;
+ boolean_t b_sign;
+ boolean_t b_chroma;
+
+ /* Give the chromatic component (0, 1, 2) */
+ i_cc = pi_cc_index[i_b];
- if( p_vpar->mb.i_mb_type & MB_MOTION_FORWARD )
- {
-fprintf( stderr, "motion !\n" );
- (*p_vpar->sequence.pf_decode_mv)( p_vpar, p_mb, 0 );
- }
+ /* Determine whether it is luminance or not (chrominance) */
+ b_chroma = ( i_cc + 1 ) >> 1;
- if( p_vpar->mb.i_mb_type & MB_MOTION_BACKWARD )
- {
-fprintf( stderr, "motion2 !\n" );
- (*p_vpar->sequence.pf_decode_mv)( p_vpar, p_mb, 1 );
- }
+ /* decode length */
+ i_code = ShowBits(&p_vpar->bit_stream, 5);
- if( p_vpar->picture.b_concealment_mv && (p_vpar->mb.i_mb_type & MB_INTRA) )
+ if (i_code<31)
{
- RemoveBits( &p_vpar->bit_stream, 1 );
+ i_dct_dc_size = ppl_dct_dc_init_table_1[b_chroma][i_code].i_value;
+ i_length = ppl_dct_dc_init_table_1[b_chroma][i_code].i_length;
+ RemoveBits( &p_vpar->bit_stream, i_length);
}
-
- if( p_vpar->mb.i_mb_type & MB_PATTERN )
+ else
{
- (*p_vpar->sequence.pf_decode_pattern)( p_vpar );
+ i_code = ShowBits(&p_vpar->bit_stream, (9+b_chroma)) - (0x1f0 * (b_chroma + 1));
+ i_dct_dc_size = ppl_dct_dc_init_table_2[b_chroma][i_code].i_value;
+ i_length = ppl_dct_dc_init_table_2[b_chroma][i_code].i_length;
+ RemoveBits( &p_vpar->bit_stream, i_length);
}
+
+ if (i_dct_dc_size == 0)
+ i_dct_dc_diff = 0;
else
{
- int pi_coded_block_pattern[2] = {0,
- (1 << 4+p_vpar->sequence.i_chroma_nb_blocks) - 1};
- p_vpar->mb.i_coded_block_pattern = pi_coded_block_pattern
- [p_vpar->mb.i_mb_type & MB_INTRA];
+ i_dct_dc_diff = GetBits( &p_vpar->bit_stream, i_dct_dc_size);
+ if ((i_dct_dc_diff & (1<<(i_dct_dc_size-1))) == 0)
+ i_dct_dc_diff -= (1<<i_dct_dc_size) - 1;
}
- pf_addb = ppf_addb_intra[p_vpar->mb.i_mb_type & MB_INTRA];
+ /* Read the actual code with the good length */
+ p_vpar->mb.pi_dc_dct_pred[i_cc] += i_dct_dc_diff;
+
+ p_mb->ppi_blocks[i_b][0] = p_vpar->mb.pi_dc_dct_pred[i_cc];
- /*
- * Effectively decode blocks.
- */
-//fprintf(stderr, "MB2\n");
- i_mask = 1 << (3 + p_vpar->sequence.i_chroma_nb_blocks);
+ i_nc = ( p_vpar->mb.pi_dc_dct_pred[i_cc] != 0 );
+
+
+ if( p_vpar->picture.i_coding_type == D_CODING_TYPE )
+ {
+ /* Remove end_of_macroblock (always 1, prevents startcode emulation)
+ * ISO/IEC 11172-2 section 2.4.2.7 and 2.4.3.6 */
+ RemoveBits( &p_vpar->bit_stream, 1 );
+ /* D pictures do not have AC coefficients */
+ return;
+ }
- /* luminance */
- p_data1 = (elem_t*) p_mb->p_picture->p_y;
- + p_mb->i_l_x + p_mb->i_l_y*(p_vpar->sequence.i_width);
+
+ /* Decoding of the AC coefficients */
+ i_coef = 0;
+ i_nc = 0;
+ b_sign = 0;
- for( i_b = 0 ; i_b < 4 ; i_b++, i_mask >>= 1 )
+ for( i_parse = 1; !p_vpar->b_die/*i_parse < 64*/; i_parse++ )
{
- if( p_vpar->mb.i_coded_block_pattern & i_mask )
+ i_code = ShowBits( &p_vpar->bit_stream, 16 );
+ /* We use 2 main tables for the coefficients */
+ if( i_code >= 16384 )
{
- memset( p_mb->ppi_blocks[i_b], 0, 64*sizeof(elem_t) );
- (*pppf_decode_block[p_vpar->sequence.b_mpeg2]
- [p_vpar->mb.i_mb_type & MB_INTRA])
- ( p_vpar, p_mb, i_b );
-
- /* decode_block has already set pf_idct and pi_sparse_pos. */
- p_mb->pf_addb[i_b] = pf_addb;
-
- /* Calculate block coordinates. */
- p_mb->p_data[i_b] = p_data1
- + pi_y[p_vpar->mb.b_dct_type][i_b]
- * p_vpar->sequence.i_width;
+ i_run = ppl_dct_tab1[0][(i_code>>12)-4].i_run;
+ i_level = ppl_dct_tab1[0][(i_code>>12)-4].i_level;
+ i_length = ppl_dct_tab1[0][(i_code>>12)-4].i_length;
}
else
{
- /* Block not coded, so no IDCT, nor AddBlock */
- p_mb->pf_addb[i_b] = vdec_DummyBlock;
- p_mb->pf_idct[i_b] = vdec_DummyIDCT;
+ i_run = p_vpar->ppl_dct_coef[0][i_code].i_run;
+ i_length = p_vpar->ppl_dct_coef[0][i_code].i_length;
+ i_level = p_vpar->ppl_dct_coef[0][i_code].i_level;
}
- if( 0 )
- //i_count == 482 && i_b == 2 )
- // i_count != *pi_mb_address)
- //b_stop )
-{
- fprintf( stderr, "i_count = %d (%d)\n", i_count, i_inc );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%4x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- exit(0);
-}
- }
- /* chrominance */
- p_data1 = (elem_t*) p_mb->p_picture->p_u
- + (p_mb->i_c_x >> pi_chroma_hor[p_vpar->sequence.i_chroma_format])
- + (p_mb->i_c_y >> pi_chroma_ver[p_vpar->sequence.i_chroma_format])
- * (p_vpar->sequence.i_chroma_width);
- p_data2 = (elem_t*) p_mb->p_picture->p_v
- + (p_mb->i_c_x >> pi_chroma_hor[p_vpar->sequence.i_chroma_format])
- + (p_mb->i_c_y >> pi_chroma_ver[p_vpar->sequence.i_chroma_format])
- * (p_vpar->sequence.i_chroma_width);
-
- for( i_b = 4; i_b < 4 + p_vpar->sequence.i_chroma_nb_blocks;
- i_b++, i_mask >>= 1 )
- {
- elem_t * pp_data[2] = {p_data1, p_data2};
+ RemoveBits( &p_vpar->bit_stream, i_length );
- if( p_vpar->mb.i_coded_block_pattern & i_mask )
+ switch( i_run )
{
- memset( p_mb->ppi_blocks[i_b], 0, 64*sizeof(elem_t) );
- (*pppf_decode_block[p_vpar->sequence.b_mpeg2]
- [p_vpar->mb.i_mb_type & MB_INTRA])
- ( p_vpar, p_mb, i_b );
-
- /* decode_block has already set pf_idct and pi_sparse_pos. */
- p_mb->pf_addb[i_b] = pf_addb;
-
- /* Calculate block coordinates. */
- p_mb->p_data[i_b] = pp_data[i_b & 1]
- + pi_y[p_vpar->mb.b_dct_type][i_b]
- * p_vpar->sequence.i_chroma_width;
+ case DCT_ESCAPE:
+ i_run = GetBits( &p_vpar->bit_stream, 6 );
+ i_level = GetBits( &p_vpar->bit_stream, 8 );
+ if (i_level == 0)
+ i_level = GetBits( &p_vpar->bit_stream, 8 );
+ else if (i_level == 128)
+ i_level = GetBits( &p_vpar->bit_stream, 8 ) - 256;
+ else if (i_level > 128)
+ i_level -= 256;
+ break;
+ case DCT_EOB:
+ if( i_nc <= 1 )
+ {
+ p_mb->pf_idct[i_b] = vdec_SparseIDCT;
+ p_mb->pi_sparse_pos[i_b] = i_coef;
+ }
+ else
+ {
+ p_mb->pf_idct[i_b] = vdec_IDCT;
+ }
+ return;
+
+ break;
+ default:
+ b_sign = GetBits( &p_vpar->bit_stream, 1 );
}
- else
+
+ /* Prepare the next block */
+ i_coef = i_parse;
+ i_parse += i_run;
+ i_nc ++;
+
+ if( i_parse >= 64 )
{
- /* Block not coded, so no IDCT, nor AddBlock */
- p_mb->pf_addb[i_b] = vdec_DummyBlock;
- p_mb->pf_idct[i_b] = vdec_DummyIDCT;
+ /* We have an error in the stream */
+ break;
}
- }
-
- if( !( p_vpar->mb.i_mb_type & MB_INTRA ) )
- {
- static int pi_dc_dct_reinit[4] = {128,256,512,1024};
- /* Reset DC predictors (7.2.1). */
- p_vpar->slice.pi_dc_dct_pred[0] = p_vpar->slice.pi_dc_dct_pred[1]
- = p_vpar->slice.pi_dc_dct_pred[2]
- = pi_dc_dct_reinit[p_vpar->picture.i_intra_dc_precision];
- }
- else if( !p_vpar->picture.b_concealment_mv )
- {
- /* Reset MV predictors. */
- bzero( p_vpar->slice.pppi_pmv, 8*sizeof(int) );
+ /* Determine the position of the block in the frame */
+ i_pos = pi_scan[p_vpar->picture.b_alternate_scan][i_parse];
+ i_level = ( i_level *
+ p_vpar->mb.i_quantizer_scale *
+ p_vpar->sequence.intra_quant.pi_matrix[i_pos] ) >> 3;
+ p_mb->ppi_blocks[i_b][i_pos] = b_sign ? -i_level : i_level;
}
- if( 0 )
- //i_count == 249)
- // i_count != *pi_mb_address)
- //b_stop )
-{
- fprintf( stderr, "i_count = %d (%d)\n", i_count, i_inc );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x ", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x", GetBits( &p_vpar->bit_stream, 16 ) );
- fprintf( stderr, "%x\n", GetBits( &p_vpar->bit_stream, 16 ) );
- exit(0);
-}
-}
+ intf_ErrMsg("vpar error: DCT coeff (intra) is out of bounds\n");
+ p_vpar->picture.b_error = 1;
+}
/*****************************************************************************
- * InitMacroblock : Initialize macroblock values
+ * DecodeMPEG2NonIntra : decode MPEG-2 non-intra blocks
*****************************************************************************/
-static __inline__ void InitMacroblock( vpar_thread_t * p_vpar,
- macroblock_t * p_mb )
+static __inline__ void DecodeMPEG2NonIntra( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_b,
+ int i_chroma_format )
{
- static f_chroma_motion_t pf_chroma_motion[4] =
- { NULL, vdec_Motion420, vdec_Motion422, vdec_Motion444 };
-
- p_mb->p_picture = p_vpar->picture.p_picture;
- p_mb->i_structure = p_vpar->picture.i_structure;
- p_mb->i_current_structure = p_vpar->picture.i_current_structure;
- p_mb->i_l_x = p_vpar->mb.i_l_x;
- p_mb->i_l_y = p_vpar->mb.i_l_y;
- p_mb->i_c_x = p_vpar->mb.i_c_x;
- p_mb->i_c_y = p_vpar->mb.i_c_y;
- p_mb->i_chroma_nb_blocks = p_vpar->sequence.i_chroma_nb_blocks;
- p_mb->pf_chroma_motion = pf_chroma_motion[p_vpar->sequence.i_chroma_format];
- p_mb->b_P_coding_type = ( p_vpar->picture.i_coding_type == P_CODING_TYPE );
+ int i_parse;
+ int i_nc;
+ int i_cc;
+ int i_coef;
+ int i_code;
+ int i_length;
+ int i_pos;
+ int i_run;
+ int i_level;
+ boolean_t b_dc;
+ boolean_t b_sign;
+ boolean_t b_chroma;
+ int * pi_quant;
- p_mb->p_forward = p_vpar->sequence.p_forward;
- p_mb->p_backward = p_vpar->sequence.p_backward;
-
- p_mb->i_addb_l_stride = p_mb->i_l_stride = p_vpar->picture.i_l_stride;
- p_mb->i_addb_c_stride = p_mb->i_c_stride = p_vpar->picture.i_c_stride;
+ /* Give the chromatic component (0, 1, 2) */
+ i_cc = pi_cc_index[i_b];
- /* Update macroblock real position. */
- p_vpar->mb.i_l_x += 16;
- p_vpar->mb.i_l_y += (p_vpar->mb.i_l_x / p_vpar->sequence.i_width)
- * (2 - p_vpar->picture.b_frame_structure) * 16;
- p_vpar->mb.i_l_x %= p_vpar->sequence.i_width;
+ /* Determine whether it is luminance or not (chrominance) */
+ b_chroma = ( i_cc + 1 ) >> 1;
- p_vpar->mb.i_c_x += p_vpar->sequence.i_chroma_mb_width;
- p_vpar->mb.i_c_y += (p_vpar->mb.i_c_x / p_vpar->sequence.i_chroma_width)
- * (2 - p_vpar->picture.b_frame_structure)
- * p_vpar->sequence.i_chroma_mb_height;
- p_vpar->mb.i_c_x %= p_vpar->sequence.i_chroma_width;
-}
+ /* Give a pointer to the quantization matrices for intra blocks */
+ if( (i_chroma_format == CHROMA_420) || (!b_chroma) )
+ {
+ pi_quant = p_vpar->sequence.nonintra_quant.pi_matrix;
+ }
+ else
+ {
+ pi_quant = p_vpar->sequence.chroma_nonintra_quant.pi_matrix;
+ }
-/*****************************************************************************
- * MacroblockAddressIncrement : Get the macroblock_address_increment field
- *****************************************************************************/
-static __inline__ int MacroblockAddressIncrement( vpar_thread_t * p_vpar )
-{
- int i_addr_inc = 0;
- /* Index in the lookup table mb_addr_inc */
- int i_index = ShowBits( &p_vpar->bit_stream, 11 );
+ /* Decoding of the AC coefficients */
- /* Test the presence of the escape character */
- while( i_index == 8 )
+ i_nc = 0;
+ i_coef = 0;
+ for( i_parse = 0; !p_vpar->b_die; i_parse++ )
{
- RemoveBits( &p_vpar->bit_stream, 11 );
- i_addr_inc += 33;
- i_index = ShowBits( &p_vpar->bit_stream, 11 );
+ i_code = ShowBits( &p_vpar->bit_stream, 16 );
+ if( i_code >= 16384 )
+ {
+ b_dc = (i_parse == 0);
+ i_run = ppl_dct_tab2[b_dc][(i_code>>12)-4].i_run;
+ i_level = ppl_dct_tab2[b_dc][(i_code>>12)-4].i_level;
+ i_length = ppl_dct_tab2[b_dc][(i_code>>12)-4].i_length;
+ }
+ else
+ {
+ i_run = p_vpar->ppl_dct_coef[0][i_code].i_run;
+ i_length = p_vpar->ppl_dct_coef[0][i_code].i_length;
+ i_level = p_vpar->ppl_dct_coef[0][i_code].i_level;
+ }
+
+
+ RemoveBits( &p_vpar->bit_stream, i_length );
+
+ switch( i_run )
+ {
+ case DCT_ESCAPE:
+ i_run = GetBits( &p_vpar->bit_stream, 6 );
+ i_level = GetBits( &p_vpar->bit_stream, 12 );
+ i_level = (b_sign = ( i_level > 2047 )) ? 4096 - i_level
+ : i_level;
+ break;
+ case DCT_EOB:
+#ifdef HAVE_MMX
+ /* The MMX IDCT has a precision problem with non-intra
+ * blocks. */
+ p_mb->ppi_blocks[i_b][0] += 4;
+#endif
+ if( i_nc <= 1 )
+ {
+ p_mb->pf_idct[i_b] = vdec_SparseIDCT;
+ p_mb->pi_sparse_pos[i_b] = i_coef;
+ }
+ else
+ {
+ p_mb->pf_idct[i_b] = vdec_IDCT;
+ }
+ return;
+
+ break;
+ default:
+ b_sign = GetBits( &p_vpar->bit_stream, 1 );
+ }
+ i_coef = i_parse;
+ i_parse += i_run;
+ i_nc ++;
+
+ if( i_parse >= 64 )
+ {
+ break;
+ }
+
+ i_pos = pi_scan[p_vpar->picture.b_alternate_scan][i_parse];
+ i_level = ( ((i_level << 1) + 1) * p_vpar->mb.i_quantizer_scale
+ * pi_quant[i_pos] ) >> 5;
+ p_mb->ppi_blocks[i_b][i_pos] = b_sign ? -i_level : i_level;
}
-
- /* Affect the value from the lookup table */
- i_addr_inc += p_vpar->pl_mb_addr_inc[i_index].i_value;
-
- /* Dump the good number of bits */
- RemoveBits( &p_vpar->bit_stream, p_vpar->pl_mb_addr_inc[i_index].i_length );
- return i_addr_inc;
+ intf_ErrMsg("vpar error: DCT coeff (non-intra) is out of bounds\n");
+ p_vpar->picture.b_error = 1;
}
/*****************************************************************************
- * MacroblockModes : Get the macroblock_modes structure
+ * DecodeMPEG2Intra : decode MPEG-2 intra blocks
*****************************************************************************/
-static __inline__ void MacroblockModes( vpar_thread_t * p_vpar,
- macroblock_t * p_mb )
+static __inline__ void DecodeMPEG2Intra( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_b,
+ int i_chroma_format )
{
- static f_motion_t pf_motion[2][4] =
- { {NULL, vdec_FieldFieldRecon, vdec_Field16x8Recon, vdec_FieldDMVRecon},
- {NULL, vdec_FrameFieldRecon, vdec_FrameFrameRecon, vdec_FrameDMVRecon} };
- static int ppi_mv_count[2][4] = { {0, 1, 2, 1}, {0, 2, 1, 1} };
- static int ppi_mv_format[2][4] = { {0, 1, 1, 1}, {0, 1, 2, 1} };
+ int i_parse;
+ int i_nc;
+ int i_cc;
+ int i_coef;
+ int i_code;
+ int i_length;
+ int i_pos;
+ int i_dct_dc_size;
+ int i_dct_dc_diff;
+ int i_run;
+ int i_level;
+ boolean_t b_vlc_intra;
+ boolean_t b_sign;
+ boolean_t b_chroma;
+ int * pi_quant;
+
+ /* Give the chromatic component (0, 1, 2) */
+ i_cc = pi_cc_index[i_b];
- /* Get macroblock_type. */
- p_vpar->mb.i_mb_type = (p_vpar->picture.pf_macroblock_type)( p_vpar );
- p_mb->i_mb_type = p_vpar->mb.i_mb_type;
+ /* Determine whether it is luminance or not (chrominance) */
+ b_chroma = ( i_cc + 1 ) >> 1;
-//fprintf( stderr, "MB type : %d\n", p_mb->i_mb_type );
-
- /* SCALABILITY : warning, we don't know if spatial_temporal_weight_code
- * has to be dropped, take care if you use scalable streams. */
- /* RemoveBits( &p_vpar->bit_stream, 2 ); */
-
- if( !(p_vpar->mb.i_mb_type & (MB_MOTION_FORWARD | MB_MOTION_BACKWARD)) )
+ /* Give a pointer to the quantization matrices for intra blocks */
+ if( (i_chroma_format == CHROMA_420) || (!b_chroma) )
+ {
+ pi_quant = p_vpar->sequence.intra_quant.pi_matrix;
+ }
+ else
{
- /* If mb_type has neither MOTION_FORWARD nor MOTION_BACKWARD, this
- * is useless, but also harmless. */
- p_vpar->mb.i_motion_type = MOTION_FRAME;
+ pi_quant = p_vpar->sequence.chroma_intra_quant.pi_matrix;
+ }
+
+ /* decode length */
+ i_code = ShowBits(&p_vpar->bit_stream, 5);
+
+ if (i_code<31)
+ {
+ i_dct_dc_size = ppl_dct_dc_init_table_1[b_chroma][i_code].i_value;
+ i_length = ppl_dct_dc_init_table_1[b_chroma][i_code].i_length;
+ RemoveBits( &p_vpar->bit_stream, i_length);
}
else
{
- if( p_vpar->picture.i_structure == FRAME_STRUCTURE
- && p_vpar->picture.b_frame_pred_frame_dct )
+ i_code = ShowBits(&p_vpar->bit_stream, (9+b_chroma)) - (0x1f0 * (b_chroma + 1));
+ i_dct_dc_size = ppl_dct_dc_init_table_2[b_chroma][i_code].i_value;
+ i_length = ppl_dct_dc_init_table_2[b_chroma][i_code].i_length;
+ RemoveBits( &p_vpar->bit_stream, i_length);
+ }
+
+ if (i_dct_dc_size == 0)
+ i_dct_dc_diff = 0;
+ else
+ {
+ i_dct_dc_diff = GetBits( &p_vpar->bit_stream, i_dct_dc_size);
+ if ((i_dct_dc_diff & (1<<(i_dct_dc_size-1))) == 0)
+ i_dct_dc_diff -= (1<<i_dct_dc_size) - 1;
+ }
+
+ /* Read the actual code with the good length */
+ p_vpar->mb.pi_dc_dct_pred[i_cc] += i_dct_dc_diff;
+
+ p_mb->ppi_blocks[i_b][0] = ( p_vpar->mb.pi_dc_dct_pred[i_cc] <<
+ ( 3 - p_vpar->picture.i_intra_dc_precision ) );
+
+ i_nc = ( p_vpar->mb.pi_dc_dct_pred[i_cc] != 0 );
+
+
+ /* Decoding of the AC coefficients */
+
+ i_coef = 0;
+ b_vlc_intra = p_vpar->picture.b_intra_vlc_format;
+ for( i_parse = 1; !p_vpar->b_die/*i_parse < 64*/; i_parse++ )
+ {
+ i_code = ShowBits( &p_vpar->bit_stream, 16 );
+ /* We use 2 main tables for the coefficients */
+ if( i_code >= 16384 )
{
- p_vpar->mb.i_motion_type = MOTION_FRAME;
+ i_run = ppl_dct_tab1[b_vlc_intra][(i_code>>(12-(4*b_vlc_intra)))-4].i_run;
+ i_level = ppl_dct_tab1[b_vlc_intra][(i_code>>(12-(4*b_vlc_intra)))-4].i_level;
+ i_length = ppl_dct_tab1[b_vlc_intra][(i_code>>(12-(4*b_vlc_intra)))-4].i_length;
}
else
{
- p_vpar->mb.i_motion_type = GetBits( &p_vpar->bit_stream, 2 );
+ i_run = p_vpar->ppl_dct_coef[b_vlc_intra][i_code].i_run;
+ i_length = p_vpar->ppl_dct_coef[b_vlc_intra][i_code].i_length;
+ i_level = p_vpar->ppl_dct_coef[b_vlc_intra][i_code].i_level;
}
+
+ RemoveBits( &p_vpar->bit_stream, i_length );
+
+ switch( i_run )
+ {
+ case DCT_ESCAPE:
+ i_run = GetBits( &p_vpar->bit_stream, 6 );
+ i_level = GetBits( &p_vpar->bit_stream, 12 );
+ i_level = (b_sign = ( i_level > 2047 )) ? 4096 - i_level
+ : i_level;
+ break;
+ case DCT_EOB:
+ if( i_nc <= 1 )
+ {
+ p_mb->pf_idct[i_b] = vdec_SparseIDCT;
+ p_mb->pi_sparse_pos[i_b] = i_coef;
+ }
+ else
+ {
+ p_mb->pf_idct[i_b] = vdec_IDCT;
+ }
+ return;
+
+ break;
+ default:
+ b_sign = GetBits( &p_vpar->bit_stream, 1 );
+ }
+
+ /* Prepare the next block */
+ i_coef = i_parse;
+ i_parse += i_run;
+ i_nc ++;
+
+ if( i_parse >= 64 )
+ {
+ /* We have an error in the stream */
+ break;
+ }
+
+ /* Determine the position of the block in the frame */
+ i_pos = pi_scan[p_vpar->picture.b_alternate_scan][i_parse];
+ i_level = ( i_level *
+ p_vpar->mb.i_quantizer_scale *
+ pi_quant[i_pos] ) >> 4;
+ p_mb->ppi_blocks[i_b][i_pos] = b_sign ? -i_level : i_level;
+ }
+
+ intf_ErrMsg("vpar error: DCT coeff (intra) is out of bounds\n");
+ p_vpar->picture.b_error = 1;
+}
+
+
+/*
+ * Motion vectors
+ */
+
+/****************************************************************************
+ * MotionCode : Parse the next motion code
+ ****************************************************************************/
+static __inline__ int MotionCode( vpar_thread_t * p_vpar )
+{
+ int i_code;
+ static lookup_t pl_mv_tab0[8] =
+ { {-1,0}, {3,3}, {2,2}, {2,2}, {1,1}, {1,1}, {1,1}, {1,1} };
+ /* Table B-10, motion_code, codes 0000011 ... 000011x */
+ static lookup_t pl_mv_tab1[8] =
+ { {-1,0}, {-1,0}, {-1,0}, {7,6}, {6,6}, {5,6}, {4,5}, {4,5} };
+ /* Table B-10, motion_code, codes 0000001100 ... 000001011x */
+ static lookup_t pl_mv_tab2[12] = {
+ {16,9}, {15,9}, {14,9}, {13,9},
+ {12,9}, {11,9}, {10,8}, {10,8},
+ {9,8}, {9,8}, {8,8}, {8,8} };
+
+ if( GetBits( &p_vpar->bit_stream, 1 ) )
+ {
+ return 0;
}
-
- if( p_mb->b_P_coding_type && !(p_vpar->mb.i_mb_type & (MB_MOTION_FORWARD|MB_INTRA)) )
+ if( (i_code = ShowBits( &p_vpar->bit_stream, 9) ) >= 64 )
{
- /* Special No-MC macroblock in P pictures (7.6.3.5). */
- memset( p_vpar->slice.pppi_pmv, 0, 8*sizeof(int) );
- memset( p_mb->pppi_motion_vectors, 0, 8*sizeof(int) );
-
- p_vpar->mb.i_motion_type = MOTION_FRAME;
- p_mb->ppi_field_select[0][0] = ( p_vpar->picture.i_current_structure == BOTTOM_FIELD );
+ i_code >>= 6;
+ RemoveBits( &p_vpar->bit_stream, pl_mv_tab0[i_code].i_length );
+ return( GetBits( &p_vpar->bit_stream, 1 ) ?
+ -pl_mv_tab0[i_code].i_value : pl_mv_tab0[i_code].i_value );
}
- if( p_vpar->mb.i_mb_type & MB_INTRA )
+ if( i_code >= 24 )
{
- /* For the intra macroblocks, we use an empty motion
- * compensation function */
- p_mb->pf_motion = vdec_DummyRecon;
+ i_code >>= 3;
+ RemoveBits( &p_vpar->bit_stream, pl_mv_tab1[i_code].i_length );
+ return( GetBits( &p_vpar->bit_stream, 1 ) ?
+ -pl_mv_tab1[i_code].i_value : pl_mv_tab1[i_code].i_value );
}
- else
+
+ if( (i_code -= 12) < 0 )
{
- p_mb->pf_motion = pf_motion[p_vpar->picture.b_frame_structure]
- [p_vpar->mb.i_motion_type];
+ p_vpar->picture.b_error = 1;
+ intf_DbgMsg( "vpar debug: Invalid motion_vector code\n" );
+ return 0;
}
- p_vpar->mb.i_mv_count = ppi_mv_count[p_vpar->picture.b_frame_structure]
- [p_vpar->mb.i_motion_type];
- p_vpar->mb.i_mv_format = ppi_mv_format[p_vpar->picture.b_frame_structure]
- [p_vpar->mb.i_motion_type];
- p_vpar->mb.b_dct_type = 0;
- if( (p_vpar->picture.i_structure == FRAME_STRUCTURE) &&
- (!p_vpar->picture.b_frame_pred_frame_dct) &&
- (p_vpar->mb.i_mb_type & (MB_PATTERN|MB_INTRA)) )
+ RemoveBits( &p_vpar->bit_stream, pl_mv_tab2[i_code].i_length );
+ return( GetBits( &p_vpar->bit_stream, 1 ) ?
+ -pl_mv_tab2[i_code].i_value : pl_mv_tab2[i_code].i_value );
+}
+
+/****************************************************************************
+ * DecodeMotionVector : Decode a motion_vector
+ ****************************************************************************/
+static __inline__ void DecodeMotionVector( int * pi_prediction, int i_r_size,
+ int i_motion_code, int i_motion_residual, int i_full_pel )
+{
+ int i_limit, i_vector;
+
+ /* ISO/IEC 13818-1 section 7.6.3.1 */
+ i_limit = 16 << i_r_size;
+ i_vector = *pi_prediction >> i_full_pel;
+
+ if( i_motion_code > 0 )
{
- if( (p_vpar->mb.b_dct_type = GetBits( &p_vpar->bit_stream, 1 )) )
+ i_vector += ((i_motion_code-1) << i_r_size) + i_motion_residual + 1;
+ if( i_vector >= i_limit )
+ i_vector -= i_limit + i_limit;
+ }
+ else if( i_motion_code < 0 )
+ {
+ i_vector -= ((-i_motion_code-1) << i_r_size) + i_motion_residual + 1;
+ if( i_vector < -i_limit )
+ i_vector += i_limit + i_limit;
+ }
+ *pi_prediction = i_vector << i_full_pel;
+}
+
+/****************************************************************************
+ * MotionVector : Parse the next motion_vector field
+ ****************************************************************************/
+static __inline__ void MotionVector( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_r,
+ int i_s, int i_full_pel, int i_structure )
+{
+ int i_motion_code, i_motion_residual;
+ int i_r_size;
+ int pi_dm_vector[2];
+
+ i_r_size = p_vpar->picture.ppi_f_code[i_s][0] - 1;
+ i_motion_code = MotionCode( p_vpar );
+ i_motion_residual = (i_r_size != 0 && i_motion_code != 0) ?
+ GetBits( &p_vpar->bit_stream, i_r_size) : 0;
+ DecodeMotionVector( &p_vpar->mb.pppi_pmv[i_r][i_s][0], i_r_size,
+ i_motion_code, i_motion_residual, i_full_pel );
+ p_mb->pppi_motion_vectors[i_r][i_s][0] = p_vpar->mb.pppi_pmv[i_r][i_s][0];
+
+ if( p_vpar->mb.b_dmv )
+ {
+ if( GetBits(&p_vpar->bit_stream, 1) )
{
- /* The DCT is coded on fields. Jump one line between each
- * sample. */
- p_mb->i_addb_l_stride <<= 1;
- p_mb->i_addb_l_stride += 8;
- /* With CHROMA_420, the DCT is necessarily frame-coded. */
- if( p_vpar->sequence.i_chroma_format != CHROMA_420 )
+ pi_dm_vector[0] = GetBits( &p_vpar->bit_stream, 1 ) ? -1 : 1;
+ }
+ else
+ {
+ pi_dm_vector[0] = 0;
+ }
+ }
+
+ i_r_size = p_vpar->picture.ppi_f_code[i_s][1]-1;
+ i_motion_code = MotionCode( p_vpar );
+ i_motion_residual = (i_r_size != 0 && i_motion_code != 0) ?
+ GetBits( &p_vpar->bit_stream, i_r_size) : 0;
+
+
+ if( (p_vpar->mb.i_mv_format == MOTION_FIELD)
+ && (i_structure == FRAME_STRUCTURE) )
+ {
+ p_vpar->mb.pppi_pmv[i_r][i_s][1] >>= 1;
+ }
+
+ DecodeMotionVector( &p_vpar->mb.pppi_pmv[i_r][i_s][1], i_r_size,
+ i_motion_code, i_motion_residual, i_full_pel );
+
+ if( (p_vpar->mb.i_mv_format == MOTION_FIELD)
+ && (i_structure == FRAME_STRUCTURE) )
+ p_vpar->mb.pppi_pmv[i_r][i_s][1] <<= 1;
+
+ p_mb->pppi_motion_vectors[i_r][i_s][1] = p_vpar->mb.pppi_pmv[i_r][i_s][1];
+
+ if( p_vpar->mb.b_dmv )
+ {
+ if( GetBits(&p_vpar->bit_stream, 1) )
+ {
+ pi_dm_vector[1] = GetBits( &p_vpar->bit_stream, 1 ) ? -1 : 1;
+ }
+ else
+ {
+ pi_dm_vector[1] = 0;
+ }
+
+ /* Dual Prime Arithmetic (ISO/IEC 13818-2 section 7.6.3.6). */
+
+#define i_mv_x p_mb->pppi_motion_vectors[0][0][0]
+ if( i_structure == FRAME_STRUCTURE )
+ {
+#define i_mv_y (p_mb->pppi_motion_vectors[0][0][1] << 1)
+ if( p_vpar->picture.b_top_field_first )
{
- p_mb->i_addb_c_stride <<= 1;
- p_mb->i_addb_c_stride += 8;
+ /* vector for prediction of top field from bottom field */
+ p_mb->ppi_dmv[0][0] = ((i_mv_x + (i_mv_x > 0)) >> 1) + pi_dm_vector[0];
+ p_mb->ppi_dmv[0][1] = ((i_mv_y + (i_mv_y > 0)) >> 1) + pi_dm_vector[1] - 1;
+
+ /* vector for prediction of bottom field from top field */
+ p_mb->ppi_dmv[1][0] = ((3*i_mv_x + (i_mv_x > 0)) >> 1) + pi_dm_vector[0];
+ p_mb->ppi_dmv[1][1] = ((3*i_mv_y + (i_mv_y > 0)) >> 1) + pi_dm_vector[1] + 1;
+ }
+ else
+ {
+ /* vector for prediction of top field from bottom field */
+ p_mb->ppi_dmv[0][0] = ((3*i_mv_x + (i_mv_x > 0)) >> 1) + pi_dm_vector[0];
+ p_mb->ppi_dmv[0][1] = ((3*i_mv_y + (i_mv_y > 0)) >> 1) + pi_dm_vector[1] - 1;
+
+ /* vector for prediction of bottom field from top field */
+ p_mb->ppi_dmv[1][0] = ((i_mv_x + (i_mv_x > 0)) >> 1) + pi_dm_vector[0];
+ p_mb->ppi_dmv[1][1] = ((i_mv_y + (i_mv_y > 0)) >> 1) + pi_dm_vector[1] + 1;
}
+#undef i_mv_y
+ }
+ else
+ {
+#define i_mv_y p_mb->pppi_motion_vectors[0][0][1]
+ /* vector for prediction from field of opposite 'parity' */
+ p_mb->ppi_dmv[0][0] = ((i_mv_x + (i_mv_x > 0)) >> 1) + pi_dm_vector[0];
+ p_mb->ppi_dmv[0][1] = ((i_mv_y + (i_mv_y > 0)) >> 1) + pi_dm_vector[1];
+
+ /* correct for vertical field shift */
+ if( p_vpar->picture.i_structure == TOP_FIELD )
+ p_mb->ppi_dmv[0][1]--;
+ else
+ p_mb->ppi_dmv[0][1]++;
+#undef i_mv_y
+ }
+#undef i_mv_x
+ }
+}
+
+/*****************************************************************************
+ * DecodeMVMPEG1 : Parse the next MPEG-1 motion vectors
+ *****************************************************************************/
+static void DecodeMVMPEG1( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_s, int i_structure )
+{
+ MotionVector( p_vpar, p_mb, 0, i_s,
+ p_vpar->picture.pb_full_pel_vector[i_s], i_structure );
+}
+
+/*****************************************************************************
+ * DecodeMVMPEG2 : Parse the next MPEG-2 motion_vectors field
+ *****************************************************************************/
+static void DecodeMVMPEG2( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_s, int i_structure )
+{
+ if( p_vpar->mb.i_mv_count == 1 )
+ {
+ if( p_vpar->mb.i_mv_format == MOTION_FIELD && !p_vpar->mb.b_dmv )
+ {
+ p_mb->ppi_field_select[0][i_s] = p_mb->ppi_field_select[1][i_s]
+ = GetBits( &p_vpar->bit_stream, 1 );
}
+ MotionVector( p_vpar, p_mb, 0, i_s, 0, i_structure );
+ p_vpar->mb.pppi_pmv[1][i_s][0] = p_vpar->mb.pppi_pmv[0][i_s][0];
+ p_vpar->mb.pppi_pmv[1][i_s][1] = p_vpar->mb.pppi_pmv[0][i_s][1];
+ p_mb->pppi_motion_vectors[1][i_s][0] = p_vpar->mb.pppi_pmv[0][i_s][0];
+ p_mb->pppi_motion_vectors[1][i_s][1] = p_vpar->mb.pppi_pmv[0][i_s][1];
+ }
+ else
+ {
+ p_mb->ppi_field_select[0][i_s] = GetBits( &p_vpar->bit_stream, 1 );
+ MotionVector( p_vpar, p_mb, 0, i_s, 0, i_structure );
+ p_mb->ppi_field_select[1][i_s] = GetBits( &p_vpar->bit_stream, 1 );
+ MotionVector( p_vpar, p_mb, 1, i_s, 0, i_structure );
+ }
+}
+
+
+/*
+ * Macroblock information structures
+ */
+
+/*****************************************************************************
+ * MacroblockAddressIncrement : Get the macroblock_address_increment field
+ *****************************************************************************/
+static int MacroblockAddressIncrement( vpar_thread_t * p_vpar )
+{
+ int i_addr_inc = 0;
+ /* Index in the lookup table mb_addr_inc */
+ int i_index = ShowBits( &p_vpar->bit_stream, 11 );
+
+ /* Test the presence of the escape character */
+ while( i_index == 8 )
+ {
+ RemoveBits( &p_vpar->bit_stream, 11 );
+ i_addr_inc += 33;
+ i_index = ShowBits( &p_vpar->bit_stream, 11 );
}
- p_vpar->mb.b_dmv = p_vpar->mb.i_motion_type == MOTION_DMV;
+
+ /* Affect the value from the lookup table */
+ i_addr_inc += p_vpar->pl_mb_addr_inc[i_index].i_value;
+
+ /* Dump the good number of bits */
+ RemoveBits( &p_vpar->bit_stream, p_vpar->pl_mb_addr_inc[i_index].i_length );
+
+ return i_addr_inc;
}
/*****************************************************************************
- * vpar_IMBType : macroblock_type in I pictures
+ * IMBType : macroblock_type in I pictures
*****************************************************************************/
-int vpar_IMBType( vpar_thread_t * p_vpar )
+static __inline__ int IMBType( vpar_thread_t * p_vpar )
{
/* Take two bits for testing */
int i_type = ShowBits( &p_vpar->bit_stream, 2 );
-
+
/* Lookup table for macroblock_type */
static lookup_t pl_mb_Itype[4] = { {MB_ERROR, 0},
{MB_QUANT|MB_INTRA, 2},
}
/*****************************************************************************
- * vpar_PMBType : macroblock_type in P pictures
+ * PMBType : macroblock_type in P pictures
*****************************************************************************/
-int vpar_PMBType( vpar_thread_t * p_vpar )
+static __inline__ int PMBType( vpar_thread_t * p_vpar )
{
/* Testing on 6 bits */
int i_type = ShowBits( &p_vpar->bit_stream, 6 );
-
+
/* Dump the good number of bits */
RemoveBits( &p_vpar->bit_stream, p_vpar->ppl_mb_type[0][i_type].i_length );
-
/* return the value from the lookup table for P type */
return p_vpar->ppl_mb_type[0][i_type].i_value;
}
/*****************************************************************************
- * vpar_BMBType : macroblock_type in B pictures
+ * BMBType : macroblock_type in B pictures
*****************************************************************************/
-int vpar_BMBType( vpar_thread_t * p_vpar )
+static __inline__ int BMBType( vpar_thread_t * p_vpar )
{
/* Testing on 6 bits */
int i_type = ShowBits( &p_vpar->bit_stream, 6 );
-
+
/* Dump the good number of bits */
RemoveBits( &p_vpar->bit_stream, p_vpar->ppl_mb_type[1][i_type].i_length );
-
+
/* return the value from the lookup table for B type */
return p_vpar->ppl_mb_type[1][i_type].i_value;
}
/*****************************************************************************
- * vpar_DMBType : macroblock_type in D pictures
+ * DMBType : macroblock_type in D pictures
*****************************************************************************/
-int vpar_DMBType( vpar_thread_t * p_vpar )
+static __inline__ int DMBType( vpar_thread_t * p_vpar )
{
- /* Taking 1 bit */
- int i_type = GetBits( &p_vpar->bit_stream, 1 );
-
- /* Lookup table */
- static int pi_mb_Dtype[2] = { MB_ERROR, 1 };
-
- return pi_mb_Dtype[i_type];
+ return GetBits( &p_vpar->bit_stream, 1 );
}
/*****************************************************************************
- * vpar_CodedPattern420 : coded_block_pattern with 420 chroma
+ * CodedPattern420 : coded_block_pattern with 4:2:0 chroma
*****************************************************************************/
-int vpar_CodedPattern420( vpar_thread_t * p_vpar )
+static __inline__ int CodedPattern420( vpar_thread_t * p_vpar )
{
/* Take the max 9 bits length vlc code for testing */
int i_vlc = ShowBits( &p_vpar->bit_stream, 9 );
-
- /* Trash the good number of bits read in the lookup table */
- RemoveBits( &p_vpar->bit_stream, p_vpar->pl_coded_pattern[i_vlc].i_length );
-
+
+ /* Trash the good number of bits read in the lookup table */
+ RemoveBits( &p_vpar->bit_stream, pl_coded_pattern[i_vlc].i_length );
+
/* return the value from the vlc table */
- return p_vpar->pl_coded_pattern[i_vlc].i_value;
+ return pl_coded_pattern[i_vlc].i_value;
}
/*****************************************************************************
- * vpar_CodedPattern422 : coded_block_pattern with 422 chroma
+ * CodedPattern422 : coded_block_pattern with 4:2:2 chroma
*****************************************************************************/
-int vpar_CodedPattern422( vpar_thread_t * p_vpar )
+static __inline__ int CodedPattern422( vpar_thread_t * p_vpar )
{
int i_vlc = ShowBits( &p_vpar->bit_stream, 9 );
-
- /* Supplementary 2 bits long code for 422 format */
- int i_coded_block_pattern_1;
-
- RemoveBits( &p_vpar->bit_stream, p_vpar->pl_coded_pattern[i_vlc].i_length );
- i_coded_block_pattern_1 = GetBits( &p_vpar->bit_stream, 2 );
-
- /* the code is just to be added to the value found in the table */
- return p_vpar->pl_coded_pattern[i_vlc].i_value |
- (i_coded_block_pattern_1 << 6);
+
+ RemoveBits( &p_vpar->bit_stream, pl_coded_pattern[i_vlc].i_length );
+
+ /* Supplementary 2 bits long code for 4:2:2 format */
+ return pl_coded_pattern[i_vlc].i_value |
+ (GetBits( &p_vpar->bit_stream, 2 ) << 6);
}
/*****************************************************************************
- * vpar_CodedPattern444 : coded_block_pattern with 444 chroma
+ * CodedPattern444 : coded_block_pattern with 4:4:4 chroma
*****************************************************************************/
-int vpar_CodedPattern444( vpar_thread_t * p_vpar )
+static __inline__ int CodedPattern444( vpar_thread_t * p_vpar )
{
int i_vlc = ShowBits( &p_vpar->bit_stream, 9 );
- int i_coded_block_pattern_2;
-
- RemoveBits( &p_vpar->bit_stream, p_vpar->pl_coded_pattern[i_vlc].i_length );
- i_coded_block_pattern_2 = GetBits( &p_vpar->bit_stream, 6 );
-
- return p_vpar->pl_coded_pattern[i_vlc].i_value |
- ( i_coded_block_pattern_2 << 6 );
+
+ RemoveBits( &p_vpar->bit_stream, pl_coded_pattern[i_vlc].i_length );
+
+ return pl_coded_pattern[i_vlc].i_value |
+ (GetBits( &p_vpar->bit_stream, 6 ) << 6);
}
/*****************************************************************************
- * vpar_DecodeMPEG1Non : decode MPEG-1 non-intra blocks
+ * InitMacroblock : Initialize macroblock values
*****************************************************************************/
-static void vpar_DecodeMPEG1Non( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b )
+static __inline__ void InitMacroblock( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb, int i_coding_type,
+ int i_chroma_format,
+ int i_structure,
+ boolean_t b_second_field )
{
+ p_mb->i_chroma_nb_blocks = 1 << i_chroma_format;
+ p_mb->p_picture = p_vpar->picture.p_picture;
- if( p_vpar->picture.i_coding_type == D_CODING_TYPE )
+ if( i_coding_type == B_CODING_TYPE )
+ p_mb->p_backward = p_vpar->sequence.p_backward;
+ else
+ p_mb->p_backward = NULL;
+ if( (i_coding_type == P_CODING_TYPE) || (i_coding_type == B_CODING_TYPE) )
+ p_mb->p_forward = p_vpar->sequence.p_forward;
+ else
+ p_mb->p_forward = NULL;
+
+ p_mb->i_l_x = p_vpar->mb.i_l_x;
+ p_mb->i_c_x = p_vpar->mb.i_c_x;
+ p_mb->i_motion_l_y = p_vpar->mb.i_l_y;
+ p_mb->i_motion_c_y = p_vpar->mb.i_c_y;
+ if( (p_mb->b_motion_field = (i_structure == BOTTOM_FIELD)) )
{
- /* Remove end_of_macroblock (always 1, prevents startcode emulation)
- * ISO/IEC 11172-2 section 2.4.2.7 and 2.4.3.6 */
- RemoveBits( &p_vpar->bit_stream, 1 );
+ p_mb->i_motion_l_y--;
+ p_mb->i_motion_c_y--;
}
+ p_mb->i_addb_l_stride = (p_mb->i_l_stride = p_vpar->picture.i_l_stride) - 8;
+ p_mb->i_addb_c_stride = (p_mb->i_c_stride = p_vpar->picture.i_c_stride) - 8;
+ p_mb->b_P_second = ( b_second_field && i_coding_type == P_CODING_TYPE );
}
/*****************************************************************************
- * vpar_DecodeMPEG1Intra : decode MPEG-1 intra blocks
+ * UpdateContext : Update the p_vpar contextual values
*****************************************************************************/
-static void vpar_DecodeMPEG1Intra( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b )
+static __inline__ void UpdateContext( vpar_thread_t * p_vpar, int i_structure )
{
+ /* Update macroblock real position. */
+ p_vpar->mb.i_l_x += 16;
+ p_vpar->mb.i_l_y += (p_vpar->mb.i_l_x / p_vpar->sequence.i_width)
+ * (2 - (i_structure == FRAME_STRUCTURE)) * 16;
+ p_vpar->mb.i_l_x %= p_vpar->sequence.i_width;
- if( p_vpar->picture.i_coding_type == D_CODING_TYPE )
- {
- /* Remove end_of_macroblock (always 1, prevents startcode emulation)
- * ISO/IEC 11172-2 section 2.4.2.7 and 2.4.3.6 */
- RemoveBits( &p_vpar->bit_stream, 1 );
- }
+ p_vpar->mb.i_c_x += p_vpar->sequence.i_chroma_mb_width;
+ p_vpar->mb.i_c_y += (p_vpar->mb.i_c_x / p_vpar->sequence.i_chroma_width)
+ * (2 - (i_structure == FRAME_STRUCTURE))
+ * p_vpar->sequence.i_chroma_mb_height;
+ p_vpar->mb.i_c_x %= p_vpar->sequence.i_chroma_width;
}
/*****************************************************************************
- * vpar_DecodeMPEG2Non : decode MPEG-2 non-intra blocks
+ * SkippedMacroblock : Generate a skipped macroblock with NULL motion vector
*****************************************************************************/
-static void vpar_DecodeMPEG2Non( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b )
+static __inline__ void SkippedMacroblock( vpar_thread_t * p_vpar, int i_mb,
+ int i_mb_base, int i_coding_type,
+ int i_chroma_format,
+ int i_structure,
+ boolean_t b_second_field )
{
-#if 0
- int i_dummy;
- int i_code;
- int i_nc;
- int i_coef;
- int i_run;
- int i_level;
- boolean_t b_intra;
- boolean_t b_sign;
-
- /* There is no special decodding for DC coefficient in non intra blocs
- * except that we won't use exactly the same table B.14 note 3 & 4 */
- /* Decoding of the coefficients */
-
- i_nc = 0;
- i_coef = 0;
+ macroblock_t * p_mb;
- b_intra = p_vpar->picture.b_intra_vlc_format;
- for( i_dummy = 0; i_dummy < 64; i_dummy++ )
+ static f_motion_t pf_motion_skipped[4][4] =
{
- i_code = ShowBits( &p_vpar->bit_stream, 16 );
- i_run = (*p_vpar->pppl_dct_coef[b_intra][i_code]).i_run;
- RemoveBits( &p_vpar->bit_stream,
- (*p_vpar->pppl_dct_coef[b_intra][i_code]).i_length );
- switch( i_run )
- {
- case DCT_ESCAPE:
- i_run = GetBits( &p_vpar->bit_stream, 6 );
- i_level = GetBits( &p_vpar->bit_stream, 12 );
- p_mb->ppi_blocks[i_b][i_dummy] = ( b_sign = ( i_level > 2047 ) )
- ? ( -4096 + i_level )
- : i_level;
- i_coef = i_dummy;
- i_dummy += i_run;
- i_nc ++;
- break;
- case DCT_EOB:
- i_dummy = 64;
- break;
- default:
- i_level = (*p_vpar->pppl_dct_coef[b_intra][i_code]).i_level;
- b_sign = GetBits( &p_vpar->bit_stream, 1 );
- p_mb->ppi_blocks[i_b][i_dummy] = b_sign ? -i_level : i_level;
- i_coef = i_dummy;
- i_dummy += i_run;
- i_nc ++;
- }
- }
- if( i_nc == 1 )
+ {NULL, NULL, NULL, NULL},
+ {NULL, vdec_MotionFieldField420, vdec_MotionFieldField420,
+ vdec_MotionFrameFrame420},
+ {NULL, vdec_MotionFieldField422, vdec_MotionFieldField422,
+ vdec_MotionFrameFrame422},
+ {NULL, vdec_MotionFieldField444, vdec_MotionFieldField444,
+ vdec_MotionFrameFrame444},
+ };
+
+ if( i_coding_type == I_CODING_TYPE )
{
- p_mb->pf_idct[i_b] = vdec_SparseIDCT;
- p_mb->pi_sparse_pos[i_b] = i_coef;
+ intf_DbgMsg("vpar error: skipped macroblock in I-picture\n");
+ p_vpar->picture.b_error = 1;
+ return;
}
- else
+
+ if( (p_mb = vpar_NewMacroblock( &p_vpar->vfifo )) == NULL )
{
- p_mb->pf_idct[i_b] = vdec_IDCT;
+ /* b_die == 1 */
+ return;
}
+#ifdef VDEC_SMP
+ p_vpar->picture.pp_mb[i_mb_base + i_mb] = p_mb;
+#endif
+
+ InitMacroblock( p_vpar, p_mb, i_coding_type, i_chroma_format,
+ i_structure, b_second_field );
+
+ /* Motion type is picture structure. */
+ p_mb->pf_motion = pf_motion_skipped[i_chroma_format]
+ [i_structure];
+ p_mb->i_mb_type = MB_MOTION_FORWARD;
+ p_mb->i_coded_block_pattern = 0;
+ memset( p_mb->pppi_motion_vectors, 0, 8*sizeof(int) );
+
+ /* Set the field we use for motion compensation */
+ p_mb->ppi_field_select[0][0] = p_mb->ppi_field_select[0][1]
+ = ( i_structure == BOTTOM_FIELD );
+
+ UpdateContext( p_vpar, i_structure );
+
+#ifndef VDEC_SMP
+ /* Decode the macroblock NOW ! */
+ vdec_DecodeMacroblock( p_vpar->pp_vdec[0], p_mb );
#endif
}
/*****************************************************************************
- * vpar_DecodeMPEG2Intra : decode MPEG-2 intra blocks
+ * MacroblockModes : Get the macroblock_modes structure
*****************************************************************************/
-static void vpar_DecodeMPEG2Intra( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_b )
+static __inline__ void MacroblockModes( vpar_thread_t * p_vpar,
+ macroblock_t * p_mb,
+ int i_chroma_format,
+ int i_coding_type,
+ int i_structure )
{
- int i_dummy;
- int i_nc;
- int i_cc;
- int i_coef;
- int i_type;
- int i_code;
- int i_length;
- int i_code5;
- int i_select;
- int i_offset;
- int i_pos;
- int i_dct_dc_size;
- int i_dct_dc_diff;
- int i_run;
- int i_level;
- boolean_t b_vlc_intra;
- boolean_t b_sign;
-
- /* Lookup Table for the chromatic component */
- static int pi_cc_index[12] = { 0, 0, 0, 0, 1, 2, 1, 2, 1, 2 };
-
- i_cc = pi_cc_index[i_b];
-#if 0
- /* Determine whether it is luminance or not (chrominance) */
- i_type = ( i_cc + 1 ) >> 1;
- /* Decoding of the DC intra coefficient */
- /* The nb of bits to parse depends on i_type */
- i_code = ShowBits( &p_vpar->bit_stream, 9 + i_type );
-
- /* To reduce memory occupation, there are two lookup tables
- * See InitDCT above */
- i_code5 = i_code >> (4+i_type);
-
- /* Shall we lookup in the first or in the second table ? */
- i_select = ( i_code5 == 31 );
- /* Offset value for looking in the second table */
- i_offset = 0x1f0 + ( i_type * 0x1f0 );
- i_pos = ( i_code5 * ( ! i_select ) ) + ( ( i_code - i_offset ) * i_select );
- i_dct_dc_size = p_vpar->pppl_dct_dc_size[i_type][i_select][i_pos].i_value;
-#endif
- if( i_b < 4 )
+ static int ppi_mv_count[2][4] = { {0, 1, 2, 1}, {0, 2, 1, 1} };
+ static int ppi_mv_format[2][4] = { {0, 1, 1, 1}, {0, 1, 2, 1} };
+
+ /* Get macroblock_type. */
+ switch( i_coding_type )
{
- int code, size, length, dct_diff;
+ case P_CODING_TYPE:
+ p_mb->i_mb_type = PMBType( p_vpar );
+ break;
+ case B_CODING_TYPE:
+ p_mb->i_mb_type = BMBType( p_vpar );
+ break;
+ case I_CODING_TYPE:
+ p_mb->i_mb_type = IMBType( p_vpar );
+ break;
+ case D_CODING_TYPE:
+ p_mb->i_mb_type = DMBType( p_vpar );
+ }
+
+ /* SCALABILITY : warning, we don't know if spatial_temporal_weight_code
+ * has to be dropped, take care if you use scalable streams. */
+ /* RemoveBits( &p_vpar->bit_stream, 2 ); */
- /* decode length */
- code = ShowBits(&p_vpar->bit_stream, 5);
- if (code<31)
+ if( (i_coding_type == P_CODING_TYPE || i_coding_type == B_CODING_TYPE)
+ && (p_mb->i_mb_type & (MB_MOTION_FORWARD | MB_MOTION_BACKWARD)) )
+ {
+ if( !(i_structure == FRAME_STRUCTURE
+ && p_vpar->picture.b_frame_pred_frame_dct) )
{
- size = pl_dct_dc_lum_init_table_1[code].i_value;
- length = pl_dct_dc_lum_init_table_1[code].i_length;
- RemoveBits(&p_vpar->bit_stream, length);
+ p_vpar->mb.i_motion_type = GetBits( &p_vpar->bit_stream, 2 );
}
else
{
- code = ShowBits(&p_vpar->bit_stream, 9) - 0x1f0;
- size = pl_dct_dc_lum_init_table_2[code].i_value;
- length = pl_dct_dc_lum_init_table_2[code].i_length;
- RemoveBits( &p_vpar->bit_stream, length);
- }
-
- if (size==0)
- dct_diff = 0;
- else
- {
- dct_diff = GetBits( &p_vpar->bit_stream, size);
- if ((dct_diff & (1<<(size-1)))==0)
- dct_diff-= (1<<size) - 1;
+ p_vpar->mb.i_motion_type = MOTION_FRAME;
}
- i_dct_dc_diff = dct_diff;
+ /* XXX?? */
+ p_vpar->mb.i_mv_count = ppi_mv_count[i_structure == FRAME_STRUCTURE]
+ [p_vpar->mb.i_motion_type];
+ p_vpar->mb.i_mv_format = ppi_mv_format[i_structure == FRAME_STRUCTURE]
+ [p_vpar->mb.i_motion_type];
+ p_vpar->mb.b_dmv = p_vpar->mb.i_motion_type == MOTION_DMV;
}
- else
+
+ p_vpar->mb.b_dct_type = 0;
+ if( (i_structure == FRAME_STRUCTURE) &&
+ (!p_vpar->picture.b_frame_pred_frame_dct) &&
+ (p_mb->i_mb_type & (MB_PATTERN|MB_INTRA)) )
{
- int code, size, length, dct_diff;
+ if( (p_vpar->mb.b_dct_type = GetBits( &p_vpar->bit_stream, 1 )) )
+ {
+ /* The DCT is coded on fields. Jump one line between each
+ * sample. */
+ p_mb->i_addb_l_stride <<= 1;
+ p_mb->i_addb_l_stride += 8;
+ /* With CHROMA_420, the DCT is necessarily frame-coded. */
+ if( i_chroma_format != CHROMA_420 )
+ {
+ p_mb->i_addb_c_stride <<= 1;
+ p_mb->i_addb_c_stride += 8;
+ }
+ }
+ }
+}
- /* decode length */
- code = ShowBits(&p_vpar->bit_stream, 5);
+/*****************************************************************************
+ * ParseMacroblock : Parse the next macroblock
+ *****************************************************************************/
+#define PARSEERROR \
+if( p_vpar->picture.b_error ) \
+{ \
+ /* Mark this block as skipped (better than green blocks), and \
+ * go to the next slice. */ \
+ (*pi_mb_address)--; \
+ vpar_DestroyMacroblock( &p_vpar->vfifo, p_mb ); \
+ return; \
+}
- if (code<31)
- {
- size = pl_dct_dc_chrom_init_table_1[code].i_value;
- length = pl_dct_dc_chrom_init_table_1[code].i_length;
- RemoveBits(&p_vpar->bit_stream, length);
+#define PARSEBLOCKS( MPEG1FUNC, MPEG2FUNC ) \
+{ \
+ i_mask = 1 << (3 + (1 << i_chroma_format)); \
+ \
+ /* luminance */ \
+ p_data1 = p_mb->p_picture->p_y \
+ + p_mb->i_l_x + p_vpar->mb.i_l_y*(p_vpar->sequence.i_width); \
+ \
+ for( i_b = 0 ; i_b < 4 ; i_b++, i_mask >>= 1 ) \
+ { \
+ if( p_mb->i_coded_block_pattern & i_mask ) \
+ { \
+ memset( p_mb->ppi_blocks[i_b], 0, 64*sizeof(dctelem_t) ); \
+ if( b_mpeg2 ) \
+ MPEG2FUNC( p_vpar, p_mb, i_b, i_chroma_format ); \
+ else \
+ MPEG1FUNC( p_vpar, p_mb, i_b, i_chroma_format ); \
+ \
+ /* Calculate block coordinates. */ \
+ p_mb->p_data[i_b] = p_data1 \
+ + pi_y[p_vpar->mb.b_dct_type][i_b] \
+ * p_vpar->sequence.i_width \
+ + pi_x[i_b]; \
+ \
+ PARSEERROR \
+ } \
+ } \
+ \
+ /* chrominance */ \
+ p_data1 = p_mb->p_picture->p_u \
+ + p_mb->i_c_x \
+ + p_vpar->mb.i_c_y \
+ * (p_vpar->sequence.i_chroma_width); \
+ p_data2 = p_mb->p_picture->p_v \
+ + p_mb->i_c_x \
+ + p_vpar->mb.i_c_y \
+ * (p_vpar->sequence.i_chroma_width); \
+ \
+ for( i_b = 4; i_b < 4 + (1 << i_chroma_format); \
+ i_b++, i_mask >>= 1 ) \
+ { \
+ yuv_data_t * pp_data[2] = {p_data1, p_data2}; \
+ \
+ if( p_mb->i_coded_block_pattern & i_mask ) \
+ { \
+ memset( p_mb->ppi_blocks[i_b], 0, 64*sizeof(dctelem_t) ); \
+ if( b_mpeg2 ) \
+ MPEG2FUNC( p_vpar, p_mb, i_b, i_chroma_format ); \
+ else \
+ MPEG1FUNC( p_vpar, p_mb, i_b, i_chroma_format ); \
+ \
+ /* Calculate block coordinates. */ \
+ p_mb->p_data[i_b] = pp_data[i_b & 1] \
+ + pi_y[p_vpar->mb.b_dct_type][i_b] \
+ * p_vpar->sequence.i_chroma_width \
+ + pi_x[i_b]; \
+ \
+ PARSEERROR \
+ } \
+ } \
+}
+
+static __inline__ void ParseMacroblock(
+ vpar_thread_t * p_vpar,
+ int * pi_mb_address, /* previous address to be
+ * used for mb_addr_incr */
+ int i_mb_previous, /* actual previous mb */
+ int i_mb_base, /* non-zero if field structure */
+ /* The following parameters are explicit in
+ * optimized routines : */
+ boolean_t b_mpeg2, /* you know what ? */
+ int i_coding_type, /* I, P, B or D */
+ int i_chroma_format, /* 4:2:0, 4:2:2 or 4:4:4 */
+ int i_structure, /* T(OP), B(OTTOM) or F(RAME) */
+ boolean_t b_second_field ) /* second field of a
+ * field picture */
+{
+ static f_motion_t pppf_motion[4][2][4] =
+ {
+ { {NULL, NULL, NULL, NULL},
+ {NULL, NULL, NULL, NULL}
+ },
+ { {NULL, vdec_MotionFieldField420, vdec_MotionField16x8420,
+ vdec_MotionFieldDMV420},
+ {NULL, vdec_MotionFrameField420, vdec_MotionFrameFrame420,
+ vdec_MotionFrameDMV420}
+ },
+ { {NULL, vdec_MotionFieldField422, vdec_MotionField16x8422,
+ vdec_MotionFieldDMV422},
+ {NULL, vdec_MotionFrameField422, vdec_MotionFrameFrame422,
+ vdec_MotionFrameDMV422}
+ },
+ { {NULL, vdec_MotionFieldField444, vdec_MotionField16x8444,
+ vdec_MotionFieldDMV444},
+ {NULL, vdec_MotionFrameField444, vdec_MotionFrameFrame444,
+ vdec_MotionFrameDMV444}
}
- else
+ };
+ static int pi_x[12] = {0,8,0,8,0,0,0,0,8,8,8,8};
+ static int pi_y[2][12] = { {0,0,8,8,0,0,8,8,0,0,8,8},
+ {0,0,1,1,0,0,1,1,0,0,1,1} };
+ int i_mb, i_b, i_mask;
+ int i_inc;
+ macroblock_t * p_mb;
+ yuv_data_t * p_data1;
+ yuv_data_t * p_data2;
+
+i_count++;
+
+ i_inc = MacroblockAddressIncrement( p_vpar );
+ *pi_mb_address += i_inc;
+
+ if( i_inc < 0 )
+ {
+ intf_ErrMsg( "vpar error: bad address increment (%d)\n", i_inc );
+ p_vpar->picture.b_error = 1;
+ return;
+ }
+
+ if( *pi_mb_address - i_mb_previous - 1 )
+ {
+ /* Skipped macroblock (ISO/IEC 13818-2 7.6.6). */
+
+ /* Reset DC predictors (7.2.1). */
+ p_vpar->mb.pi_dc_dct_pred[0] = p_vpar->mb.pi_dc_dct_pred[1]
+ = p_vpar->mb.pi_dc_dct_pred[2]
+ = 1 << (7 + p_vpar->picture.i_intra_dc_precision);
+
+ if( i_coding_type == P_CODING_TYPE )
{
- code = ShowBits(&p_vpar->bit_stream, 10) - 0x3e0;
- size = pl_dct_dc_chrom_init_table_2[code].i_value;
- length = pl_dct_dc_chrom_init_table_2[code].i_length;
- RemoveBits( &p_vpar->bit_stream, length);
+ /* Reset motion vector predictors (ISO/IEC 13818-2 7.6.3.4). */
+ memset( p_vpar->mb.pppi_pmv, 0, 8*sizeof(int) );
}
- if (size==0)
- dct_diff = 0;
- else
+ for( i_mb = i_mb_previous + 1; i_mb < *pi_mb_address; i_mb++ )
{
- dct_diff = GetBits( &p_vpar->bit_stream, size);
- if ((dct_diff & (1<<(size-1)))==0)
- dct_diff-= (1<<size) - 1;
+ SkippedMacroblock( p_vpar, i_mb, i_mb_base, i_coding_type,
+ i_chroma_format, i_structure, b_second_field );
}
+ }
- i_dct_dc_diff = dct_diff;
+ /* Get a macroblock structure. */
+ if( (p_mb = vpar_NewMacroblock( &p_vpar->vfifo )) == NULL )
+ {
+ /* b_die == 1 */
+ return;
}
+#ifdef VDEC_SMP
+ p_vpar->picture.pp_mb[i_mb_base + *pi_mb_address] = p_mb;
+#endif
- /* Dump the variable length code */
- //RemoveBits( &p_vpar->bit_stream,
- // p_vpar->pppl_dct_dc_size[i_type][i_select][i_pos].i_length );
-
- /* Read the actual code with the good length */
- p_vpar->slice.pi_dc_dct_pred[i_cc] += i_dct_dc_diff;
+ InitMacroblock( p_vpar, p_mb, i_coding_type, i_chroma_format,
+ i_structure, b_second_field );
- p_mb->ppi_blocks[i_b][0] = ( p_vpar->slice.pi_dc_dct_pred[i_cc] <<
- ( 3 - p_vpar->picture.i_intra_dc_precision ) );
- i_nc = ( p_vpar->slice.pi_dc_dct_pred[i_cc] != 0 );
+ /* Parse off macroblock_modes structure. */
+ MacroblockModes( p_vpar, p_mb, i_chroma_format, i_coding_type,
+ i_structure );
-//fprintf( stderr, "coucou\n" );
- /* Decoding of the AC coefficients */
-
- i_coef = 0;
- b_vlc_intra = p_vpar->picture.b_intra_vlc_format;
- for( i_dummy = 1; /*i_dummy < 64*/; i_dummy++ )
+ if( p_mb->i_mb_type & MB_QUANT )
{
- i_code = ShowBits( &p_vpar->bit_stream, 16 );
- if( i_code >= 16384 )
+ LoadQuantizerScale( p_vpar );
+ }
+
+ if( (i_coding_type == P_CODING_TYPE || i_coding_type == B_CODING_TYPE)
+ && (p_mb->i_mb_type & MB_MOTION_FORWARD) )
+ {
+ if( b_mpeg2 )
+ DecodeMVMPEG2( p_vpar, p_mb, 0, i_structure );
+ else
+ DecodeMVMPEG1( p_vpar, p_mb, 0, i_structure );
+ PARSEERROR
+ }
+
+ if( (i_coding_type == B_CODING_TYPE)
+ && (p_mb->i_mb_type & MB_MOTION_BACKWARD) )
+ {
+ if( b_mpeg2 )
+ DecodeMVMPEG2( p_vpar, p_mb, 1, i_structure );
+ else
+ DecodeMVMPEG1( p_vpar, p_mb, 1, i_structure );
+ PARSEERROR
+ }
+
+ if( i_coding_type == P_CODING_TYPE
+ && !(p_mb->i_mb_type & (MB_MOTION_FORWARD|MB_INTRA)) )
+ {
+ /* Special No-MC macroblock in P pictures (7.6.3.5). */
+ p_mb->i_mb_type |= MB_MOTION_FORWARD;
+ memset( p_vpar->mb.pppi_pmv, 0, 8*sizeof(int) );
+ memset( p_mb->pppi_motion_vectors, 0, 8*sizeof(int) );
+ p_vpar->mb.i_motion_type = 1 + (i_structure == FRAME_STRUCTURE);
+ p_mb->ppi_field_select[0][0] = (i_structure == BOTTOM_FIELD);
+ }
+
+ if( (i_coding_type != I_CODING_TYPE) && !(p_mb->i_mb_type & MB_INTRA) )
+ {
+ /* Reset DC predictors (7.2.1). */
+ p_vpar->mb.pi_dc_dct_pred[0] = p_vpar->mb.pi_dc_dct_pred[1]
+ = p_vpar->mb.pi_dc_dct_pred[2]
+ = 1 << (7 + p_vpar->picture.i_intra_dc_precision);
+
+ /* Motion function pointer. */
+ p_mb->pf_motion = pppf_motion[i_chroma_format]
+ [i_structure == FRAME_STRUCTURE]
+ [p_vpar->mb.i_motion_type];
+
+ if( p_mb->i_mb_type & MB_PATTERN )
{
- if( b_vlc_intra )
+ switch( i_chroma_format )
{
- i_run = pl_DCT_tab0a[(i_code>>8)-4].i_run;
- i_level = pl_DCT_tab0a[(i_code>>8)-4].i_level;
- i_length = pl_DCT_tab0a[(i_code>>8)-4].i_length;
-//fprintf( stderr, "**********> %d, %d, %d *******\n", i_run, i_level, (i_code>>8)-4 );
+ case CHROMA_420:
+ p_mb->i_coded_block_pattern = CodedPattern420( p_vpar );
+ break;
+ case CHROMA_422:
+ p_mb->i_coded_block_pattern = CodedPattern422( p_vpar );
+ break;
+ case CHROMA_444:
+ p_mb->i_coded_block_pattern = CodedPattern444( p_vpar );
}
+ }
+ else
+ {
+ p_mb->i_coded_block_pattern = 0;
+ }
+
+ /*
+ * Effectively decode blocks.
+ */
+ PARSEBLOCKS( DecodeMPEG1NonIntra, DecodeMPEG2NonIntra )
+ }
+ else
+ {
+ if( !p_vpar->picture.b_concealment_mv )
+ {
+ /* Reset MV predictors. */
+ memset( p_vpar->mb.pppi_pmv, 0, 8*sizeof(int) );
+ }
+ else
+ {
+ if( b_mpeg2 )
+ DecodeMVMPEG2( p_vpar, p_mb, 0, i_structure );
else
+ DecodeMVMPEG1( p_vpar, p_mb, 0, i_structure );
+ RemoveBits( &p_vpar->bit_stream, 1 );
+ }
+
+ if( p_mb->i_mb_type & MB_PATTERN )
+ {
+ switch( i_chroma_format )
{
- i_run = pl_DCT_tab_ac[(i_code>>12)-4].i_run;
- i_level = pl_DCT_tab_ac[(i_code>>12)-4].i_level;
- i_length = pl_DCT_tab_ac[(i_code>>12)-4].i_length;
- }
+ case CHROMA_420:
+ p_mb->i_coded_block_pattern = CodedPattern420( p_vpar );
+ break;
+ case CHROMA_422:
+ p_mb->i_coded_block_pattern = CodedPattern422( p_vpar );
+ break;
+ case CHROMA_444:
+ p_mb->i_coded_block_pattern = CodedPattern444( p_vpar );
+ }
}
else
{
- i_run = ppl_dct_coef[b_vlc_intra][i_code].i_run;
- i_length = ppl_dct_coef[b_vlc_intra][i_code].i_length;
- i_level = ppl_dct_coef[b_vlc_intra][i_code].i_level;
+ p_mb->i_coded_block_pattern =
+ (1 << (4 + (1 << i_chroma_format))) - 1;
}
- {
- int code = i_code;
- int intra_vlc_format = b_vlc_intra;
- dct_lookup_t tab;
-
- if (code>=16384 && !intra_vlc_format)
- tab = pl_DCT_tab_ac[(code>>12)-4];
- else if (code>=1024)
- {
- if (intra_vlc_format)
- tab = pl_DCT_tab0a[(code>>8)-4];
- else
- tab = pl_DCT_tab0[(code>>8)-4];
+ /*
+ * Effectively decode blocks.
+ */
+ PARSEBLOCKS( DecodeMPEG1Intra, DecodeMPEG2Intra )
}
- else if (code>=512)
+
+ if( !p_vpar->picture.b_error )
{
- if (intra_vlc_format)
- tab = pl_DCT_tab1a[(code>>6)-8];
- else
- tab = pl_DCT_tab1[(code>>6)-8];
+ UpdateContext( p_vpar, i_structure );
+#ifndef VDEC_SMP
+ /* Decode the macroblock NOW ! */
+ vdec_DecodeMacroblock( p_vpar->pp_vdec[0], p_mb );
+#endif
}
- else if (code>=256)
- tab = pl_DCT_tab2[(code>>4)-16];
- else if (code>=128)
- tab = pl_DCT_tab3[(code>>3)-16];
- else if (code>=64)
- tab = pl_DCT_tab4[(code>>2)-16];
- else if (code>=32)
- tab = pl_DCT_tab5[(code>>1)-16];
- else if (code>=16)
- tab = pl_DCT_tab6[code-16];
else
{
- fprintf( stderr, "invalid Huffman code in Decode_MPEG2_Intra_Block()\n");
+ /* Mark this block as skipped (better than green blocks), and go
+ * to the next slice. */
+ (*pi_mb_address)--;
+ vpar_DestroyMacroblock( &p_vpar->vfifo, p_mb );
}
+}
+
+/*
+ * Picture data parsing management
+ */
+
+/*****************************************************************************
+ * ParseMacroblockVWXYZ : Parse the next macroblock ; specific functions
+ *****************************************************************************
+ * V = MPEG2 ?
+ * W = coding type ?
+ * X = chroma format ?
+ * Y = structure ?
+ * Z = second field ?
+ *****************************************************************************/
+void ParseMacroblockGENERIC( vpar_thread_t * p_vpar, int * pi_mb_address,
+ int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+/* ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ b_mpeg2, i_coding_type, i_chroma_format,
+ i_structure, b_second_field );*/
+}
+
+#if (VPAR_OPTIM_LEVEL > 0)
+/* Optimizations for frame pictures */
+void ParseMacroblock2I420F0( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, I_CODING_TYPE, CHROMA_420,
+ FRAME_STRUCTURE, 0 );
+}
+
+void ParseMacroblock2P420F0( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, P_CODING_TYPE, CHROMA_420,
+ FRAME_STRUCTURE, 0 );
+}
+
+void ParseMacroblock2B420F0( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, B_CODING_TYPE, CHROMA_420,
+ FRAME_STRUCTURE, 0 );
+}
+#endif
+
+#if (VPAR_OPTIM_LEVEL > 1)
+/* Optimizations for field pictures */
+void ParseMacroblock2I420TZ( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, I_CODING_TYPE, CHROMA_420,
+ TOP_FIELD, (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2P420TZ( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, P_CODING_TYPE, CHROMA_420,
+ TOP_FIELD, (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2B420TZ( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, B_CODING_TYPE, CHROMA_420,
+ TOP_FIELD, (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2I420BZ( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, I_CODING_TYPE, CHROMA_420,
+ BOTTOM_FIELD, (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2P420BZ( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, P_CODING_TYPE, CHROMA_420,
+ BOTTOM_FIELD, (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2B420BZ( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+ 1, B_CODING_TYPE, CHROMA_420,
+ BOTTOM_FIELD, (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+}
+#endif
- if( (i_run != tab.i_run) || (i_length != tab.i_length) || (i_level != tab.i_level) )
+/*****************************************************************************
+ * SliceHeader : Parse the next slice structure
+ *****************************************************************************/
+typedef void (*f_parse_mb_t)( vpar_thread_t * p_vpar, int * pi_mb_address, int i_mb_previous, int i_mb_base,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field );
+
+static __inline__ void SliceHeader( vpar_thread_t * p_vpar,
+ int * pi_mb_address, int i_mb_base,
+ u32 i_vert_code, boolean_t b_high,
+ boolean_t b_dp_scalable,
+ boolean_t b_mpeg2, int i_coding_type,
+ int i_chroma_format, int i_structure,
+ boolean_t b_second_field )
+{
+ static f_parse_mb_t ppf_parse_mb[4][4] =
{
- fprintf( stderr, "ET M....... !!!\n" );
- exit(0);
- }
+ {
+ NULL, NULL, NULL, NULL
+ },
+ {
+ /* TOP_FIELD */
+#if (VPAR_OPTIM_LEVEL > 1)
+ NULL, ParseMacroblock2I420TZ, ParseMacroblock2P420TZ,
+ ParseMacroblock2B420TZ
+#else
+ NULL, ParseMacroblockGENERIC, ParseMacroblockGENERIC,
+ ParseMacroblockGENERIC
+#endif
+ },
+ {
+ /* BOTTOM_FIELD */
+#if (VPAR_OPTIM_LEVEL > 1)
+ NULL, ParseMacroblock2I420BZ, ParseMacroblock2P420BZ,
+ ParseMacroblock2B420BZ
+#else
+ NULL, ParseMacroblockGENERIC, ParseMacroblockGENERIC,
+ ParseMacroblockGENERIC
+#endif
+ },
+ {
+ /* FRAME_PICTURE */
+#if (VPAR_OPTIM_LEVEL > 0)
+ NULL, ParseMacroblock2I420F0, ParseMacroblock2P420F0,
+ ParseMacroblock2B420F0
+#else
+ NULL, ParseMacroblockGENERIC, ParseMacroblockGENERIC,
+ ParseMacroblockGENERIC
+#endif
}
+ };
+ int i_mb_address_save = *pi_mb_address;
+ p_vpar->picture.b_error = 0;
+ if( b_high )
+ {
+ /* Picture with more than 2800 lines. */
+ i_vert_code += GetBits( &p_vpar->bit_stream, 3 ) << 7;
+ }
+ if( b_dp_scalable )
+ {
+ /* DATA_PARTITIONING scalability. */
+ RemoveBits( &p_vpar->bit_stream, 7 ); /* priority_breakpoint */
+ }
-
- RemoveBits( &p_vpar->bit_stream, i_length );
+ LoadQuantizerScale( p_vpar );
- switch( i_run )
+ if( GetBits( &p_vpar->bit_stream, 1 ) )
+ {
+ /* intra_slice, slice_id */
+ RemoveBits( &p_vpar->bit_stream, 8 );
+ /* extra_information_slice */
+ while( GetBits( &p_vpar->bit_stream, 1 ) )
{
- case DCT_ESCAPE:
- i_run = GetBits( &p_vpar->bit_stream, 6 );
- i_level = GetBits( &p_vpar->bit_stream, 12 );
- p_mb->ppi_blocks[i_b][i_dummy] = ( b_sign = ( i_level > 2047 ) )
- ? ( -4096 + i_level )
- : i_level;
- i_coef = i_dummy;
- i_dummy += i_run;
- i_nc ++;
- break;
- case DCT_EOB:
- if( i_nc <= 1 )
- {
- p_mb->pf_idct[i_b] = vdec_SparseIDCT;
- p_mb->pi_sparse_pos[i_b] = i_coef;
- }
- else
- {
- p_mb->pf_idct[i_b] = vdec_IDCT;
- }
- return;
+ RemoveBits( &p_vpar->bit_stream, 8 );
+ }
+ }
+ *pi_mb_address = (i_vert_code - 1)*p_vpar->sequence.i_mb_width;
- break;
- default:
- b_sign = GetBits( &p_vpar->bit_stream, 1 );
- p_mb->ppi_blocks[i_b][i_dummy] = b_sign ? -i_level : i_level;
- i_coef = i_dummy;
- i_dummy += i_run;
- i_nc ++;
+ if( *pi_mb_address < i_mb_address_save )
+ {
+ intf_ErrMsg( "vpar error: slices do not follow, maybe a PES has been trashed\n" );
+ p_vpar->picture.b_error = 1;
+ return;
+ }
+
+ /* Reset DC coefficients predictors (ISO/IEC 13818-2 7.2.1). */
+ p_vpar->mb.pi_dc_dct_pred[0] = p_vpar->mb.pi_dc_dct_pred[1]
+ = p_vpar->mb.pi_dc_dct_pred[2]
+ = 1 << (7 + p_vpar->picture.i_intra_dc_precision);
+
+ /* Reset motion vector predictors (ISO/IEC 13818-2 7.6.3.4). */
+ memset( p_vpar->mb.pppi_pmv, 0, 8*sizeof(int) );
+
+ do
+ {
+ if( i_mb_address_save >= p_vpar->sequence.i_mb_size )
+ {
+ p_vpar->picture.b_error = 1;
+ return;
+ }
+
+ if( p_vpar->sequence.i_chroma_format != CHROMA_420
+ || !p_vpar->sequence.b_mpeg2 || p_vpar->sequence.i_height > 2800
+ || p_vpar->sequence.i_scalable_mode == SC_DP )
+ {
+ /* Weird stream. Use the slower generic function. */
+ ParseMacroblockGENERIC( p_vpar, pi_mb_address, i_mb_address_save,
+ i_mb_base, b_mpeg2, i_coding_type,
+ i_chroma_format, i_structure,
+ b_second_field );
+ }
+ else
+ {
+ /* Try to find an optimized function. */
+ if( ppf_parse_mb[p_vpar->picture.i_structure]
+ [p_vpar->picture.i_coding_type] == NULL )
+ {
+ intf_ErrMsg( "vpar error: bad ppf_parse_mb function pointer (struct:%d, coding type:%d)\n",
+ p_vpar->picture.i_structure, p_vpar->picture.i_coding_type );
+ }
+ else
+ {
+ ppf_parse_mb[p_vpar->picture.i_structure]
+ [p_vpar->picture.i_coding_type]
+ ( p_vpar, pi_mb_address, i_mb_address_save,
+ i_mb_base, b_mpeg2, i_coding_type,
+ i_chroma_format, i_structure,
+ b_second_field );
+ }
}
-// fprintf( stderr, "i_code : %d (%d), run : %d, %d, %d (%4x) ", i_code , b_vlc_intra,
-// i_run, i_level, i_dummy, ShowBits( &p_vpar->bit_stream, 16 ) );
-//fprintf( stderr, "- %4x\n",ShowBits( &p_vpar->bit_stream, 16 ) );
+ i_mb_address_save = *pi_mb_address;
+ if( p_vpar->picture.b_error )
+ {
+ return;
+ }
}
-
- if( i_nc <= 1 )
+ while( ShowBits( &p_vpar->bit_stream, 23 ) && !p_vpar->b_die );
+ NextStartCode( p_vpar );
+}
+
+/*****************************************************************************
+ * PictureData : Parse off all macroblocks (ISO/IEC 13818-2 6.2.3.7)
+ *****************************************************************************/
+void vpar_PictureData( vpar_thread_t * p_vpar, int i_mb_base )
+{
+ int i_mb_address = 0;
+ u32 i_dummy;
+
+ NextStartCode( p_vpar );
+ while( ((p_vpar->picture.i_coding_type != I_CODING_TYPE
+ && p_vpar->picture.i_coding_type != D_CODING_TYPE)
+ || !p_vpar->picture.b_error)
+ && i_mb_address+i_mb_base < p_vpar->sequence.i_mb_size
+ && !p_vpar->b_die )
{
- p_mb->pf_idct[i_b] = vdec_SparseIDCT;
- p_mb->pi_sparse_pos[i_b] = i_coef;
+ if( ((i_dummy = ShowBits( &p_vpar->bit_stream, 32 ))
+ < SLICE_START_CODE_MIN) ||
+ (i_dummy > SLICE_START_CODE_MAX) )
+ {
+ intf_DbgMsg("vpar debug: premature end of picture\n");
+ p_vpar->picture.b_error = 1;
+ break;
+ }
+ RemoveBits32( &p_vpar->bit_stream );
+
+ /* Decode slice data. */
+ SliceHeader( p_vpar, &i_mb_address, i_mb_base, i_dummy & 255,
+ (p_vpar->sequence.i_height > 2800),
+ (p_vpar->sequence.i_scalable_mode == SC_DP),
+ p_vpar->sequence.b_mpeg2, p_vpar->picture.i_coding_type,
+ p_vpar->sequence.i_chroma_format,
+ p_vpar->picture.i_structure,
+ (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
}
- else
+
+ /* Try to recover from error. If we missed less than half the
+ * number of macroblocks of the picture, mark the missed ones
+ * as skipped. */
+ if( (p_vpar->picture.i_coding_type == P_CODING_TYPE
+ || p_vpar->picture.i_coding_type == B_CODING_TYPE)
+ && p_vpar->picture.b_error &&
+ ( (i_mb_address-i_mb_base) > (p_vpar->sequence.i_mb_size >> 1)
+ || (p_vpar->picture.i_structure != FRAME_STRUCTURE
+ && (i_mb_address-i_mb_base) > (p_vpar->sequence.i_mb_size >> 2) ) ) )
{
- p_mb->pf_idct[i_b] = vdec_IDCT;
+ int i_mb;
+
+ p_vpar->picture.b_error = 0;
+ for( i_mb = i_mb_address + 1;
+ i_mb < (p_vpar->sequence.i_mb_size
+ << (p_vpar->picture.i_structure != FRAME_STRUCTURE));
+ i_mb++ )
+ {
+ SkippedMacroblock( p_vpar, i_mb, i_mb_base,
+ p_vpar->picture.i_coding_type,
+ p_vpar->sequence.i_chroma_format,
+ p_vpar->picture.i_structure,
+ (p_vpar->picture.i_structure !=
+ p_vpar->picture.i_current_structure) );
+ }
}
-fprintf( stderr, "MPEG2 end (%d)\n", i_b );
-exit(0);
}
+
projects / vlc / blobdiff