1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

hevcdec: split ff_hevc_diag_scan* declarations into a separate header

This will be useful in the following commits.
This commit is contained in:
Anton Khirnov 2016-10-12 10:21:35 +02:00
parent 645c6ff423
commit 150c896a9e
7 changed files with 36 additions and 6 deletions

View File

@ -22,6 +22,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "hevc_data.h"
#include "hevcdec.h" #include "hevcdec.h"
// The headers above may include w32threads.h, which uses the original // The headers above may include w32threads.h, which uses the original

View File

@ -20,7 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "hevcdec.h" #include "hevc_data.h"
const uint8_t ff_hevc_diag_scan4x4_x[16] = { const uint8_t ff_hevc_diag_scan4x4_x[16] = {
0, 0, 1, 0, 0, 0, 1, 0,

31
libavcodec/hevc_data.h Normal file
View File

@ -0,0 +1,31 @@
/*
* HEVC shared data tables
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_HEVC_DATA_H
#define AVCODEC_HEVC_DATA_H
#include <stdint.h>
extern const uint8_t ff_hevc_diag_scan4x4_x[16];
extern const uint8_t ff_hevc_diag_scan4x4_y[16];
extern const uint8_t ff_hevc_diag_scan8x8_x[64];
extern const uint8_t ff_hevc_diag_scan8x8_y[64];
#endif /* AVCODEC_HEVC_DATA_H */

View File

@ -27,6 +27,7 @@
#include "golomb.h" #include "golomb.h"
#include "hevcdec.h" #include "hevcdec.h"
#include "hevc_data.h"
static const uint8_t default_scaling_list_intra[] = { static const uint8_t default_scaling_list_intra[] = {
16, 16, 16, 16, 17, 18, 21, 24, 16, 16, 16, 16, 17, 18, 21, 24,

View File

@ -37,6 +37,7 @@
#include "cabac_functions.h" #include "cabac_functions.h"
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevc.h"
#include "hevc_data.h"
#include "hevcdec.h" #include "hevcdec.h"
#include "profiles.h" #include "profiles.h"

View File

@ -966,9 +966,4 @@ extern const uint8_t ff_hevc_qpel_extra_before[4];
extern const uint8_t ff_hevc_qpel_extra_after[4]; extern const uint8_t ff_hevc_qpel_extra_after[4];
extern const uint8_t ff_hevc_qpel_extra[4]; extern const uint8_t ff_hevc_qpel_extra[4];
extern const uint8_t ff_hevc_diag_scan4x4_x[16];
extern const uint8_t ff_hevc_diag_scan4x4_y[16];
extern const uint8_t ff_hevc_diag_scan8x8_x[64];
extern const uint8_t ff_hevc_diag_scan8x8_y[64];
#endif /* AVCODEC_HEVCDEC_H */ #endif /* AVCODEC_HEVCDEC_H */

View File

@ -24,6 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "hevc_data.h"
#include "hevcdec.h" #include "hevcdec.h"
#include "vdpau.h" #include "vdpau.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"