It doesn't depend on hevcdec anymore.
Signed-off-by: James Almer <[email protected]>
---
The two patches could be squashed into one, but i figured this way would be
easier to read/review.
libavcodec/hevc_sei.c | 37 +++-------------------
libavcodec/hevc_sei.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/hevcdec.h | 29 +----------------
3 files changed, 94 insertions(+), 60 deletions(-)
create mode 100644 libavcodec/hevc_sei.h
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index bb4980085..0e7f0ccb0 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -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,
void *logctx)
@@ -123,10 +96,10 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void
*logctx, HEVCSEIContext
switch (type) {
case 256: // Mismatched value from HM 8.1
return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb,
logctx);
- case SEI_TYPE_FRAME_PACKING:
+ case HEVC_SEI_TYPE_FRAME_PACKING:
return decode_nal_sei_frame_packing_arrangement(&s->frame_packing,
gb, logctx);
- case SEI_TYPE_DISPLAY_ORIENTATION:
+ case HEVC_SEI_TYPE_DISPLAY_ORIENTATION:
return decode_nal_sei_display_orientation(&s->display_orientation,
gb, logctx);
default:
@@ -140,7 +113,7 @@ static int decode_nal_sei_suffix(GetBitContext *gb, void
*logctx, HEVCSEIContext
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,
logctx);
default:
av_log(logctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", type);
diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h
new file mode 100644
index 000000000..c2bc4f9f0
--- /dev/null
+++ b/libavcodec/hevc_sei.h
@@ -0,0 +1,88 @@
+/*
+ * 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 HEVCSEIContext {
+ HEVCSEIPictureHash picture_hash;
+ HEVCSEIFramePacking frame_packing;
+ HEVCSEIDisplayOrientation display_orientation;
+} HEVCSEIContext;
+
+int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s,
+ int type);
+
+#endif /* AVCODEC_HEVC_SEI_H */
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h
index 9526a8838..ca2d64ca0 100644
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevcdec.h
@@ -36,6 +36,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 +445,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 HEVCSEIContext {
- HEVCSEIPictureHash picture_hash;
- HEVCSEIFramePacking frame_packing;
- HEVCSEIDisplayOrientation display_orientation;
-} HEVCSEIContext;
-
typedef struct HEVCContext {
const AVClass *c; // needed by private avoptions
AVCodecContext *avctx;
@@ -558,9 +534,6 @@ typedef struct HEVCContext {
HEVCSEIContext sei;
} HEVCContext;
-int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s,
- int type);
-
/**
* Mark all frames in DPB as unused for reference.
*/
--
2.12.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
