virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

h2645_parse: add support for parsing h264

Browse Source
This commit is contained in:
Anton Khirnov 2016-03-21 09:00:40 +01:00
parent 52ec149fbe
commit b667252a41
4 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/h2645_parse.c
View File

@ -154,9 +154,26 @@ static int hevc_parse_nal_header(H2645NAL *nal, void *logctx)
return nuh_layer_id == 0; return nuh_layer_id == 0;
} }
static int h264_parse_nal_header(H2645NAL *nal, void *logctx)
{
GetBitContext *gb = &nal->gb;
if (get_bits1(gb) != 0)
return AVERROR_INVALIDDATA;
nal->ref_idc = get_bits(gb, 2);
nal->type = get_bits(gb, 5);
av_log(logctx, AV_LOG_DEBUG,
"nal_unit_type: %d, nal_ref_idc: %d\n",
nal->type, nal->ref_idc);
return 1;
}
int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
void *logctx, int is_nalff, int nal_length_size) void *logctx, int is_nalff, int nal_length_size,
enum AVCodecID codec_id)
{ {
int consumed, ret = 0; int consumed, ret = 0;
@ -211,7 +228,10 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = hevc_parse_nal_header(nal, logctx); if (codec_id == AV_CODEC_ID_HEVC)
ret = hevc_parse_nal_header(nal, logctx);
else
ret = h264_parse_nal_header(nal, logctx);
if (ret <= 0) { if (ret <= 0) {
if (ret < 0) { if (ret < 0) {
av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n", av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",

15
libavcodec/h2645_parse.h
View File

@ -38,8 +38,20 @@ typedef struct H2645NAL {
GetBitContext gb; GetBitContext gb;
/**
* NAL unit type
*/
int type; int type;
/**
* HEVC only, nuh_temporal_id_plus_1 - 1
*/
int temporal_id; int temporal_id;
/**
* H264 only, nal_ref_idc
*/
int ref_idc;
} H2645NAL; } H2645NAL;
/* an input packet split into unescaped NAL units */ /* an input packet split into unescaped NAL units */
@ -59,7 +71,8 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length,
* Split an input packet into NAL units. * Split an input packet into NAL units.
*/ */
int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
void *logctx, int is_nalff, int nal_length_size); void *logctx, int is_nalff, int nal_length_size,
enum AVCodecID codec_id);
/** /**
* Free all the allocated memory in the packet. * Free all the allocated memory in the packet.

2
libavcodec/hevc.c
View File

@ -2582,7 +2582,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
/* split the input packet into NAL units, so we know the upper bound on the /* split the input packet into NAL units, so we know the upper bound on the
* number of slices in the frame */ * number of slices in the frame */
ret = ff_h2645_packet_split(&s->pkt, buf, length, s->avctx, s->is_nalff, ret = ff_h2645_packet_split(&s->pkt, buf, length, s->avctx, s->is_nalff,
s->nal_length_size); s->nal_length_size, s->avctx->codec_id);
if (ret < 0) { if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Error splitting the input into NAL units.\n"); "Error splitting the input into NAL units.\n");

3
libavcodec/hevc_parser.c
View File

@ -82,7 +82,8 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
HEVCParserContext *ctx = s->priv_data; HEVCParserContext *ctx = s->priv_data;
int ret, i; int ret, i;
ret = ff_h2645_packet_split(&ctx->pkt, buf, buf_size, avctx, 0, 0); ret = ff_h2645_packet_split(&ctx->pkt, buf, buf_size, avctx, 0, 0,
AV_CODEC_ID_HEVC);
if (ret < 0) if (ret < 0)
return ret; return ret;