apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-12-24 11:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

Browse Source 
* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
  rtpdec_hevc: Share the implementation of parsing a=framesize 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:03:12 +01:00
parent df38883607 8633fb47db
commit 29f9d82d23
3 changed files with 25 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/rtpdec_hevc.c
View File

@@ -142,33 +142,7 @@ static av_cold int hevc_parse_sdp_line(AVFormatContext *ctx, int st_index,
codec = current_stream->codec;
if (av_strstart(sdp_line_ptr, "framesize:", &sdp_line_ptr)) {
char str_video_width[50];
char *str_video_width_ptr = str_video_width;
/*
* parse "a=framesize:96 320-240"
*/
/* ignore spaces */
while (*sdp_line_ptr && *sdp_line_ptr == ' ')
sdp_line_ptr++;
/* ignore RTP payload ID */
while (*sdp_line_ptr && *sdp_line_ptr != ' ')
sdp_line_ptr++;
/* ignore spaces */
while (*sdp_line_ptr && *sdp_line_ptr == ' ')
sdp_line_ptr++;
/* extract the actual video resolution description */
while (*sdp_line_ptr && *sdp_line_ptr != '-' &&
(str_video_width_ptr - str_video_width) < sizeof(str_video_width) - 1)
*str_video_width_ptr++ = *sdp_line_ptr++;
/* add trailing zero byte */
*str_video_width_ptr = '\0';
/* determine the width value */
codec->width = atoi(str_video_width);
/* jump beyond the "-" and determine the height value */
codec->height = atoi(sdp_line_ptr + 1);
ff_h264_parse_framesize(codec, sdp_line_ptr);
} else if (av_strstart(sdp_line_ptr, "fmtp:", &sdp_line_ptr)) {
int ret = ff_parse_fmtp(ctx, current_stream, hevc_data, sdp_line_ptr,
hevc_sdp_parse_fmtp_config);