diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:01:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:01:44 +0100 |
| commit | 596f81c75b67eb78fee75de32cd5dd0f4eb85430 (patch) | |
| tree | ac325bd88f90339d335fe9983d9df80191e94314 | |
| parent | 34a8de866f88186f54da87a8e322c48910659149 (diff) | |
| parent | fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc (diff) | |
| download | ffmpeg-596f81c75b67eb78fee75de32cd5dd0f4eb85430.tar.gz | |
Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units
Conflicts:
libavformat/rtpdec_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpdec_h264.c | 9 | ||||
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 45921e5637..6b17f84d7e 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -181,7 +181,7 @@ static int sdp_parse_fmtp_config_h264(AVFormatContext *s, int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt, const uint8_t *buf, int len, - int start_skip, int *nal_counters, + int skip_between, int *nal_counters, int nal_mask) { int pass = 0; @@ -194,9 +194,6 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, const uint8_t *src = buf; int src_len = len; - src += start_skip; - src_len -= start_skip; - while (src_len > 2) { uint16_t nal_size = AV_RB16(src); @@ -224,8 +221,8 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, } // eat what we handled - src += nal_size + start_skip; - src_len -= nal_size + start_skip; + src += nal_size + skip_between; + src_len -= nal_size + skip_between; } if (pass == 0) { diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 3b3b260ac4..2622cb4b2c 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -321,9 +321,15 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx buf += RTP_HEVC_PAYLOAD_HEADER_SIZE; len -= RTP_HEVC_PAYLOAD_HEADER_SIZE; + /* pass the HEVC DONL field */ + if (rtp_hevc_ctx->using_donl_field) { + buf += RTP_HEVC_DONL_FIELD_SIZE; + len -= RTP_HEVC_DONL_FIELD_SIZE; + } + res = ff_h264_handle_aggregated_packet(ctx, rtp_hevc_ctx, pkt, buf, len, rtp_hevc_ctx->using_donl_field ? - RTP_HEVC_DONL_FIELD_SIZE : 0, + RTP_HEVC_DOND_FIELD_SIZE : 0, NULL, 0); if (res < 0) return res; |