generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'

Browse Source 
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
  rtpdec_hevc: Share the implementation of fragmented packets with h264

Conflicts:
	libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-24 23:23:26 +01:00
commit 17773f49b7
3 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtpdec_formats.h
View File

@ -42,6 +42,9 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data,
const uint8_t *buf, int len, const uint8_t *buf, int len,
int start_skip, int *nal_counters, int start_skip, int *nal_counters,
int nal_mask); int nal_mask);
int ff_h264_handle_frag_packet(AVPacket *pkt, const uint8_t *buf, int len,
int start_bit, const uint8_t *nal_header,
int nal_header_len);
void ff_h264_parse_framesize(AVCodecContext *codec, const char *p); void ff_h264_parse_framesize(AVCodecContext *codec, const char *p);
extern RTPDynamicProtocolHandler ff_ac3_dynamic_handler; extern RTPDynamicProtocolHandler ff_ac3_dynamic_handler;

39
libavformat/rtpdec_h264.c
View File

@ -257,12 +257,32 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data,
return 0; return 0;
} }
int ff_h264_handle_frag_packet(AVPacket *pkt, const uint8_t *buf, int len,
int start_bit, const uint8_t *nal_header,
int nal_header_len)
{
int ret;
int tot_len = len;
int pos = 0;
if (start_bit)
tot_len += sizeof(start_sequence) + nal_header_len;
if ((ret = av_new_packet(pkt, tot_len)) < 0)
return ret;
if (start_bit) {
memcpy(pkt->data + pos, start_sequence, sizeof(start_sequence));
pos += sizeof(start_sequence);
memcpy(pkt->data + pos, nal_header, nal_header_len);
pos += nal_header_len;
}
memcpy(pkt->data + pos, buf, len);
return 0;
}
static int h264_handle_packet_fu_a(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt, static int h264_handle_packet_fu_a(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
const uint8_t *buf, int len, const uint8_t *buf, int len,
int *nal_counters, int nal_mask) int *nal_counters, int nal_mask)
{ {
uint8_t fu_indicator, fu_header, start_bit, nal_type, nal; uint8_t fu_indicator, fu_header, start_bit, nal_type, nal;
int ret;
if (len < 3) { if (len < 3) {
av_log(ctx, AV_LOG_ERROR, "Too short data for FU-A H264 RTP packet\n"); av_log(ctx, AV_LOG_ERROR, "Too short data for FU-A H264 RTP packet\n");
@ -279,22 +299,9 @@ static int h264_handle_packet_fu_a(AVFormatContext *ctx, PayloadContext *data, A
buf += 2; buf += 2;
len -= 2; len -= 2;
if (start_bit) { if (start_bit && nal_counters)
if (nal_counters)
nal_counters[nal_type & nal_mask]++; nal_counters[nal_type & nal_mask]++;
/* copy in the start sequence, and the reconstructed nal */ return ff_h264_handle_frag_packet(pkt, buf, len, start_bit, &nal, 1);
if ((ret = av_new_packet(pkt, sizeof(start_sequence) + sizeof(nal) + len)) < 0)
return ret;
memcpy(pkt->data, start_sequence, sizeof(start_sequence));
pkt->data[sizeof(start_sequence)] = nal;
memcpy(pkt->data + sizeof(start_sequence) + sizeof(nal), buf, len);
} else {
if ((ret = av_new_packet(pkt, len)) < 0)
return ret;
memcpy(pkt->data, buf, len);
}
return 0;
} }
// return 0 on packet, no more left, 1 on packet, 1 on partial packet // return 0 on packet, no more left, 1 on packet, 1 on partial packet

20
libavformat/rtpdec_hevc.c
View File

@ -339,24 +339,8 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
new_nal_header[0] = (rtp_pl[0] & 0x81) | (fu_type << 1); new_nal_header[0] = (rtp_pl[0] & 0x81) | (fu_type << 1);
new_nal_header[1] = rtp_pl[1]; new_nal_header[1] = rtp_pl[1];
/* start fragment vs. subsequent fragments */ res = ff_h264_handle_frag_packet(pkt, buf, len, first_fragment,
if (first_fragment) { new_nal_header, sizeof(new_nal_header));
/* create A/V packet which is big enough */
if ((res = av_new_packet(pkt, sizeof(start_sequence) + sizeof(new_nal_header) + len)) < 0)
return res;
/* A/V packet: copy start sequence */
memcpy(pkt->data, start_sequence, sizeof(start_sequence));
/* A/V packet: copy new NAL header */
memcpy(pkt->data + sizeof(start_sequence), new_nal_header, sizeof(new_nal_header));
/* A/V packet: copy NAL unit data */
memcpy(pkt->data + sizeof(start_sequence) + sizeof(new_nal_header), buf, len);
} else {
/* create A/V packet */
if ((res = av_new_packet(pkt, len)) < 0)
return res;
/* A/V packet: copy NAL unit data */
memcpy(pkt->data, buf, len);
}
break; break;
/* PACI packet */ /* PACI packet */