March 2015 - ffmpeg-cvslog - lists.ffmpeg.org

Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'
by git＠videolan.org 01 Mar '15

01 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Mar 1 00:48:20 2015 +0100| [6f0a82966d82a88bedab91c617df502c3855e9aa] | committer: Michael Niedermayer Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37' * commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37': rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f0a82966d82a88be… ---

1 0

Merge commit '98563953442560dd83aab938f86de3e5a22a891f'
by git＠videolan.org 01 Mar '15

01 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Mar 1 00:48:00 2015 +0100| [f6f1e1a7a14d0cde4055fa98be2783c5a1131d5b] | committer: Michael Niedermayer Merge commit '98563953442560dd83aab938f86de3e5a22a891f' * commit '98563953442560dd83aab938f86de3e5a22a891f': rtpenc_aac: Fix sending fragmented frames Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6f1e1a7a14d0cde4… ---

1 0

rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
by git＠videolan.org 01 Mar '15

01 Mar '15

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Fri Feb 27 12:30:54 2015 +0200| [12b3459979f5ea6481660cd2c99a0381e2b5ba37] | committer: Martin Storsjö rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf This doesn't fix any bug, but makes the code simpler for later patches, and more straightforward to read as is. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12b3459979f5ea648… --- libavformat/rtpenc_amr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpenc_amr.c b/libavformat/rtpenc_amr.c index 73da8c8..9f4f21a 100644 --- a/libavformat/rtpenc_amr.c +++ b/libavformat/rtpenc_amr.c @@ -36,7 +36,7 @@ void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size) /* Test if the packet must be sent. */ len = s->buf_ptr - s->buf; - if (s->num_frames == s->max_frames_per_packet || (len && len + size - 1 > s->max_payload_size)) { + if (s->num_frames == s->max_frames_per_packet || (s->num_frames && len + size - 1 > s->max_payload_size)) { int header_size = s->num_frames + 1; p = s->buf + max_header_toc_size - header_size; if (p != s->buf)

1 0

rtpenc_aac: Fix sending fragmented frames
by git＠videolan.org 01 Mar '15

01 Mar '15

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Wed Feb 25 23:55:58 2015 +0200| [98563953442560dd83aab938f86de3e5a22a891f] | committer: Martin Storsjö rtpenc_aac: Fix sending fragmented frames After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't zero, while s->num_frames is zero as intended. Using s->num_frames makes it work as intended, and is less convoluted than keeping track of (resetting) s->buf_ptr. This avoids sending stray data after sending a fragmented aac packet. CC: libav-stable(a)libav.org Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98563953442560dd8… --- libavformat/rtpenc_aac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c index 1b2fa0a..8e39605 100644 --- a/libavformat/rtpenc_aac.c +++ b/libavformat/rtpenc_aac.c @@ -39,7 +39,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size) /* test if the packet must be sent */ len = (s->buf_ptr - s->buf); - if ((s->num_frames == max_frames_per_packet) || (len && (len + size) > s->max_payload_size)) { + if ((s->num_frames == max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) { int au_size = s->num_frames * 2; p = s->buf + max_au_headers_size - au_size - 2;

1 0