mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
hevcdec: move SEI message parsing into a separate header
It doesn't depend on hevcdec anymore. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
James Almer
Luca Barbato
parent
648a0b4503
commit
cfd25488bf
@ -23,35 +23,8 @@
|
||||
*/
|
||||
|
||||
#include "golomb_legacy.h"
|
||||
#include "hevcdec.h"
|
||||
|
||||
enum HEVC_SEI_TYPE {
|
||||
SEI_TYPE_BUFFERING_PERIOD = 0,
|
||||
SEI_TYPE_PICTURE_TIMING = 1,
|
||||
SEI_TYPE_PAN_SCAN_RECT = 2,
|
||||
SEI_TYPE_FILLER_PAYLOAD = 3,
|
||||
SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35 = 4,
|
||||
SEI_TYPE_USER_DATA_UNREGISTERED = 5,
|
||||
SEI_TYPE_RECOVERY_POINT = 6,
|
||||
SEI_TYPE_SCENE_INFO = 9,
|
||||
SEI_TYPE_FULL_FRAME_SNAPSHOT = 15,
|
||||
SEI_TYPE_PROGRESSIVE_REFINEMENT_SEGMENT_START = 16,
|
||||
SEI_TYPE_PROGRESSIVE_REFINEMENT_SEGMENT_END = 17,
|
||||
SEI_TYPE_FILM_GRAIN_CHARACTERISTICS = 19,
|
||||
SEI_TYPE_POST_FILTER_HINT = 22,
|
||||
SEI_TYPE_TONE_MAPPING_INFO = 23,
|
||||
SEI_TYPE_FRAME_PACKING = 45,
|
||||
SEI_TYPE_DISPLAY_ORIENTATION = 47,
|
||||
SEI_TYPE_SOP_DESCRIPTION = 128,
|
||||
SEI_TYPE_ACTIVE_PARAMETER_SETS = 129,
|
||||
SEI_TYPE_DECODING_UNIT_INFO = 130,
|
||||
SEI_TYPE_TEMPORAL_LEVEL0_INDEX = 131,
|
||||
SEI_TYPE_DECODED_PICTURE_HASH = 132,
|
||||
SEI_TYPE_SCALABLE_NESTING = 133,
|
||||
SEI_TYPE_REGION_REFRESH_INFO = 134,
|
||||
SEI_TYPE_MASTERING_DISPLAY_INFO = 137,
|
||||
SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO = 144,
|
||||
};
|
||||
#include "hevc.h"
|
||||
#include "hevc_sei.h"
|
||||
|
||||
static int decode_nal_sei_decoded_picture_hash(HEVCSEIPictureHash *s, GetBitContext *gb)
|
||||
{
|
||||
@ -119,9 +92,9 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s,
|
||||
switch (type) {
|
||||
case 256: // Mismatched value from HM 8.1
|
||||
return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb);
|
||||
case SEI_TYPE_FRAME_PACKING:
|
||||
case HEVC_SEI_TYPE_FRAME_PACKING:
|
||||
return decode_nal_sei_frame_packing_arrangement(&s->frame_packing, gb);
|
||||
case SEI_TYPE_DISPLAY_ORIENTATION:
|
||||
case HEVC_SEI_TYPE_DISPLAY_ORIENTATION:
|
||||
return decode_nal_sei_display_orientation(&s->display_orientation, gb);
|
||||
default:
|
||||
av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type);
|
||||
@ -134,7 +107,7 @@ static int decode_nal_sei_suffix(GetBitContext *gb, void *logctx, HEVCSEI *s,
|
||||
int type, int size)
|
||||
{
|
||||
switch (type) {
|
||||
case SEI_TYPE_DECODED_PICTURE_HASH:
|
||||
case HEVC_SEI_TYPE_DECODED_PICTURE_HASH:
|
||||
return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb);
|
||||
default:
|
||||
av_log(logctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", type);
|
||||
|
||||
89
libavcodec/hevc_sei.h
Normal file
89
libavcodec/hevc_sei.h
Normal file
@ -0,0 +1,89 @@
|
||||
/*
|
||||
* HEVC Supplementary Enhancement Information messages
|
||||
*
|
||||
* 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_SEI_H
|
||||
#define AVCODEC_HEVC_SEI_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "libavutil/md5.h"
|
||||
|
||||
#include "get_bits.h"
|
||||
|
||||
/**
|
||||
* SEI message types
|
||||
*/
|
||||
typedef enum {
|
||||
HEVC_SEI_TYPE_BUFFERING_PERIOD = 0,
|
||||
HEVC_SEI_TYPE_PICTURE_TIMING = 1,
|
||||
HEVC_SEI_TYPE_PAN_SCAN_RECT = 2,
|
||||
HEVC_SEI_TYPE_FILLER_PAYLOAD = 3,
|
||||
HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35 = 4,
|
||||
HEVC_SEI_TYPE_USER_DATA_UNREGISTERED = 5,
|
||||
HEVC_SEI_TYPE_RECOVERY_POINT = 6,
|
||||
HEVC_SEI_TYPE_SCENE_INFO = 9,
|
||||
HEVC_SEI_TYPE_FULL_FRAME_SNAPSHOT = 15,
|
||||
HEVC_SEI_TYPE_PROGRESSIVE_REFINEMENT_SEGMENT_START = 16,
|
||||
HEVC_SEI_TYPE_PROGRESSIVE_REFINEMENT_SEGMENT_END = 17,
|
||||
HEVC_SEI_TYPE_FILM_GRAIN_CHARACTERISTICS = 19,
|
||||
HEVC_SEI_TYPE_POST_FILTER_HINT = 22,
|
||||
HEVC_SEI_TYPE_TONE_MAPPING_INFO = 23,
|
||||
HEVC_SEI_TYPE_FRAME_PACKING = 45,
|
||||
HEVC_SEI_TYPE_DISPLAY_ORIENTATION = 47,
|
||||
HEVC_SEI_TYPE_SOP_DESCRIPTION = 128,
|
||||
HEVC_SEI_TYPE_ACTIVE_PARAMETER_SETS = 129,
|
||||
HEVC_SEI_TYPE_DECODING_UNIT_INFO = 130,
|
||||
HEVC_SEI_TYPE_TEMPORAL_LEVEL0_INDEX = 131,
|
||||
HEVC_SEI_TYPE_DECODED_PICTURE_HASH = 132,
|
||||
HEVC_SEI_TYPE_SCALABLE_NESTING = 133,
|
||||
HEVC_SEI_TYPE_REGION_REFRESH_INFO = 134,
|
||||
HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO = 137,
|
||||
HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO = 144,
|
||||
} HEVC_SEI_Type;
|
||||
|
||||
typedef struct HEVCSEIPictureHash {
|
||||
struct AVMD5 *md5_ctx;
|
||||
uint8_t md5[3][16];
|
||||
uint8_t is_md5;
|
||||
} HEVCSEIPictureHash;
|
||||
|
||||
typedef struct HEVCSEIFramePacking {
|
||||
int present;
|
||||
int arrangement_type;
|
||||
int content_interpretation_type;
|
||||
int quincunx_subsampling;
|
||||
} HEVCSEIFramePacking;
|
||||
|
||||
typedef struct HEVCSEIDisplayOrientation {
|
||||
int present;
|
||||
int anticlockwise_rotation;
|
||||
int hflip, vflip;
|
||||
} HEVCSEIDisplayOrientation;
|
||||
|
||||
typedef struct HEVCSEI {
|
||||
HEVCSEIPictureHash picture_hash;
|
||||
HEVCSEIFramePacking frame_packing;
|
||||
HEVCSEIDisplayOrientation display_orientation;
|
||||
} HEVCSEI;
|
||||
|
||||
int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s,
|
||||
int type);
|
||||
|
||||
#endif /* AVCODEC_HEVC_SEI_H */
|
||||
@ -27,7 +27,6 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "libavutil/buffer.h"
|
||||
#include "libavutil/md5.h"
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "bswapdsp.h"
|
||||
@ -36,6 +35,7 @@
|
||||
#include "h2645_parse.h"
|
||||
#include "hevc.h"
|
||||
#include "hevc_ps.h"
|
||||
#include "hevc_sei.h"
|
||||
#include "hevcdsp.h"
|
||||
#include "internal.h"
|
||||
#include "thread.h"
|
||||
@ -444,31 +444,6 @@ typedef struct HEVCLocalContext {
|
||||
int boundary_flags;
|
||||
} HEVCLocalContext;
|
||||
|
||||
typedef struct HEVCSEIPictureHash {
|
||||
struct AVMD5 *md5_ctx;
|
||||
uint8_t md5[3][16];
|
||||
uint8_t is_md5;
|
||||
} HEVCSEIPictureHash;
|
||||
|
||||
typedef struct HEVCSEIFramePacking {
|
||||
int present;
|
||||
int arrangement_type;
|
||||
int content_interpretation_type;
|
||||
int quincunx_subsampling;
|
||||
} HEVCSEIFramePacking;
|
||||
|
||||
typedef struct HEVCSEIDisplayOrientation {
|
||||
int present;
|
||||
int anticlockwise_rotation;
|
||||
int hflip, vflip;
|
||||
} HEVCSEIDisplayOrientation;
|
||||
|
||||
typedef struct HEVCSEI {
|
||||
HEVCSEIPictureHash picture_hash;
|
||||
HEVCSEIFramePacking frame_packing;
|
||||
HEVCSEIDisplayOrientation display_orientation;
|
||||
} HEVCSEI;
|
||||
|
||||
typedef struct HEVCContext {
|
||||
const AVClass *c; // needed by private avoptions
|
||||
AVCodecContext *avctx;
|
||||
@ -557,9 +532,6 @@ typedef struct HEVCContext {
|
||||
int nuh_layer_id;
|
||||
} HEVCContext;
|
||||
|
||||
int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s,
|
||||
int type);
|
||||
|
||||
/**
|
||||
* Mark all frames in DPB as unused for reference.
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user