September 2008 - ffmpeg-cvslog

[propchange]: r15120 - svn:log
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: stefano Revision: 15120 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,6 +1,6 @@ -Rename globally the header inclusion guards. +Globally rename the header inclusion guards. -Apply consistently this rule: the guard name is obtained from the +Consistently apply this rule: the guard name is obtained from the filename stripping the eventual leading "lib", converting '/' and '.' -to '_' and upcasing the resulting name. Headers' guards in the root +to '_' and uppercasing the resulting name. Guards names in the root dir have to be prefixed by "FFMPEG_".

3 2

[propchange]: r15120 - svn:log
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: stefano Revision: 15120 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,6 +1,6 @@ -Globally rename the header inclusion guards. +Globally rename the header inclusion guard names. Consistently apply this rule: the guard name is obtained from the -filename stripping the eventual leading "lib", converting '/' and '.' -to '_' and uppercasing the resulting name. Guards names in the root -dir have to be prefixed by "FFMPEG_". +filename stripping the leading "lib", converting '/' and '.' to '_' +and uppercasing the resulting name. Guard names in the root directory +have to be prefixed by "FFMPEG_".

1 0

r15147 - trunk/libavformat/raw.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: jbr Date: Mon Sep 1 19:20:49 2008 New Revision: 15147 Log: change back to using CONFIG_*_DEMUXER for ac3_eac3_probe(), but use it correctly this time. Modified: trunk/libavformat/raw.c Modified: trunk/libavformat/raw.c ============================================================================== --- trunk/libavformat/raw.c (original) +++ trunk/libavformat/raw.c Mon Sep 1 19:20:49 2008 @@ -487,7 +487,7 @@ static int dirac_probe(AVProbeData *p) } #endif -#if (ENABLE_AC3_DEMUXER || ENABLE_EAC3_DEMUXER) +#if defined(CONFIG_AC3_DEMUXER) || defined(CONFIG_EAC3_DEMUXER) static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) { int max_frames, first_frames = 0, frames;

1 0

r15146 - trunk/libavformat/matroska.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: aurel Date: Mon Sep 1 17:50:12 2008 New Revision: 15146 Log: matroska: add E-AC-3 support Thanks again Justin ! Modified: trunk/libavformat/matroska.c Modified: trunk/libavformat/matroska.c ============================================================================== --- trunk/libavformat/matroska.c (original) +++ trunk/libavformat/matroska.c Mon Sep 1 17:50:12 2008 @@ -51,7 +51,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE}, {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE}, {"A_AC3" , CODEC_ID_AC3}, -// {"A_EAC3" , CODEC_ID_EAC3}, + {"A_EAC3" , CODEC_ID_EAC3}, {"A_DTS" , CODEC_ID_DTS}, {"A_VORBIS" , CODEC_ID_VORBIS}, {"A_AAC" , CODEC_ID_AAC},

1 0

r15145 - trunk/libavformat/raw.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: jbr Date: Mon Sep 1 17:31:14 2008 New Revision: 15145 Log: simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs. Modified: trunk/libavformat/raw.c Modified: trunk/libavformat/raw.c ============================================================================== --- trunk/libavformat/raw.c (original) +++ trunk/libavformat/raw.c Mon Sep 1 17:31:14 2008 @@ -488,18 +488,18 @@ static int dirac_probe(AVProbeData *p) #endif #if (ENABLE_AC3_DEMUXER || ENABLE_EAC3_DEMUXER) -static int ac3_eac3_probe(AVProbeData *p, int *codec_id) +static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) { int max_frames, first_frames = 0, frames; uint8_t *buf, *buf2, *end; AC3HeaderInfo hdr; GetBitContext gbc; + enum CodecID codec_id = CODEC_ID_AC3; max_frames = 0; buf = p->buf; end = buf + p->buf_size; - *codec_id = CODEC_ID_AC3; for(; buf < end; buf++) { buf2 = buf; @@ -511,13 +511,14 @@ static int ac3_eac3_probe(AVProbeData *p av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2)) break; if (hdr.bitstream_id > 10) - *codec_id = CODEC_ID_EAC3; + codec_id = CODEC_ID_EAC3; buf2 += hdr.frame_size; } max_frames = FFMAX(max_frames, frames); if(buf == p->buf) first_frames = frames; } + if(codec_id != expected_codec_id) return 0; if (first_frames>=3) return AVPROBE_SCORE_MAX * 3 / 4; else if(max_frames>=3) return AVPROBE_SCORE_MAX / 2; else if(max_frames>=1) return 1; @@ -528,22 +529,14 @@ static int ac3_eac3_probe(AVProbeData *p #ifdef CONFIG_AC3_DEMUXER static int ac3_probe(AVProbeData *p) { - int codec_id = CODEC_ID_NONE; - int score = ac3_eac3_probe(p, &codec_id); - if(codec_id == CODEC_ID_AC3) - return score; - return 0; + return ac3_eac3_probe(p, CODEC_ID_AC3); } #endif #ifdef CONFIG_EAC3_DEMUXER static int eac3_probe(AVProbeData *p) { - int codec_id = CODEC_ID_NONE; - int score = ac3_eac3_probe(p, &codec_id); - if(codec_id == CODEC_ID_EAC3) - return score; - return 0; + return ac3_eac3_probe(p, CODEC_ID_EAC3); } #endif

1 0

r15144 - trunk/libavformat/raw.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: jbr Date: Mon Sep 1 17:28:15 2008 New Revision: 15144 Log: check ENABLE_*_DEMUXER instead of CONFIG_*_DEMUXER Modified: trunk/libavformat/raw.c Modified: trunk/libavformat/raw.c ============================================================================== --- trunk/libavformat/raw.c (original) +++ trunk/libavformat/raw.c Mon Sep 1 17:28:15 2008 @@ -487,7 +487,7 @@ static int dirac_probe(AVProbeData *p) } #endif -#if (CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER) +#if (ENABLE_AC3_DEMUXER || ENABLE_EAC3_DEMUXER) static int ac3_eac3_probe(AVProbeData *p, int *codec_id) { int max_frames, first_frames = 0, frames;

1 0

r15143 - in trunk: libavcodec/aac_ac3_parser.c libavcodec/ac3_parser.c libavcodec/ac3dec.c libavcodec/ac3enc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavformat/Makefile libavformat/allformats.c libavformat/raw.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: jbr Date: Mon Sep 1 16:33:54 2008 New Revision: 15143 Log: create a separate codec_id for E-AC-3 Modified: trunk/libavcodec/aac_ac3_parser.c trunk/libavcodec/ac3_parser.c trunk/libavcodec/ac3dec.c trunk/libavcodec/ac3enc.c trunk/libavcodec/allcodecs.c trunk/libavcodec/avcodec.h trunk/libavformat/Makefile trunk/libavformat/allformats.c trunk/libavformat/raw.c Modified: trunk/libavcodec/aac_ac3_parser.c ============================================================================== --- trunk/libavcodec/aac_ac3_parser.c (original) +++ trunk/libavcodec/aac_ac3_parser.c Mon Sep 1 16:33:54 2008 @@ -76,7 +76,8 @@ get_next: avctx->request_channels < s->channels && (avctx->request_channels <= 2 || (avctx->request_channels == 1 && - avctx->codec_id == CODEC_ID_AC3))) { + (avctx->codec_id == CODEC_ID_AC3 || + avctx->codec_id == CODEC_ID_EAC3)))) { avctx->channels = avctx->request_channels; } else { avctx->channels = s->channels; Modified: trunk/libavcodec/ac3_parser.c ============================================================================== --- trunk/libavcodec/ac3_parser.c (original) +++ trunk/libavcodec/ac3_parser.c Mon Sep 1 16:33:54 2008 @@ -188,7 +188,7 @@ static av_cold int ac3_parse_init(AVCode AVCodecParser ac3_parser = { - { CODEC_ID_AC3 }, + { CODEC_ID_AC3, CODEC_ID_EAC3 }, sizeof(AACAC3ParseContext), ac3_parse_init, ff_aac_ac3_parse, Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Mon Sep 1 16:33:54 2008 @@ -1288,5 +1288,16 @@ AVCodec ac3_decoder = { .init = ac3_decode_init, .close = ac3_decode_end, .decode = ac3_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 (AC-3, E-AC-3)"), + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), +}; + +AVCodec eac3_decoder = { + .name = "eac3", + .type = CODEC_TYPE_AUDIO, + .id = CODEC_ID_EAC3, + .priv_data_size = sizeof (AC3DecodeContext), + .init = ac3_decode_init, + .close = ac3_decode_end, + .decode = ac3_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), }; Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c (original) +++ trunk/libavcodec/ac3enc.c Mon Sep 1 16:33:54 2008 @@ -1365,5 +1365,5 @@ AVCodec ac3_encoder = { AC3_encode_close, NULL, .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 (AC-3, E-AC-3)"), + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), }; Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Mon Sep 1 16:33:54 2008 @@ -189,6 +189,7 @@ void avcodec_register_all(void) REGISTER_DECODER (COOK, cook); REGISTER_DECODER (DCA, dca); REGISTER_DECODER (DSICINAUDIO, dsicinaudio); + REGISTER_DECODER (EAC3, eac3); REGISTER_ENCDEC (FLAC, flac); REGISTER_DECODER (IMC, imc); REGISTER_DECODER (MACE3, mace3); Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Mon Sep 1 16:33:54 2008 @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 51 -#define LIBAVCODEC_VERSION_MINOR 70 +#define LIBAVCODEC_VERSION_MINOR 71 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -306,6 +306,7 @@ enum CodecID { CODEC_ID_WMAPRO, CODEC_ID_WMALOSSLESS, CODEC_ID_ATRAC3P, + CODEC_ID_EAC3, /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, Modified: trunk/libavformat/Makefile ============================================================================== --- trunk/libavformat/Makefile (original) +++ trunk/libavformat/Makefile Mon Sep 1 16:33:54 2008 @@ -44,6 +44,8 @@ OBJS-$(CONFIG_DV_MUXER) OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o riff.o OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o +OBJS-$(CONFIG_EAC3_DEMUXER) += raw.o +OBJS-$(CONFIG_EAC3_MUXER) += raw.o OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o OBJS-$(CONFIG_FLAC_DEMUXER) += raw.o Modified: trunk/libavformat/allformats.c ============================================================================== --- trunk/libavformat/allformats.c (original) +++ trunk/libavformat/allformats.c Mon Sep 1 16:33:54 2008 @@ -76,6 +76,7 @@ void av_register_all(void) REGISTER_DEMUXER (DXA, dxa); REGISTER_DEMUXER (EA, ea); REGISTER_DEMUXER (EA_CDATA, ea_cdata); + REGISTER_MUXDEMUX (EAC3, eac3); REGISTER_MUXDEMUX (FFM, ffm); REGISTER_MUXDEMUX (FLAC, flac); REGISTER_DEMUXER (FLIC, flic); Modified: trunk/libavformat/raw.c ============================================================================== --- trunk/libavformat/raw.c (original) +++ trunk/libavformat/raw.c Mon Sep 1 16:33:54 2008 @@ -487,8 +487,8 @@ static int dirac_probe(AVProbeData *p) } #endif -#ifdef CONFIG_AC3_DEMUXER -static int ac3_probe(AVProbeData *p) +#if (CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER) +static int ac3_eac3_probe(AVProbeData *p, int *codec_id) { int max_frames, first_frames = 0, frames; uint8_t *buf, *buf2, *end; @@ -499,6 +499,7 @@ static int ac3_probe(AVProbeData *p) buf = p->buf; end = buf + p->buf_size; + *codec_id = CODEC_ID_AC3; for(; buf < end; buf++) { buf2 = buf; @@ -509,6 +510,8 @@ static int ac3_probe(AVProbeData *p) if(buf2 + hdr.frame_size > end || av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2)) break; + if (hdr.bitstream_id > 10) + *codec_id = CODEC_ID_EAC3; buf2 += hdr.frame_size; } max_frames = FFMAX(max_frames, frames); @@ -522,6 +525,28 @@ static int ac3_probe(AVProbeData *p) } #endif +#ifdef CONFIG_AC3_DEMUXER +static int ac3_probe(AVProbeData *p) +{ + int codec_id = CODEC_ID_NONE; + int score = ac3_eac3_probe(p, &codec_id); + if(codec_id == CODEC_ID_AC3) + return score; + return 0; +} +#endif + +#ifdef CONFIG_EAC3_DEMUXER +static int eac3_probe(AVProbeData *p) +{ + int codec_id = CODEC_ID_NONE; + int score = ac3_eac3_probe(p, &codec_id); + if(codec_id == CODEC_ID_EAC3) + return score; + return 0; +} +#endif + #ifdef CONFIG_FLAC_DEMUXER static int flac_probe(AVProbeData *p) { @@ -633,6 +658,35 @@ AVOutputFormat dts_muxer = { }; #endif +#ifdef CONFIG_EAC3_DEMUXER +AVInputFormat eac3_demuxer = { + "eac3", + NULL_IF_CONFIG_SMALL("raw E-AC-3"), + 0, + eac3_probe, + audio_read_header, + raw_read_partial_packet, + .flags= AVFMT_GENERIC_INDEX, + .extensions = "eac3", + .value = CODEC_ID_EAC3, +}; +#endif + +#ifdef CONFIG_EAC3_MUXER +AVOutputFormat eac3_muxer = { + "eac3", + NULL_IF_CONFIG_SMALL("raw E-AC-3"), + "audio/x-eac3", + "eac3", + 0, + CODEC_ID_EAC3, + CODEC_ID_NONE, + NULL, + raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + #ifdef CONFIG_FLAC_DEMUXER AVInputFormat flac_demuxer = { "flac",

1 0

r15142 - trunk/libavformat/rtsp.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: rbultje Date: Mon Sep 1 15:51:24 2008 New Revision: 15142 Log: Remove useless "else" case in if X { A; return }; else { B }. See discussion in "Realmedia patch" thread on mailinglist. Modified: trunk/libavformat/rtsp.c Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Mon Sep 1 15:51:24 2008 @@ -1343,10 +1343,9 @@ static int rtsp_read_play(AVFormatContex rtsp_send_cmd(s, cmd, reply, NULL); if (reply->status_code != RTSP_STATUS_OK) { return -1; - } else { - rt->state = RTSP_STATE_PLAYING; - return 0; } + rt->state = RTSP_STATE_PLAYING; + return 0; } /* pause the stream */ @@ -1367,10 +1366,9 @@ static int rtsp_read_pause(AVFormatConte rtsp_send_cmd(s, cmd, reply, NULL); if (reply->status_code != RTSP_STATUS_OK) { return -1; - } else { - rt->state = RTSP_STATE_PAUSED; - return 0; } + rt->state = RTSP_STATE_PAUSED; + return 0; } static int rtsp_read_seek(AVFormatContext *s, int stream_index,

1 0

r15141 - trunk/libavformat/rtsp.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: rbultje Date: Mon Sep 1 15:47:53 2008 New Revision: 15141 Log: Some RTSP streams use SDP lines longer than 1024 bytes, so the SDP line buffer needs to be increased. See discussion in "Realmedia patch" thread on mailinglist. Modified: trunk/libavformat/rtsp.c Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Mon Sep 1 15:47:53 2008 @@ -549,7 +549,7 @@ static int sdp_parse(AVFormatContext *s, { const char *p; int letter; - char buf[1024], *q; + char buf[2048], *q; SDPParseState sdp_parse_state, *s1 = &sdp_parse_state; memset(s1, 0, sizeof(SDPParseState));

1 0

r15140 - trunk/libavformat/rtsp.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: rbultje Date: Mon Sep 1 15:46:50 2008 New Revision: 15140 Log: Implement Realmedia-compatible DESCRIBE command. Modified: trunk/libavformat/rtsp.c Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Mon Sep 1 15:46:50 2008 @@ -1125,6 +1125,15 @@ static int rtsp_read_header(AVFormatCont "DESCRIBE %s RTSP/1.0\r\n" "Accept: application/sdp\r\n", s->filename); + if (rt->server_type == RTSP_SERVER_RDT) { + /** + * The Require: attribute is needed for proper streaming from + * Realmedia servers. + */ + av_strlcat(cmd, + "Require: com.real.retain-entity-for-setup\r\n", + sizeof(cmd)); + } rtsp_send_cmd(s, cmd, reply, &content); if (!content) { err = AVERROR_INVALIDDATA;

1 0

r15139 - trunk/doc/general.texi
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: jbr Date: Mon Sep 1 15:32:30 2008 New Revision: 15139 Log: fix sorting of audio codecs Modified: trunk/doc/general.texi Modified: trunk/doc/general.texi ============================================================================== --- trunk/doc/general.texi (original) +++ trunk/doc/general.texi Mon Sep 1 15:32:30 2008 @@ -368,10 +368,6 @@ following image formats are supported: @item Electronic Arts ADPCM @tab @tab X @tab Used in various EA titles. @item Enhanced AC-3 @tab @tab X - at item Sonic @tab X @tab X - @tab experimental codec - at item Sonic lossless @tab X @tab X - @tab experimental codec @item FLAC lossless audio @tab IX @tab X @item G.726 ADPCM @tab X @tab X @item id RoQ DPCM @tab X @tab X @@ -410,6 +406,10 @@ following image formats are supported: @item Smacker audio @tab @tab X @item SMJPEG IMA ADPCM @tab @tab X @tab Used in certain Loki game ports. + at item Sonic @tab X @tab X + @tab experimental codec + at item Sonic lossless @tab X @tab X + @tab experimental codec @item THP ADPCM @tab @tab X @tab Used on the Nintendo GameCube. @item True Audio (TTA) @tab @tab X

1 0

r15138 - in trunk: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/nellymoserenc.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: bwolowiec Date: Mon Sep 1 13:19:26 2008 New Revision: 15138 Log: Remaining parts of Nellymoser encoder Modified: trunk/Changelog trunk/doc/general.texi trunk/libavcodec/Makefile trunk/libavcodec/allcodecs.c trunk/libavcodec/nellymoserenc.c Modified: trunk/Changelog ============================================================================== --- trunk/Changelog (original) +++ trunk/Changelog Mon Sep 1 13:19:26 2008 @@ -135,6 +135,7 @@ version <next> - floating point PCM encoder/decoder - MXF muxer - E-AC-3 support added to AC-3 decoder +- Nellymoser ASAO encoder version 0.4.9-pre1: Modified: trunk/doc/general.texi ============================================================================== --- trunk/doc/general.texi (original) +++ trunk/doc/general.texi Mon Sep 1 13:19:26 2008 @@ -392,7 +392,7 @@ following image formats are supported: @item MS IMA ADPCM @tab X @tab X @item Musepack @tab @tab X @tab SV7 and SV8 are supported. - at item Nellymoser ASAO @tab @tab X + at item Nellymoser ASAO @tab X @tab X @item Qdesign QDM2 @tab @tab X @tab There are still some distortions. @item QT IMA ADPCM @tab X @tab X Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Mon Sep 1 13:19:26 2008 @@ -139,6 +139,7 @@ OBJS-$(CONFIG_MSRLE_DECODER) + OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o mdct.o fft.o +OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o mdct.o fft.o OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o OBJS-$(CONFIG_PAM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PBM_ENCODER) += pnmenc.o pnm.o Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Mon Sep 1 13:19:26 2008 @@ -200,7 +200,7 @@ void avcodec_register_all(void) REGISTER_DECODER (MP3ON4, mp3on4); REGISTER_DECODER (MPC7, mpc7); REGISTER_DECODER (MPC8, mpc8); - REGISTER_DECODER (NELLYMOSER, nellymoser); + REGISTER_ENCDEC (NELLYMOSER, nellymoser); REGISTER_DECODER (QDM2, qdm2); REGISTER_DECODER (RA_144, ra_144); REGISTER_DECODER (RA_288, ra_288); Modified: trunk/libavcodec/nellymoserenc.c ============================================================================== --- trunk/libavcodec/nellymoserenc.c (original) +++ trunk/libavcodec/nellymoserenc.c Mon Sep 1 13:19:26 2008 @@ -48,8 +48,12 @@ typedef struct NellyMoserEncodeContext { AVCodecContext *avctx; int last_frame; + int bufsel; + int have_saved; DSPContext dsp; MDCTContext mdct_ctx; + DECLARE_ALIGNED_16(float, mdct_out[NELLY_SAMPLES]); + DECLARE_ALIGNED_16(float, buf[2][3 * NELLY_BUF_LEN]); ///< sample buffer } NellyMoserEncodeContext; static float pow_table[POW_TABLE_SIZE]; ///< -pow(2, -i / 2048.0 - 3.0); @@ -102,6 +106,22 @@ static const float quant_lut_mul[7] = { static const float quant_lut_add[7] = { 0.0, 0.0, 2.0, 7.0, 21.0, 56.0, 157.0 }; static const uint8_t quant_lut_offset[8] = { 0, 0, 1, 4, 11, 32, 81, 230 }; +void apply_mdct(NellyMoserEncodeContext *s) +{ + DECLARE_ALIGNED_16(float, in_buff[NELLY_SAMPLES]); + + memcpy(in_buff, s->buf[s->bufsel], NELLY_BUF_LEN * sizeof(float)); + s->dsp.vector_fmul(in_buff, ff_sine_128, NELLY_BUF_LEN); + s->dsp.vector_fmul_reverse(in_buff + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128, + NELLY_BUF_LEN); + ff_mdct_calc(&s->mdct_ctx, s->mdct_out, in_buff); + + s->dsp.vector_fmul(s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128, NELLY_BUF_LEN); + s->dsp.vector_fmul_reverse(s->buf[s->bufsel] + 2 * NELLY_BUF_LEN, s->buf[1 - s->bufsel], ff_sine_128, + NELLY_BUF_LEN); + ff_mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN); +} + static av_cold int encode_init(AVCodecContext *avctx) { NellyMoserEncodeContext *s = avctx->priv_data; @@ -146,6 +166,207 @@ static av_cold int encode_end(AVCodecCon if (fabs(val - table[best_idx]) > fabs(val - table[best_idx + 1])) \ best_idx++; +static void get_exponent_greedy(NellyMoserEncodeContext *s, float *cand, int *idx_table) +{ + int band, best_idx, power_idx = 0; + float power_candidate; + + //base exponent + find_best(cand[0], ff_nelly_init_table, sf_lut, -20, 96); + idx_table[0] = best_idx; + power_idx = ff_nelly_init_table[best_idx]; + + for (band = 1; band < NELLY_BANDS; band++) { + power_candidate = cand[band] - power_idx; + find_best(power_candidate, ff_nelly_delta_table, sf_delta_lut, 37, 78); + idx_table[band] = best_idx; + power_idx += ff_nelly_delta_table[best_idx]; + } +} + +#define OPT_SIZE ((1<<15) + 3000) + +static inline float distance(float x, float y, int band) +{ + //return pow(fabs(x-y), 2.0); + float tmp = x - y; + return tmp * tmp; +} + +static void get_exponent_dynamic(NellyMoserEncodeContext *s, float *cand, int *idx_table) +{ + int i, j, band, best_idx; + float power_candidate, best_val; + + float opt[NELLY_BANDS][OPT_SIZE]; + int path[NELLY_BANDS][OPT_SIZE]; + + for (i = 0; i < NELLY_BANDS * OPT_SIZE; i++) { + opt[0][i] = INFINITY; + } + + for (i = 0; i < 64; i++) { + opt[0][ff_nelly_init_table[i]] = distance(cand[0], ff_nelly_init_table[i], 0); + path[0][ff_nelly_init_table[i]] = i; + } + + for (band = 1; band < NELLY_BANDS; band++) { + int q, c = 0; + float tmp; + int idx_min, idx_max, idx; + power_candidate = cand[band]; + for (q = 1000; !c && q < OPT_SIZE; q <<= 2) { + idx_min = FFMAX(0, cand[band] - q); + idx_max = FFMIN(OPT_SIZE, cand[band - 1] + q); + for (i = FFMAX(0, cand[band - 1] - q); i < FFMIN(OPT_SIZE, cand[band - 1] + q); i++) { + if ( isinf(opt[band - 1][i]) ) + continue; + for (j = 0; j < 32; j++) { + idx = i + ff_nelly_delta_table[j]; + if (idx > idx_max) + break; + if (idx >= idx_min) { + tmp = opt[band - 1][i] + distance(idx, power_candidate, band); + if (opt[band][idx] > tmp) { + opt[band][idx] = tmp; + path[band][idx] = j; + c = 1; + } + } + } + } + } + assert(c); //FIXME + } + + best_val = INFINITY; + best_idx = -1; + band = NELLY_BANDS - 1; + for (i = 0; i < OPT_SIZE; i++) { + if (best_val > opt[band][i]) { + best_val = opt[band][i]; + best_idx = i; + } + } + for (band = NELLY_BANDS - 1; band >= 0; band--) { + idx_table[band] = path[band][best_idx]; + if (band) { + best_idx -= ff_nelly_delta_table[path[band][best_idx]]; + } + } +} + +/** + * Encodes NELLY_SAMPLES samples. It assumes, that samples contains 3 * NELLY_BUF_LEN values + * @param s encoder context + * @param output output buffer + * @param output_size size of output buffer + */ +static void encode_block(NellyMoserEncodeContext *s, unsigned char *output, int output_size) +{ + PutBitContext pb; + int i, j, band, block, best_idx, power_idx = 0; + float power_val, coeff, coeff_sum; + float pows[NELLY_FILL_LEN]; + int bits[NELLY_BUF_LEN], idx_table[NELLY_BANDS]; + float cand[NELLY_BANDS]; + + apply_mdct(s); + + init_put_bits(&pb, output, output_size * 8); + + i = 0; + for (band = 0; band < NELLY_BANDS; band++) { + coeff_sum = 0; + for (j = 0; j < ff_nelly_band_sizes_table[band]; i++, j++) { + coeff_sum += s->mdct_out[i ] * s->mdct_out[i ] + + s->mdct_out[i + NELLY_BUF_LEN] * s->mdct_out[i + NELLY_BUF_LEN]; + } + cand[band] = + log(FFMAX(1.0, coeff_sum / (ff_nelly_band_sizes_table[band] << 7))) * 1024.0 / M_LN2; + } + + if (s->avctx->trellis) { + get_exponent_dynamic(s, cand, idx_table); + } else { + get_exponent_greedy(s, cand, idx_table); + } + + i = 0; + for (band = 0; band < NELLY_BANDS; band++) { + if (band) { + power_idx += ff_nelly_delta_table[idx_table[band]]; + put_bits(&pb, 5, idx_table[band]); + } else { + power_idx = ff_nelly_init_table[idx_table[0]]; + put_bits(&pb, 6, idx_table[0]); + } + power_val = pow_table[power_idx & 0x7FF] / (1 << ((power_idx >> 11) + POW_TABLE_OFFSET)); + for (j = 0; j < ff_nelly_band_sizes_table[band]; i++, j++) { + s->mdct_out[i] *= power_val; + s->mdct_out[i + NELLY_BUF_LEN] *= power_val; + pows[i] = power_idx; + } + } + + ff_nelly_get_sample_bits(pows, bits); + + for (block = 0; block < 2; block++) { + for (i = 0; i < NELLY_FILL_LEN; i++) { + if (bits[i] > 0) { + const float *table = ff_nelly_dequantization_table + (1 << bits[i]) - 1; + coeff = s->mdct_out[block * NELLY_BUF_LEN + i]; + best_idx = + quant_lut[av_clip ( + coeff * quant_lut_mul[bits[i]] + quant_lut_add[bits[i]], + quant_lut_offset[bits[i]], + quant_lut_offset[bits[i]+1] - 1 + )]; + if (fabs(coeff - table[best_idx]) > fabs(coeff - table[best_idx + 1])) + best_idx++; + + put_bits(&pb, bits[i], best_idx); + } + } + if (!block) + put_bits(&pb, NELLY_HEADER_BITS + NELLY_DETAIL_BITS - put_bits_count(&pb), 0); + } +} + +static int encode_frame(AVCodecContext *avctx, uint8_t *frame, int buf_size, void *data) +{ + NellyMoserEncodeContext *s = avctx->priv_data; + int16_t *samples = data; + int i; + + if (s->last_frame) + return 0; + + if (data) { + for (i = 0; i < avctx->frame_size; i++) { + s->buf[s->bufsel][i] = samples[i]; + } + for (; i < NELLY_SAMPLES; i++) { + s->buf[s->bufsel][i] = 0; + } + s->bufsel = 1 - s->bufsel; + if (!s->have_saved) { + s->have_saved = 1; + return 0; + } + } else { + memset(s->buf[s->bufsel], 0, sizeof(s->buf[0][0]) * NELLY_BUF_LEN); + s->bufsel = 1 - s->bufsel; + s->last_frame = 1; + } + + if (s->have_saved) { + encode_block(s, frame, buf_size); + return NELLY_BLOCK_LEN; + } + return 0; +} + AVCodec nellymoser_encoder = { .name = "nellymoser", .type = CODEC_TYPE_AUDIO,

1 0

r15104 - in trunk/libavformat: rtsp.c rtsp.h
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: rbultje Date: Sun Aug 31 05:12:13 2008 New Revision: 15104 Log: Implement RTSP/Realmedia-compatible OPTIONS command. See "Realmedia patch" thread on mailinglist for discussion. This patch also implements a RTSPServerType enum, which allows the RTSP to keep track of what kind of a stream we're handling: standard-compliant RTP or a proprietary derivative. This will be used in subsequent patches to implement more Realmedia-specific extensions required to receive and parse data coming from a Realmedia server. Modified: trunk/libavformat/rtsp.c trunk/libavformat/rtsp.h Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c (original) +++ trunk/libavformat/rtsp.c Sun Aug 31 05:12:13 2008 @@ -42,6 +42,12 @@ enum RTSPClientState { RTSP_STATE_PAUSED, }; +enum RTSPServerType { + RTSP_SERVER_RTP, /*< Standard-compliant RTP-server */ + RTSP_SERVER_RDT, /*< Realmedia-style server */ + RTSP_SERVER_LAST +}; + typedef struct RTSPState { URLContext *rtsp_hd; /* RTSP TCP connexion handle */ int nb_rtsp_streams; @@ -55,6 +61,7 @@ typedef struct RTSPState { int seq; /* RTSP command sequence number */ char session_id[512]; enum RTSPProtocol protocol; + enum RTSPServerType server_type; char last_reply[2048]; /* XXX: allocate ? */ RTPDemuxContext *cur_rtp; } RTSPState; @@ -710,6 +717,9 @@ void rtsp_parse_line(RTSPHeader *reply, reply->seq = strtol(p, NULL, 10); } else if (av_stristart(p, "Range:", &p)) { rtsp_parse_range_npt(p, &reply->range_start, &reply->range_end); + } else if (av_stristart(p, "RealChallenge1:", &p)) { + skip_spaces(&p); + av_strlcpy(reply->real_challenge, p, sizeof(reply->real_challenge)); } } @@ -1035,6 +1045,7 @@ static int rtsp_read_header(AVFormatCont RTSPHeader reply1, *reply = &reply1; unsigned char *content = NULL; int protocol_mask = 0; + char real_challenge[64]; /* extract hostname and port */ url_split(NULL, 0, NULL, 0, @@ -1073,6 +1084,42 @@ static int rtsp_read_header(AVFormatCont rt->rtsp_hd = rtsp_hd; rt->seq = 0; + /* request options supported by the server; this also detects server type */ + for (rt->server_type = RTSP_SERVER_RTP;;) { + snprintf(cmd, sizeof(cmd), + "OPTIONS %s RTSP/1.0\r\n", s->filename); + if (rt->server_type == RTSP_SERVER_RDT) + av_strlcat(cmd, + /** + * The following entries are required for proper + * streaming from a Realmedia server. They are + * interdependent in some way although we currently + * don't quite understand how. Values were copied + * from mplayer SVN r23589. + * @param CompanyID is a 16-byte ID in base64 + * @param ClientChallenge is a 16-byte ID in hex + */ + "ClientChallenge: 9e26d33f2984236010ef6253fb1887f7\r\n" + "PlayerStarttime: [28/03/2003:22:50:23 00:00]\r\n" + "CompanyID: KnKV4M4I/B2FjJ1TToLycw==\r\n" + "GUID: 00000000-0000-0000-0000-000000000000\r\n", + sizeof(cmd)); + rtsp_send_cmd(s, cmd, reply, NULL); + if (reply->status_code != RTSP_STATUS_OK) { + err = AVERROR_INVALIDDATA; + goto fail; + } + + /* detect server type if not standard-compliant RTP */ + if (rt->server_type != RTSP_SERVER_RDT && reply->real_challenge[0]) { + rt->server_type = RTSP_SERVER_RDT; + continue; + } else if (rt->server_type == RTSP_SERVER_RDT) { + strcpy(real_challenge, reply->real_challenge); + } + break; + } + /* describe the stream */ snprintf(cmd, sizeof(cmd), "DESCRIBE %s RTSP/1.0\r\n" Modified: trunk/libavformat/rtsp.h ============================================================================== --- trunk/libavformat/rtsp.h (original) +++ trunk/libavformat/rtsp.h Sun Aug 31 05:12:13 2008 @@ -62,6 +62,7 @@ typedef struct RTSPHeader { RTSPTransportField transports[RTSP_MAX_TRANSPORTS]; int seq; /**< sequence number */ char session_id[512]; + char real_challenge[64]; /**< the RealChallenge1 field from the server */ } RTSPHeader; /** the callback can be used to extend the connection setup/teardown step */

4 4

r15136 - trunk/libavcodec/motion_est.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: michael Date: Mon Sep 1 02:22:00 2008 New Revision: 15136 Log: 1000l Fix snow regression test that i broke in r15135. Modified: trunk/libavcodec/motion_est.c Modified: trunk/libavcodec/motion_est.c ============================================================================== --- trunk/libavcodec/motion_est.c (original) +++ trunk/libavcodec/motion_est.c Mon Sep 1 02:22:00 2008 @@ -240,7 +240,8 @@ int ff_init_me(MpegEncContext *s){ av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n"); return -1; } - if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1){ + //special case of snow is needed because snow uses its own iterative ME code + if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1 && s->avctx->codec_id != CODEC_ID_SNOW){ av_log(s->avctx, AV_LOG_ERROR, "me_method is only allowed to be set to zero and epzs; for hex,umh,full and others see dia_size\n"); return -1; }

2 1

r15135 - trunk/libavcodec/motion_est.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: michael Date: Mon Sep 1 01:55:47 2008 New Revision: 15135 Log: Warn the user about me_method values that are not supported. Fixes issue503 Modified: trunk/libavcodec/motion_est.c Modified: trunk/libavcodec/motion_est.c ============================================================================== --- trunk/libavcodec/motion_est.c (original) +++ trunk/libavcodec/motion_est.c Mon Sep 1 01:55:47 2008 @@ -240,6 +240,10 @@ int ff_init_me(MpegEncContext *s){ av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n"); return -1; } + if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1){ + av_log(s->avctx, AV_LOG_ERROR, "me_method is only allowed to be set to zero and epzs; for hex,umh,full and others see dia_size\n"); + return -1; + } c->avctx= s->avctx;

2 1

r15137 - trunk/libavcodec/mpegvideo_enc.c
by subversion＠mplayerhq.hu 01 Sep '08

01 Sep '08

Author: michael Date: Mon Sep 1 02:28:51 2008 New Revision: 15137 Log: Check ff_init_me()s return value. Modified: trunk/libavcodec/mpegvideo_enc.c Modified: trunk/libavcodec/mpegvideo_enc.c ============================================================================== --- trunk/libavcodec/mpegvideo_enc.c (original) +++ trunk/libavcodec/mpegvideo_enc.c Mon Sep 1 02:28:51 2008 @@ -2775,7 +2775,8 @@ static int encode_picture(MpegEncContext ff_update_duplicate_context(s->thread_context[i], s); } - ff_init_me(s); + if(ff_init_me(s)<0) + return -1; /* Estimate motion for every MB */ if(s->pict_type != FF_I_TYPE){

1 0