virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

rtpdec_hevc: Implement parsing of aggregated packets

Browse Source 
With significant changes by Martin Storsjö, to use the shared
function instead of reimplementing it.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Thomas Volkert
2015-02-13 22:43:16 +01:00
committed by Martin Storsjö
parent b878ba03e7
commit cbdd1806ea
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/rtpdec_hevc.c
View File

@@ -30,6 +30,7 @@
#define RTP_HEVC_PAYLOAD_HEADER_SIZE 2 #define RTP_HEVC_PAYLOAD_HEADER_SIZE 2
#define RTP_HEVC_FU_HEADER_SIZE 1 #define RTP_HEVC_FU_HEADER_SIZE 1
#define RTP_HEVC_DONL_FIELD_SIZE 2 #define RTP_HEVC_DONL_FIELD_SIZE 2
#define RTP_HEVC_DOND_FIELD_SIZE 1
#define HEVC_SPECIFIED_NAL_UNIT_TYPES 48 #define HEVC_SPECIFIED_NAL_UNIT_TYPES 48
/* SDP out-of-band signaling data */ /* SDP out-of-band signaling data */
@@ -283,19 +284,6 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
} }
switch (nal_type) { switch (nal_type) {
/* aggregated packets (AP) */
case 48:
/* pass the HEVC payload header */
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;
}
/* fall-through */
/* video parameter set (VPS) */ /* video parameter set (VPS) */
case 32: case 32:
/* sequence parameter set (SPS) */ /* sequence parameter set (SPS) */
@@ -323,6 +311,19 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
memcpy(pkt->data + sizeof(start_sequence), buf, len); memcpy(pkt->data + sizeof(start_sequence), buf, len);
break; break;
/* aggregated packet (AP) - with two or more NAL units */
case 48:
/* pass the HEVC payload header */
buf += RTP_HEVC_PAYLOAD_HEADER_SIZE;
len -= RTP_HEVC_PAYLOAD_HEADER_SIZE;
res = ff_h264_handle_aggregated_packet(ctx, pkt, buf, len,
rtp_hevc_ctx->using_donl_field ?
RTP_HEVC_DONL_FIELD_SIZE : 0,
NULL, 0);
if (res < 0)
return res;
break;
/* fragmentation unit (FU) */ /* fragmentation unit (FU) */
case 49: case 49:
/* pass the HEVC payload header */ /* pass the HEVC payload header */