August 2010 - FFmpeg-soc - lists.ffmpeg.org

G.723.1 Encoder: Compute adaptive codebook contribution, obtain residual
by Mohamed Naufal 30 Sep '10

30 Sep '10

--- libavcodec/g723_1.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index d71fa60..fa57527 100755 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -1654,6 +1654,145 @@ static void synth_percept_filter(int16_t *qnt_lpc, int16_t *perf_lpc, } } +/** + * Compute the adaptive codebook contribution. + * + * @param buf input signal + * @param index the current subframe index + */ +static void acb_search(G723_1_Context *p, int16_t *residual, + int16_t *impulse_resp, int16_t *buf, + int index) +{ + + int16_t flt_buf[PITCH_ORDER][SUBFRAME_LEN]; + + const int16_t *cb_tbl = adaptive_cb_gain85; + + int ccr_buf[PITCH_ORDER * SUBFRAMES << 2]; + + int pitch_lag = p->pitch_lag[index >> 1]; + int acb_lag = 1; + int acb_gain = 0; + int odd_frame = index & 1; + int iter = 3 + odd_frame; + int count = 0; + int tbl_size = 85; + + int i, j, k, l, max; + int64_t temp; + + if(!odd_frame) { + if (pitch_lag == PITCH_MIN) + pitch_lag++; + else + pitch_lag = FFMIN(pitch_lag, PITCH_MAX - 5); + } + + /* Compute crosscorrelations and energies */ + for (i = 0; i < iter; i++) { + get_residual(residual, p->prev_excitation, pitch_lag + i - 1); + + for (j = 0; j < SUBFRAME_LEN; j++) { + temp = 0; + for (k = 0; k <= j; k++) + temp += residual[PITCH_ORDER - 1 + k] * impulse_resp[j - k]; + flt_buf[PITCH_ORDER - 1][j] = av_clipl_int32((temp << 1) + + (1 << 15)) >> 16; + } + + for (j = PITCH_ORDER - 2; j >= 0; j--) { + flt_buf[j][0] = ((residual[j] << 13) + (1 << 14)) >> 15; + for (k = 1; k < SUBFRAME_LEN; k++) { + temp = (flt_buf[j + 1][k - 1] << 15) + + residual[j] * impulse_resp[k]; + flt_buf[j][k] = av_clipl_int32((temp << 1) + (1 << 15)) >> 16; + } + } + + for (j = 0; j < PITCH_ORDER; j++) { + temp = dot_product(buf, flt_buf[j], SUBFRAME_LEN, 0); + ccr_buf[count++] = av_clipl_int32(temp << 1); + } + + for (j = 0; j < PITCH_ORDER; j++) { + ccr_buf[count++] = dot_product(flt_buf[j], flt_buf[j], + SUBFRAME_LEN, 1); + } + + for (j = 1; j < PITCH_ORDER; j++) { + for (k = 0; k < j; k++) { + temp = dot_product(flt_buf[j], flt_buf[k], SUBFRAME_LEN, 0); + ccr_buf[count++] = av_clipl_int32(temp << 2); + } + } + } + + /* Normalize and shorten */ + max = 0; + for (i = 0; i < 20 * iter; i++) + max = FFMAX(max, FFABS(ccr_buf[i])); + + temp = normalize_bits_int32(max); + + for (i = 0; i < 20 * iter; i++){ + ccr_buf[i] = av_clipl_int32((int64_t)(ccr_buf[i] << temp) + + (1 << 15)) >> 16; + } + + max = 0; + for (i = 0; i < iter; i++) { + /* Select quantization table */ + if ((!odd_frame && pitch_lag + i - 1 >= SUBFRAME_LEN - 2) || + (odd_frame && pitch_lag >= SUBFRAME_LEN - 2)) { + cb_tbl = adaptive_cb_gain170; + tbl_size = 170; + } + + for (j = 0, k = 0; j < tbl_size; j++, k += 20) { + temp = 0; + for (l = 0; l < 20; l++) + temp += ccr_buf[20 * i + l] * cb_tbl[k + l]; + temp = av_clipl_int32(temp); + + if (temp > max) { + max = temp; + acb_gain = j; + acb_lag = i; + } + } + } + + if (!odd_frame) { + pitch_lag += acb_lag - 1; + acb_lag = 1; + } + + p->pitch_lag[index >> 1] = pitch_lag; + p->subframe[index].ad_cb_lag = acb_lag; + p->subframe[index].ad_cb_gain = acb_gain; +} + +/** + * Subtract the adaptive codebook contribution from the input + * to obtain the residual. + * + * @param buf target vector + */ +static void sub_acb_contrib(int16_t *residual, int16_t *impulse_resp, + int16_t *buf) +{ + int i, j; + + for (i = 0; i < SUBFRAME_LEN; i++) { + int64_t temp = buf[i] << 14; + for (j = 0; j <= i; j++){ + temp -= residual[j] * impulse_resp[i - j]; + } + buf[i] = av_clipl_int32((temp << 2) + (1 << 15)) >> 16; + } +} + static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) { @@ -1712,6 +1851,7 @@ static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, offset = 0; for (i = 0; i < SUBFRAMES; i++) { int16_t impulse_resp[SUBFRAME_LEN]; + int16_t residual[SUBFRAME_LEN + PITCH_ORDER - 1]; int16_t flt_in[SUBFRAME_LEN]; int16_t zero[LPC_ORDER]; @@ -1736,6 +1876,11 @@ static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, zero, vector + PITCH_MAX, 0); harmonic_noise_sub(hf + i, vector + PITCH_MAX, in); + acb_search(p, residual, impulse_resp, in, i); + gen_acb_excitation(residual, p->prev_excitation,p->pitch_lag[i >> 1], + p->subframe[i], p->cur_rate); + sub_acb_contrib(residual, impulse_resp, in); + offset += LPC_ORDER; in += SUBFRAME_LEN; } --

4 4

G.723.1 Muxer
by Mohamed Naufal 30 Sep '10

30 Sep '10

--- libavformat/Makefile | 1 + libavformat/allformats.c | 2 +- libavformat/g723_1.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 794aa49..cbe9a15 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -80,6 +80,7 @@ OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o +OBJS-$(CONFIG_G723_1_MUXER) += g723_1.o OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GSM_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 437d9d3..34327b3 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -90,7 +90,7 @@ void av_register_all(void) REGISTER_DEMUXER (FOURXM, fourxm); REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMEMD5, framemd5); - REGISTER_DEMUXER (G723_1, g723_1); + REGISTER_MUXDEMUX (G723_1, g723_1); REGISTER_MUXER (GIF, gif); REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX (GXF, gxf); diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 10125e6..9f4de36 100755 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -80,3 +80,24 @@ AVInputFormat g723_1_demuxer = { g723_1_read_packet, .extensions = "tco", }; + +#if CONFIG_G723_1_MUXER +static int g723_1_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + put_buffer(s->pb, pkt->data, pkt->size); + put_flush_packet(s->pb); + return 0; +} + +AVOutputFormat g723_1_muxer = { + "g723_1", + NULL_IF_CONFIG_SMALL("G.723.1 format"), + "audio/g723", + "tco", + 0, + CODEC_ID_G723_1, + CODEC_ID_NONE, + NULL, + g723_1_write_packet, +}; +#endif --

2 2

[PATCH] AMR-WB Decoder
by Marcelo Galvão Póvoa 18 Sep '10

18 Sep '10

Hello, Here is my floating point AMR-WB Decoder. The output quality seems reasonable compared to the reference and libopencore decoders. There are some tests available (1kHz sine wave and high-band output) in [1]. Most of the code hasn't been reviewed yet, so I'd appreciate if someone does. There is some annotations throughout the code marked with "XXX:" used to remark cases of discrepancy between the specification and the reference source and some general issues that ought to be analyzed. This patch was generated against an old ffmpeg revision in which I started programming. I don't know if this would create a problem in applying the patch to Makefile and allcodecs.c. Please tell me if it would. [1] http://www.students.ic.unicamp.br/~ra082115/amrwb_tests.zip Regards, Marcelo

5 48

[PATCH] RTCP BYE
by Josh Allmann 29 Aug '10

29 Aug '10

Hi, Here is a first attempt at RTCP BYE support, in bite-size patches. 0001 - Replace hardcoded RTCP packet types with an enum. 0002 - Reinstate rtp_get_file_handles function that is slated for removal at the next major bump. We need to be able to get the RTCP fd from the rtpproto. 0003 - Read RTCP packets from the RTSP demuxer. This might not be strictly necessary, but it guarantees we'll read a RTCP packet if one is available (without the availability of a RTP data packet). 0004 - According to RFC 3550, RTCP is always sent in compound/aggregate form, starting with either a SR or RR packet, with the other types (eg, BYE) following. This patch enables reading past the first SR packet. 0005 - Actual BYE support. This is really kinda incomplete. It only returns EOF, whereas we should be selectively removing the stream (theoretically we could have concurrent streams playing, and one BYEs while the others keep going). In the case where we get a BYE with only one stream left, perhaps an EOF would be appropriate then. Right now, not much happens since the EOF is propagated back to the application layer. FFplay pretty much ignores it, although I suppose it could (should?) be patched to call av_close_input_stream, so it sends a proper TEARDOWN. Josh

4 21

Re: [FFmpeg-soc] [PATCH] AMR-WB Decoder
by Marcelo Galvão Póvoa 26 Aug '10

26 Aug '10

Here are some samples in all modes created by the reference encoder (libamr) through ffmpeg. http://www.students.ic.unicamp.br/~ra082115/amrwb-samples.zip -- Marcelo

1 0

[soc]: r5930 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_fifo.c
by stefano 24 Aug '10

24 Aug '10

Author: stefano Date: Tue Aug 24 11:02:54 2010 New Revision: 5930 Log: Update to FFmpeg r24896 / libswscale r32011. Deleted: libavfilter/vf_fifo.c Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/01_build.diff libavfilter/diffs/03_doc_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Sat Aug 21 05:00:21 2010 (r5929) +++ libavfilter/checkout.sh Tue Aug 24 11:02:54 2010 (r5930) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24819 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24896 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r31972 +svn up -r32011 cd ../.. echo "patching ffmpeg" @@ -16,7 +16,6 @@ cp \ vf_drawbox.c \ vf_drawtext.c \ vf_fade.c \ - vf_fifo.c \ vf_fps.c \ vf_negate.c \ vf_overlay.c \ Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Sat Aug 21 05:00:21 2010 (r5929) +++ libavfilter/diffs/00_configure.diff Tue Aug 24 11:02:54 2010 (r5930) @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 24819) +--- configure (revision 24896) +++ configure (working copy) @@ -168,6 +168,7 @@ and libraw1394 [no] @@ -26,7 +26,7 @@ Index: configure log2 log2f loongson -@@ -1380,6 +1383,10 @@ +@@ -1381,6 +1384,10 @@ tcp_protocol_deps="network" udp_protocol_deps="network" @@ -37,7 +37,7 @@ Index: configure # libraries avdevice_deps="avcodec avformat" avformat_deps="avcodec" -@@ -2603,6 +2610,7 @@ +@@ -2604,6 +2611,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -45,7 +45,7 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2685,6 +2693,7 @@ +@@ -2686,6 +2694,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Sat Aug 21 05:00:21 2010 (r5929) +++ libavfilter/diffs/01_build.diff Tue Aug 24 11:02:54 2010 (r5930) @@ -1,6 +1,6 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 24819) +--- libavfilter/Makefile (revision 24896) +++ libavfilter/Makefile (working copy) @@ -3,8 +3,9 @@ NAME = avfilter @@ -13,14 +13,14 @@ Index: libavfilter/Makefile OBJS = allfilters.o \ avfilter.o \ -@@ -16,20 +17,32 @@ +@@ -18,21 +19,32 @@ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o +OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o +OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o +OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o -+OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o + OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o +OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o @@ -48,16 +48,16 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 24819) +--- libavfilter/allfilters.c (revision 24896) +++ libavfilter/allfilters.c (working copy) -@@ -36,20 +36,32 @@ +@@ -38,21 +38,32 @@ REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (CROP, crop, vf); + REGISTER_FILTER (DRAWBOX, drawbox, vf); + REGISTER_FILTER (DRAWTEXT, drawtext, vf); + REGISTER_FILTER (FADE, fade, vf); -+ REGISTER_FILTER (FIFO, fifo, vf); + REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); + REGISTER_FILTER (FPS, fps, vf); REGISTER_FILTER (HFLIP, hflip, vf); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Sat Aug 21 05:00:21 2010 (r5929) +++ libavfilter/diffs/03_doc_filters.diff Tue Aug 24 11:02:54 2010 (r5930) @@ -1,8 +1,8 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 24819) +--- doc/filters.texi (revision 24896) +++ doc/filters.texi (working copy) -@@ -39,6 +39,114 @@ +@@ -55,6 +55,108 @@ The default value of @var{width} and @var{height} is 0. @@ -108,16 +108,10 @@ Index: doc/filters.texi +Note that the double quotes are not necessary if spaces are not used within +the parameter list. + -+@section fifo -+ -+@example -+./ffmpeg -i in.avi -vf "fifo" out.avi -+@end example -+ - @section format + @section fifo - Convert the input video to one of the specified pixel formats. -@@ -56,6 +164,14 @@ + Buffer input images and send them when they are requested. +@@ -81,6 +183,14 @@ will convert the input video to the format ``yuv420p''. @@ -132,7 +126,7 @@ Index: doc/filters.texi @section hflip Flip the input video horizontally. -@@ -66,6 +182,14 @@ +@@ -91,6 +201,14 @@ ffmpeg -i in.avi -vf "hflip" out.avi @end example @@ -147,9 +141,9 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -87,6 +211,56 @@ +@@ -112,6 +230,56 @@ - Pass the source unchanged to the output. + Pass the video source unchanged to the output. +@section overlay + @@ -204,7 +198,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -134,6 +308,14 @@ +@@ -159,6 +327,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -219,7 +213,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -159,6 +341,24 @@ +@@ -184,6 +360,24 @@ The default value of @var{width} and @var{height} is 0. @@ -244,7 +238,7 @@ Index: doc/filters.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -174,6 +374,19 @@ +@@ -199,6 +393,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -264,7 +258,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -318,6 +531,27 @@ +@@ -343,6 +550,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example

1 0

[soc]: r5916 - mms/mmsh.c
by spyfeng 21 Aug '10

21 Aug '10

Author: spyfeng Date: Wed Aug 18 18:04:18 2010 New Revision: 5916 Log: modify include file order. Modified: mms/mmsh.c Modified: mms/mmsh.c ============================================================================== --- mms/mmsh.c Wed Aug 18 09:03:02 2010 (r5915) +++ mms/mmsh.c Wed Aug 18 18:04:18 2010 (r5916) @@ -24,11 +24,11 @@ * Windows Media HTTP Streaming Protocol. * http://msdn.microsoft.com/en-us/library/cc251059(PROT.10).aspx */ -#include "mms.h" -#include "internal.h" -#include "libavutil/intreadwrite.h" #include <string.h> +#include "libavutil/intreadwrite.h" #include "libavutil/avstring.h" +#include "libavutil/internal.h" +#include "mms.h" #include "asf.h" #include "http.h"

3 2

[soc]: r5907 - mms/mmsh.c
by spyfeng 21 Aug '10

21 Aug '10

Author: spyfeng Date: Tue Aug 17 15:50:27 2010 New Revision: 5907 Log: make const string inline without use the static variable. Modified: mms/mmsh.c Modified: mms/mmsh.c ============================================================================== --- mms/mmsh.c Tue Aug 17 15:42:21 2010 (r5906) +++ mms/mmsh.c Tue Aug 17 15:50:27 2010 (r5907) @@ -41,26 +41,6 @@ // the guid value can be changed to any valid value. #define CLIENTGUID "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}\r\n" -// mmsh request messages. -static const char* mmsh_first_request = - "Accept: */*\r\n" - USERAGENT - "Host: %s:%d\r\n" - "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=0:0,request-context=%u,max-duration=0\r\n" - CLIENTGUID - "Connection: Close\r\n\r\n"; - -static const char* mmsh_live_request = - "Accept: */*\r\n" - USERAGENT - "Host: %s:%d\r\n" - "Pragma: no-cache,rate=1.000000,request-context=%u\r\n" - "Pragma: xPlayStrm=1\r\n" - CLIENTGUID - "Pragma: stream-switch-count=%d\r\n" - "Pragma: stream-switch-entry=%s\r\n" - "Connection: Close\r\n\r\n"; - // see Ref 2.2.3 for packet type define: // chunk type contains 2 fields: Frame and PacketID. // Frame is 0x24 or 0xA4(rarely), different PacketID indicates different packet type. @@ -255,7 +235,13 @@ static int mmsh_open(URLContext *h, cons return AVERROR(EIO); } - snprintf (headers, sizeof(headers), mmsh_first_request, + snprintf(headers, sizeof(headers), + "Accept: */*\r\n" + USERAGENT + "Host: %s:%d\r\n" + "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=0:0,request-context=%u,max-duration=0\r\n" + CLIENTGUID + "Connection: Close\r\n\r\n", host, port, mmsh->request_seq++); ff_http_set_headers(mms->mms_hd, headers); @@ -283,7 +269,16 @@ static int mmsh_open(URLContext *h, cons offset += err; } // send play request - err = snprintf(headers, sizeof(headers), mmsh_live_request, + err = snprintf(headers, sizeof(headers), + "Accept: */*\r\n" + USERAGENT + "Host: %s:%d\r\n" + "Pragma: no-cache,rate=1.000000,request-context=%u\r\n" + "Pragma: xPlayStrm=1\r\n" + CLIENTGUID + "Pragma: stream-switch-count=%d\r\n" + "Pragma: stream-switch-entry=%s\r\n" + "Connection: Close\r\n\r\n", host, port, mmsh->request_seq++, mms->stream_num, stream_selection); if (err < 0) { av_log(NULL, AV_LOG_ERROR, "build play request failed!\n");

3 2

[soc]: r5911 - mms/mmsh.c
by spyfeng 21 Aug '10

21 Aug '10

Author: spyfeng Date: Tue Aug 17 16:46:31 2010 New Revision: 5911 Log: use malloc mechanism for writing stream selection. use av_strlcat() instread of offset calculated. Modified: mms/mmsh.c Modified: mms/mmsh.c ============================================================================== --- mms/mmsh.c Tue Aug 17 16:01:15 2010 (r5910) +++ mms/mmsh.c Tue Aug 17 16:46:31 2010 (r5911) @@ -211,9 +211,9 @@ static int get_http_header_data(MMSHCont static int mmsh_open(URLContext *h, const char *uri, int flags) { - int i, port, err, offset = 0; + int i, port, err; char httpname[256], path[256], host[128], location[1024]; - char stream_selection[10 * MAX_STREAMS]; + char *stream_selection; char headers[1024]; MMSHContext *mmsh; MMSContext *mms; @@ -262,12 +262,16 @@ static int mmsh_open(URLContext *h, cons if (url_alloc(&mms->mms_hd, httpname, URL_RDONLY) < 0) { return AVERROR(EIO); } + stream_selection = av_mallocz(mms->stream_num * 19 + 1); + if (!stream_selection) + return AVERROR(ENOMEM); for (i = 0; i < mms->stream_num; i++) { - err = snprintf(stream_selection + offset, sizeof(stream_selection) - offset, + char tmp[20]; + err = snprintf(tmp, sizeof(tmp), "ffff:%d:0 ", mms->streams[i].id); if (err < 0) goto fail; - offset += err; + av_strlcat(stream_selection, tmp, mms->stream_num * 19 + 1); } // send play request err = snprintf(headers, sizeof(headers), @@ -281,6 +285,7 @@ static int mmsh_open(URLContext *h, cons "Pragma: stream-switch-entry=%s\r\n" "Connection: Close\r\n\r\n", host, port, mmsh->request_seq++, mms->stream_num, stream_selection); + av_freep(&stream_selection); if (err < 0) { av_log(NULL, AV_LOG_ERROR, "build play request failed!\n"); goto fail; @@ -302,6 +307,7 @@ static int mmsh_open(URLContext *h, cons dprintf(NULL, "Leaving mmsh open success.\n"); return 0; fail: + av_freep(&stream_selection); mmsh_close(h); dprintf(NULL, "Leaving mmsh open (failure: %d)\n", err); return err;

2 1

[soc]: r5918 - mms/mmsh.c
by spyfeng 21 Aug '10

21 Aug '10

Author: spyfeng Date: Wed Aug 18 18:15:16 2010 New Revision: 5918 Log: add space for making it follow the code rule. Modified: mms/mmsh.c Modified: mms/mmsh.c ============================================================================== --- mms/mmsh.c Wed Aug 18 18:05:56 2010 (r5917) +++ mms/mmsh.c Wed Aug 18 18:15:16 2010 (r5918) @@ -49,19 +49,19 @@ typedef enum { CHUNK_TYPE_ASF_HEADER = 0x4824, CHUNK_TYPE_END = 0x4524, CHUNK_TYPE_STREAM_CHANGE = 0x4324, -}ChunkType; +} ChunkType; typedef struct { MMSContext mms; int request_seq; ///< request packet sequence int chunk_seq; ///< data packet sequence -}MMSHContext; +} MMSHContext; static int mmsh_close(URLContext *h) { MMSHContext *mmsh = (MMSHContext *)h->priv_data; MMSContext *mms = &mmsh->mms; - if(mms->mms_hd) + if (mms->mms_hd) url_close(mms->mms_hd); av_freep(&mms->asf_header); av_freep(&h->priv_data); @@ -227,7 +227,7 @@ static int mmsh_open(URLContext *h, cons ff_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, path, sizeof(path), location); - if(port<0) + if (port<0) port = 80; // default mmsh protocol port ff_url_join(httpname, sizeof(httpname), "http", NULL, host, port, path); @@ -327,7 +327,7 @@ static int handle_chunk_type(MMSHContext return AVERROR_IO; case CHUNK_TYPE_STREAM_CHANGE: mms->header_parsed = 0; - if ((res = get_http_header_data(mmsh)) !=0) { + if ((res = get_http_header_data(mmsh)) != 0) { av_log(NULL, AV_LOG_ERROR,"stream changed! get new header failed!\n"); return res; } @@ -346,7 +346,7 @@ static int mmsh_read(URLContext *h, uint int res = 0; MMSHContext *mmsh = h->priv_data; MMSContext *mms = &mmsh->mms; - do{ + do { if (mms->asf_header_read_size < mms->asf_header_size) { // copy asf header into buffer res = ff_mms_read_header(mms, buf, size); @@ -355,7 +355,7 @@ static int mmsh_read(URLContext *h, uint return res; res = ff_mms_read_data(mms, buf, size); } - }while(!res); + } while (!res); return res; }

2 1