aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc.h
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-26 13:38:45 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-26 13:56:47 +0100
commit3c4ca4c5d7992e545a6cbad440287f9e27f1a696 (patch)
tree110fffd8d88093550fa8a023e513542ac4742fda /libavcodec/hevc.h
parent492d229303a8d4270eda4d3be0e45d9e0caad0a8 (diff)
parentfa936a307f5cddfc2664600157a8207ca8080af6 (diff)
downloadffmpeg-3c4ca4c5d7992e545a6cbad440287f9e27f1a696.tar.gz
Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6': hevc_parse: rename into h2645_parse Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/hevc.h')
-rw-r--r--libavcodec/hevc.h42
1 files changed, 2 insertions, 40 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 5865f65f1c..f44fa492ce 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -31,6 +31,7 @@
#include "cabac.h"
#include "get_bits.h"
#include "hevcpred.h"
+#include "h2645_parse.h"
#include "hevcdsp.h"
#include "internal.h"
#include "thread.h"
@@ -746,33 +747,6 @@ typedef struct HEVCFrame {
uint8_t flags;
} HEVCFrame;
-typedef struct HEVCNAL {
- uint8_t *rbsp_buffer;
- int rbsp_buffer_size;
-
- int size;
- const uint8_t *data;
-
- int raw_size;
- const uint8_t *raw_data;
-
- GetBitContext gb;
-
- enum NALUnitType type;
- int temporal_id;
-
- int skipped_bytes;
- int skipped_bytes_pos_size;
- int *skipped_bytes_pos;
-} HEVCNAL;
-
-/* an input packet split into unescaped NAL units */
-typedef struct HEVCPacket {
- HEVCNAL *nals;
- int nb_nals;
- int nals_allocated;
-} HEVCPacket;
-
typedef struct HEVCLocalContext {
uint8_t cabac_state[HEVC_CONTEXTS];
@@ -906,7 +880,7 @@ typedef struct HEVCContext {
const uint8_t *data;
- HEVCPacket pkt;
+ H2645Packet pkt;
// type of the first VCL NAL of the current frame
enum NALUnitType first_nal_type;
@@ -1077,18 +1051,6 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0,
void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size);
-/**
- * Extract the raw (unescaped) HEVC bitstream.
- */
-int ff_hevc_extract_rbsp(const uint8_t *src, int length,
- HEVCNAL *nal);
-
-/**
- * Split an input packet into NAL units.
- */
-int ff_hevc_split_packet(HEVCPacket *pkt, const uint8_t *buf, int length,
- AVCodecContext *avctx, int is_nalff, int nal_length_size);
-
int ff_hevc_encode_nal_vps(HEVCVPS *vps, unsigned int id,
uint8_t *buf, int buf_size);